diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.dialog
index a883e20720..13bed7f179 100644
--- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.dialog
+++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.dialog
@@ -16,7 +16,7 @@
         {
           "$type": "Microsoft.SendActivity",
           "$designer": {
-            "id": "166131"
+            "id": "522200"
           },
           "activity": "${bfdactivity-522200()}"
         },
@@ -45,7 +45,7 @@
         {
           "$type": "Microsoft.SendActivity",
           "$designer": {
-            "id": "643043"
+            "id": "797905"
           },
           "activity": "${bfdactivity-797905()}"
         },
diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.dialog
index 7fb50111c8..a76c67fa09 100644
--- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.dialog
+++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.dialog
@@ -15,7 +15,7 @@
         {
           "$type": "Microsoft.EditActions",
           "$designer": {
-            "id": "250234"
+            "id": "250235"
           },
           "changeType": "insertActions",
           "actions": [
diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.dialog
index bf75175f08..4990eb7bab 100644
--- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.dialog
+++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.dialog
@@ -15,7 +15,7 @@
         {
           "$type": "Microsoft.IfCondition",
           "$designer": {
-            "id": "719594"
+            "id": "719500"
           },
           "condition": "user.name == null",
           "actions": [
diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog
index a1c8ee3108..abcd1174ba 100644
--- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog
+++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog
@@ -248,7 +248,7 @@
         {
           "$type": "Microsoft.SendActivity",
           "$designer": {
-            "id": "347762"
+            "id": "640616"
           },
           "activity": "${bfdactivity-640616()}"
         }
@@ -280,10 +280,10 @@
                 {
                   "$type": "Microsoft.SendActivity",
                   "$designer": {
-                    "id": "640616",
+                    "id": "640617",
                     "name": "Send a response"
                   },
-                  "activity": "${bfdactivity-640616()}"
+                  "activity": "${bfdactivity-640617()}"
                 }
               ]
             }
diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.lg b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.lg
index 865780213f..88a52af9d0 100644
--- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.lg
+++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.lg
@@ -1,4 +1,7 @@
 [import](common.lg)
 
 # bfdactivity-640616
+-${help()}
+
+# bfdactivity-640617
 -${help()}
\ No newline at end of file
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ClearToDos/ClearToDos.dialog b/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ClearToDos/ClearToDos.dialog
index 4038bfaaa8..57ba8a1482 100644
--- a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ClearToDos/ClearToDos.dialog
+++ b/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ClearToDos/ClearToDos.dialog
@@ -31,18 +31,18 @@
             {
               "$type": "Microsoft.SendActivity",
               "$designer": {
-                "id": "832307"
+                "id": "832300"
               },
-              "activity": "${bfdactivity-832307()}"
+              "activity": "${bfdactivity-832300()}"
             }
           ],
           "elseActions": [
             {
               "$type": "Microsoft.SendActivity",
               "$designer": {
-                "id": "983761"
+                "id": "983700"
               },
-              "activity": "${bfdactivity-983761()}"
+              "activity": "${bfdactivity-983700()}"
             }
           ]
         }
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ClearToDos/ClearToDos.lg b/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ClearToDos/ClearToDos.lg
index 6f87860ae7..b4dd36e52e 100644
--- a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ClearToDos/ClearToDos.lg
+++ b/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ClearToDos/ClearToDos.lg
@@ -1,7 +1,7 @@
 [import](common.lg)
 
-# bfdactivity-832307
+# bfdactivity-832300
 -Successfully cleared items in the Todo List.
 
-# bfdactivity-983761
+# bfdactivity-983700
 -You don't have any items in the Todo List.
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog b/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog
index a4f151bec9..176f8c5072 100644
--- a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog
+++ b/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog
@@ -53,7 +53,7 @@
             {
               "$type": "Microsoft.SendActivity",
               "$designer": {
-                "id": "549615"
+                "id": "549610"
               },
               "activity": "${bfdactivity-549615()}"
             }
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ShowToDos/ShowToDos.dialog b/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ShowToDos/ShowToDos.dialog
index 869ecbbb98..684bbf2120 100644
--- a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ShowToDos/ShowToDos.dialog
+++ b/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ShowToDos/ShowToDos.dialog
@@ -32,10 +32,10 @@
             {
               "$type": "Microsoft.SendActivity",
               "$designer": {
-                "id": "662084",
+                "id": "662004",
                 "name": "Send an Activity"
               },
-              "activity": "${bfdactivity-662084()}"
+              "activity": "${bfdactivity-662004()}"
             }
           ]
         }
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ShowToDos/ShowToDos.lg b/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ShowToDos/ShowToDos.lg
index 9983313454..d3833cf841 100644
--- a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ShowToDos/ShowToDos.lg
+++ b/Composer/packages/server/assets/projects/TodoRecognizerSetSample/ComposerDialogs/ShowToDos/ShowToDos.lg
@@ -4,5 +4,5 @@
 # bfdactivity-339580
 -You have no todos.
 
-# bfdactivity-662084
+# bfdactivity-662004
 -${ShowTodo()}
diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ClearToDos/ClearToDos.dialog b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ClearToDos/ClearToDos.dialog
index 4038bfaaa8..13fe437a46 100644
--- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ClearToDos/ClearToDos.dialog
+++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ClearToDos/ClearToDos.dialog
@@ -15,7 +15,7 @@
         {
           "$type": "Microsoft.EditArray",
           "$designer": {
-            "id": "832307"
+            "id": "832300"
           },
           "changeType": "Clear",
           "itemsProperty": "user.todos",
@@ -24,7 +24,7 @@
         {
           "$type": "Microsoft.IfCondition",
           "$designer": {
-            "id": "983761"
+            "id": "983700"
           },
           "condition": "dialog.cleared",
           "actions": [
diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog
index a4f151bec9..555a9d4bcf 100644
--- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog
+++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog
@@ -53,9 +53,9 @@
             {
               "$type": "Microsoft.SendActivity",
               "$designer": {
-                "id": "549615"
+                "id": "549600"
               },
-              "activity": "${bfdactivity-549615()}"
+              "activity": "${bfdactivity-549600()}"
             }
           ]
         }
diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.lg b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.lg
index 883fe4dde6..ec800d0d73 100644
--- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.lg
+++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.lg
@@ -3,7 +3,7 @@
 # bfdactivity-725469
 -Successfully removed a todo named ${dialog.todo}
 
-# bfdactivity-549615
+# bfdactivity-549600
 -${dialog.todo} is not in the Todo List
 
 # bfdprompt-870620()