diff --git a/fluentui/Entropy/AppCheckerResult.sarif b/fluentui/Entropy/AppCheckerResult.sarif
index a8f6bbb4550140fc0138e6910da8886227788b87..addb36b931f142f1ef6745d6290dd7fac5ec1551 100644
--- a/fluentui/Entropy/AppCheckerResult.sarif
+++ b/fluentui/Entropy/AppCheckerResult.sarif
@@ -488,126 +488,6 @@
           },
           "ruleId": "acc-TabOrderShouldBeChecked",
           "ruleIndex": 1
-        },
-        {
-          "locations": [
-            {
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "Main.tab2.AccessibleLabel"
-                }
-              ],
-              "physicalLocation": {
-                "address": {
-                  "fullyQualifiedName": "Main.tab2.AccessibleLabel",
-                  "relativeAddress": 0
-                }
-              },
-              "properties": {
-                "member": "AccessibleLabel",
-                "module": "Main",
-                "type": "Main.tab2"
-              }
-            }
-          ],
-          "message": {
-            "id": "issue"
-          },
-          "properties": {
-            "level": "Medium"
-          },
-          "ruleId": "acc-AccessibleLabelNeeded",
-          "ruleIndex": 0
-        },
-        {
-          "locations": [
-            {
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "Main.tab2.TabIndex"
-                }
-              ],
-              "physicalLocation": {
-                "address": {
-                  "fullyQualifiedName": "Main.tab2.TabIndex",
-                  "relativeAddress": 0
-                }
-              },
-              "properties": {
-                "member": "TabIndex",
-                "module": "Main",
-                "type": "Main.tab2"
-              }
-            }
-          ],
-          "message": {
-            "id": "issue"
-          },
-          "properties": {
-            "level": "Low"
-          },
-          "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 1
-        },
-        {
-          "locations": [
-            {
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "Main.tab3.AccessibleLabel"
-                }
-              ],
-              "physicalLocation": {
-                "address": {
-                  "fullyQualifiedName": "Main.tab3.AccessibleLabel",
-                  "relativeAddress": 0
-                }
-              },
-              "properties": {
-                "member": "AccessibleLabel",
-                "module": "Main",
-                "type": "Main.tab3"
-              }
-            }
-          ],
-          "message": {
-            "id": "issue"
-          },
-          "properties": {
-            "level": "Medium"
-          },
-          "ruleId": "acc-AccessibleLabelNeeded",
-          "ruleIndex": 0
-        },
-        {
-          "locations": [
-            {
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "Main.tab3.TabIndex"
-                }
-              ],
-              "physicalLocation": {
-                "address": {
-                  "fullyQualifiedName": "Main.tab3.TabIndex",
-                  "relativeAddress": 0
-                }
-              },
-              "properties": {
-                "member": "TabIndex",
-                "module": "Main",
-                "type": "Main.tab3"
-              }
-            }
-          ],
-          "message": {
-            "id": "issue"
-          },
-          "properties": {
-            "level": "Low"
-          },
-          "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 1
         }
       ],
       "tool": {
diff --git a/fluentui/Entropy/Entropy.json b/fluentui/Entropy/Entropy.json
index ccbf03894a861d4556679d541686016f80088bfd..6107c051ec8fdd00dd80c8392954991fe35f103c 100644
--- a/fluentui/Entropy/Entropy.json
+++ b/fluentui/Entropy/Entropy.json
@@ -17,13 +17,11 @@
     "send1": 21,
     "SendMail1": 16,
     "tab1": 13,
-    "tab2": 14,
-    "tab3": 15,
     "textinput1": 20
   },
   "FunctionParamsInvariantScripts": {},
   "FunctionParamsInvariantScriptsOnInstances": {},
-  "HeaderLastSavedDateTimeUTC": "11/13/2023 15:12:45",
+  "HeaderLastSavedDateTimeUTC": "11/13/2023 15:23:31",
   "IsLegacyComponentAllowGlobalScopeCase": false,
   "LocalConnectionIDReferences": {
     "99352d8f-567f-4bcc-a2d7-87a89a789722": "\"/providers/microsoft.powerapps/apis/shared_logicflows/connections/38d6e5b5b5fa999a16ebdf0aa169572f-c1654a69e558fc9f\"",
@@ -49,11 +47,11 @@
   "OrderPcfTemplate": {},
   "OrderTemplate": {},
   "OrderXMLTemplate": {
-    "circle": 2,
-    "dropdown": 0,
-    "icon": 4,
-    "image": 1,
-    "label": 3,
+    "circle": 3,
+    "dropdown": 1,
+    "icon": 0,
+    "image": 2,
+    "label": 4,
     "text": 6,
     "toggleSwitch": 5
   },
@@ -73,31 +71,27 @@
     "send1": {},
     "SendMail1": {},
     "tab1": {},
-    "tab2": {},
-    "tab3": {},
     "textinput1": {}
   },
   "PCFDynamicSchemaForIRRetrievalEntry": {},
   "PCFTemplateEntry": {},
   "PublishOrderIndices": {
     "App": 0,
-    "chatbox1": 4,
-    "Circle2_1": 3,
-    "Circle2_2": 2,
-    "Circle2_3": 5,
-    "completionmode": 11,
-    "Dropdown1": 0,
+    "chatbox1": 5,
+    "Circle2_1": 4,
+    "Circle2_2": 3,
+    "Circle2_3": 6,
+    "completionmode": 9,
+    "Dropdown1": 1,
     "Eraser1": 10,
     "Host": 0,
-    "Label7": 12,
+    "Label7": 7,
     "Main": 0,
-    "rbblogo": 1,
-    "send1": 14,
-    "SendMail1": 9,
-    "tab1": 6,
-    "tab2": 7,
-    "tab3": 8,
-    "textinput1": 13
+    "rbblogo": 2,
+    "send1": 12,
+    "SendMail1": 8,
+    "tab1": 0,
+    "textinput1": 11
   },
   "ResourcesJsonIndices": {
     "Image-rbb-logo": 1,
diff --git a/fluentui/Entropy/checksum.json b/fluentui/Entropy/checksum.json
index 966291fb1edb528c125655bb45b78eee0cfbb116..df2758de727841162bb37d8abc290c390463a17c 100644
--- a/fluentui/Entropy/checksum.json
+++ b/fluentui/Entropy/checksum.json
@@ -4,35 +4,35 @@
     "IsLocalBuild": false
   },
   "ClientPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_S5uVFL0GM1IXQ4PFCveFPnKOvwyGhBZlHNq7tSa8tbA=",
+    "AppCheckerResult.sarif": "C8_vrvB88FR8PqtylBrQqehcE1YNoyyPodpvE8KSrp6Kx0=",
     "Assets\\Images\\c78fd8d6-7fd4-4a19-9148-12889f1d10c9.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=",
     "Controls\\1.json": "C8_opQhFd7tQ3IkRABVgFFq82IYQKAFbJ5qy/GElyH/FyI=",
-    "Controls\\4.json": "C8_86CO+fU8LOG2sAIR1B1A+DSDF2kQMtvmSzSpRVi2svM=",
-    "Header.json": "C8_tT+qdbpFeB9hhP2s3F/YVanCMY7SnwvSp++7MAlRlOE=",
+    "Controls\\4.json": "C8_8RU11U01aXhuwsGL2kDN39Kv5077FqXzBuap8W/ifkA=",
+    "Header.json": "C8_Vs/ytbthel89zvu8KhhS1eKhBDBx6x7dqlcNTjpOT/o=",
     "Properties.json": "C8_Tecrmmp9muRDBFyVk4jqnRBhWnYnoIRdih/gAI79pew=",
     "References\\DataSources.json": "C8_l4/JWdS5LzsAapgpFFlYHhNyBsBaeSUj2f88rHt3dog=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
     "References\\Resources.json": "C8_z9tmFLYadpNSMwQz1mTgdRcw+eUVhmr+ZbXqO5axRQQ=",
-    "References\\Templates.json": "C8_6KMCzVmtysIe8PaszxWz22d9pymGQErKxQW/cHYQmlk=",
+    "References\\Templates.json": "C8_1W8kU9lRe3UsDzD8+goAtRx7Tql93EfX7+/Bch579XE=",
     "References\\Themes.json": "C8_tsXtDVkT5pjhDU/pIa1ap3UW1Mua31Be8aPLGOt6H94=",
     "Resources\\dbucp5e3.jpg": "C8_2LEwJZMhrD5m6xki6L+aGapXwTRKzCree1HX8l46rss=",
     "Resources\\PublishInfo.json": "C8_bks7wnKsxkFad74B2uHcDqv0O4q9QcoIWSENafrbcDQ="
   },
-  "ClientStampedChecksum": "C8_uKKznS3NFu8eJ4uJK312mQjsijvQU8Z766jBpTCytFw=",
+  "ClientStampedChecksum": "C8_yP0IaDGF8z3zWJrcyAOLD/mZZNpLKT33f8Jby3rtLLI=",
   "ServerPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_S5uVFL0GM1IXQ4PFCveFPnKOvwyGhBZlHNq7tSa8tbA=",
+    "AppCheckerResult.sarif": "C8_vrvB88FR8PqtylBrQqehcE1YNoyyPodpvE8KSrp6Kx0=",
     "Assets\\Images\\c78fd8d6-7fd4-4a19-9148-12889f1d10c9.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=",
     "Controls\\1.json": "C8_opQhFd7tQ3IkRABVgFFq82IYQKAFbJ5qy/GElyH/FyI=",
-    "Controls\\4.json": "C8_86CO+fU8LOG2sAIR1B1A+DSDF2kQMtvmSzSpRVi2svM=",
-    "Header.json": "C8_tT+qdbpFeB9hhP2s3F/YVanCMY7SnwvSp++7MAlRlOE=",
+    "Controls\\4.json": "C8_8RU11U01aXhuwsGL2kDN39Kv5077FqXzBuap8W/ifkA=",
+    "Header.json": "C8_Vs/ytbthel89zvu8KhhS1eKhBDBx6x7dqlcNTjpOT/o=",
     "Properties.json": "C8_Tecrmmp9muRDBFyVk4jqnRBhWnYnoIRdih/gAI79pew=",
     "References\\DataSources.json": "C8_l4/JWdS5LzsAapgpFFlYHhNyBsBaeSUj2f88rHt3dog=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
     "References\\Resources.json": "C8_z9tmFLYadpNSMwQz1mTgdRcw+eUVhmr+ZbXqO5axRQQ=",
-    "References\\Templates.json": "C8_6KMCzVmtysIe8PaszxWz22d9pymGQErKxQW/cHYQmlk=",
+    "References\\Templates.json": "C8_1W8kU9lRe3UsDzD8+goAtRx7Tql93EfX7+/Bch579XE=",
     "References\\Themes.json": "C8_tsXtDVkT5pjhDU/pIa1ap3UW1Mua31Be8aPLGOt6H94=",
     "Resources\\dbucp5e3.jpg": "C8_2LEwJZMhrD5m6xki6L+aGapXwTRKzCree1HX8l46rss=",
     "Resources\\PublishInfo.json": "C8_bks7wnKsxkFad74B2uHcDqv0O4q9QcoIWSENafrbcDQ="
   },
-  "ServerStampedChecksum": "C8_uKKznS3NFu8eJ4uJK312mQjsijvQU8Z766jBpTCytFw="
+  "ServerStampedChecksum": "C8_yP0IaDGF8z3zWJrcyAOLD/mZZNpLKT33f8Jby3rtLLI="
 }
\ No newline at end of file
diff --git a/fluentui/Src/EditorState/Main.editorstate.json b/fluentui/Src/EditorState/Main.editorstate.json
index 593cb08cb89808e4f992b04f952eb9942f01d9d9..cb56830cdedcbf3482f741aa5b0ad90185491782 100644
--- a/fluentui/Src/EditorState/Main.editorstate.json
+++ b/fluentui/Src/EditorState/Main.editorstate.json
@@ -131,7 +131,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "chatbox1",
-      "ParentIndex": 4,
+      "ParentIndex": 5,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -394,7 +394,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "Circle2_1",
-      "ParentIndex": 3,
+      "ParentIndex": 4,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -527,7 +527,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "Circle2_2",
-      "ParentIndex": 2,
+      "ParentIndex": 3,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -660,7 +660,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "Circle2_3",
-      "ParentIndex": 5,
+      "ParentIndex": 6,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -848,7 +848,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "completionmode",
-      "ParentIndex": 11,
+      "ParentIndex": 9,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -1188,7 +1188,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "Dropdown1",
-      "ParentIndex": 0,
+      "ParentIndex": 1,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -1673,7 +1673,14 @@
         "HoverFill",
         "Font",
         "FontWeight",
-        "Align",
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "",
+          "InvariantPropertyName": "Align",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
         "VerticalAlign",
         "X",
         "Y",
@@ -1710,7 +1717,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "Label7",
-      "ParentIndex": 12,
+      "ParentIndex": 7,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -2070,7 +2077,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "rbblogo",
-      "ParentIndex": 1,
+      "ParentIndex": 2,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -2312,7 +2319,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "send1",
-      "ParentIndex": 14,
+      "ParentIndex": 12,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -2549,7 +2556,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "SendMail1",
-      "ParentIndex": 9,
+      "ParentIndex": 8,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -2777,7 +2784,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "tab1",
-      "ParentIndex": 6,
+      "ParentIndex": 0,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -2914,406 +2921,6 @@
       "StyleName": "defaultIconStyle",
       "Type": "ControlInfo"
     },
-    "tab2": {
-      "AllowAccessToGlobals": true,
-      "ControlPropertyState": [
-        "Icon",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Color",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "DisabledColor",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "RGBA(16, 110, 190, 1)",
-          "InvariantPropertyName": "PressedColor",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "HoverColor",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Fill",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "DisabledFill",
-        "PressedFill",
-        "HoverFill",
-        "DisplayMode",
-        "X",
-        "Y",
-        "Width",
-        "Height",
-        "BorderStyle",
-        "BorderColor",
-        "DisabledBorderColor",
-        "PressedBorderColor",
-        "HoverBorderColor",
-        "FocusedBorderColor",
-        "ZIndex",
-        "BorderThickness",
-        "FocusedBorderThickness",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "TabIndex",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        }
-      ],
-      "HasDynamicProperties": false,
-      "IsAutoGenerated": false,
-      "IsComponentDefinition": false,
-      "IsDataControl": false,
-      "IsFromScreenLayout": false,
-      "IsGroupControl": false,
-      "IsLocked": false,
-      "LayoutName": "",
-      "MetaDataIDKey": "",
-      "Name": "tab2",
-      "ParentIndex": 7,
-      "PersistMetaDataIDKey": false,
-      "Properties": [
-        {
-          "Category": "Design",
-          "PropertyName": "BorderThickness",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "ZIndex",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderStyle",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Height",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Width",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Y",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "X",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisplayMode",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Fill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderThickness",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Color",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Icon",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "TabIndex",
-          "RuleProviderType": "Unknown"
-        }
-      ],
-      "StyleName": "defaultIconStyle",
-      "Type": "ControlInfo"
-    },
-    "tab3": {
-      "AllowAccessToGlobals": true,
-      "ControlPropertyState": [
-        "Icon",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Color",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "DisabledColor",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "RGBA(16, 110, 190, 1)",
-          "InvariantPropertyName": "PressedColor",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "HoverColor",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Fill",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "DisabledFill",
-        "PressedFill",
-        "HoverFill",
-        "DisplayMode",
-        "X",
-        "Y",
-        "Width",
-        "Height",
-        "BorderStyle",
-        "BorderColor",
-        "DisabledBorderColor",
-        "PressedBorderColor",
-        "HoverBorderColor",
-        "FocusedBorderColor",
-        "ZIndex",
-        "BorderThickness",
-        "FocusedBorderThickness",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "TabIndex",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        }
-      ],
-      "HasDynamicProperties": false,
-      "IsAutoGenerated": false,
-      "IsComponentDefinition": false,
-      "IsDataControl": false,
-      "IsFromScreenLayout": false,
-      "IsGroupControl": false,
-      "IsLocked": false,
-      "LayoutName": "",
-      "MetaDataIDKey": "",
-      "Name": "tab3",
-      "ParentIndex": 8,
-      "PersistMetaDataIDKey": false,
-      "Properties": [
-        {
-          "Category": "Design",
-          "PropertyName": "BorderThickness",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "ZIndex",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderStyle",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Height",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Width",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Y",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "X",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisplayMode",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Fill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderThickness",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Color",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Icon",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "TabIndex",
-          "RuleProviderType": "Unknown"
-        }
-      ],
-      "StyleName": "defaultIconStyle",
-      "Type": "ControlInfo"
-    },
     "textinput1": {
       "AllowAccessToGlobals": true,
       "ControlPropertyState": [
@@ -3484,7 +3091,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "textinput1",
-      "ParentIndex": 13,
+      "ParentIndex": 11,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
diff --git a/fluentui/Src/Main.fx.yaml b/fluentui/Src/Main.fx.yaml
index a2f63be99fa00fe39245419e0855c9867448ea30..c09abad1e1d916cde3c0028e05d13841c98ddbab 100644
--- a/fluentui/Src/Main.fx.yaml
+++ b/fluentui/Src/Main.fx.yaml
@@ -84,7 +84,7 @@ Main As screen:
 
     tab1 As icon.Bookmark:
         BorderColor: =RGBA(0, 0, 0, 0)
-        Color: =RGBA(255, 255, 255, 1)
+        Color: =RGBA(224, 24, 24, 1)
         DisabledBorderColor: =RGBA(0, 0, 0, 0)
         DisabledColor: =RGBA(225, 223, 221, 1)
         DisabledFill: =RGBA(0, 0, 0, 0)
@@ -101,50 +101,8 @@ Main As screen:
         PressedColor: =RGBA(255, 255, 255, 1)
         PressedFill: =RGBA(0, 0, 0, 0)
         TabIndex: =6
-        X: =48
-        Y: =857
         ZIndex: =4
 
-    tab2 As icon.Bookmark:
-        BorderColor: =RGBA(0, 0, 0, 0)
-        Color: =RGBA(255, 255, 255, 1)
-        DisabledBorderColor: =RGBA(245, 245, 245, 1)
-        DisabledColor: =RGBA(225, 223, 221, 1)
-        DisabledFill: =RGBA(0, 0, 0, 0)
-        Fill: =RGBA(224, 24, 24, 1)
-        FocusedBorderThickness: =4
-        HoverBorderColor: =RGBA(0, 0, 0, 0)
-        HoverColor: =RGBA(251, 188, 159, 1)
-        HoverFill: =RGBA(0, 0, 0, 0)
-        Icon: =Icon.Bookmark
-        PressedBorderColor: =RGBA(0, 0, 0, 0)
-        PressedColor: =RGBA(255, 255, 255, 1)
-        PressedFill: =RGBA(0, 0, 0, 0)
-        TabIndex: =6
-        X: =143
-        Y: =857
-        ZIndex: =5
-
-    tab3 As icon.Bookmark:
-        BorderColor: =RGBA(0, 0, 0, 0)
-        Color: =RGBA(255, 255, 255, 1)
-        DisabledBorderColor: =RGBA(245, 245, 245, 1)
-        DisabledColor: =RGBA(225, 223, 221, 1)
-        DisabledFill: =RGBA(0, 0, 0, 0)
-        Fill: =RGBA(224, 24, 24, 1)
-        FocusedBorderThickness: =4
-        HoverBorderColor: =RGBA(0, 0, 0, 0)
-        HoverColor: =RGBA(251, 188, 159, 1)
-        HoverFill: =RGBA(0, 0, 0, 0)
-        Icon: =Icon.Bookmark
-        PressedBorderColor: =RGBA(0, 0, 0, 0)
-        PressedColor: =RGBA(255, 255, 255, 1)
-        PressedFill: =RGBA(0, 0, 0, 0)
-        TabIndex: =7
-        X: =247
-        Y: =857
-        ZIndex: =6
-
     SendMail1 As icon.Mail:
         BorderColor: =RGBA(0, 0, 0, 0)
         Color: =RGBA(255, 255, 255, 1)
@@ -163,8 +121,8 @@ Main As screen:
         PressedColor: =RGBA(180, 24, 24, 1)
         PressedFill: =RGBA(0, 0, 0, 0)
         Width: =77
-        X: =414
-        Y: =857
+        X: =396
+        Y: =874
         ZIndex: =7
 
     completionmode As toggleSwitch:
@@ -187,10 +145,11 @@ Main As screen:
         TrueHoverFill: =RGBA(251, 188, 159, 1)
         Width: =103
         X: =40
-        Y: =948
+        Y: =878
         ZIndex: =8
 
     Label7 As label:
+        Align: =Align.Center
         BorderColor: =RGBA(0, 0, 0, 0)
         BorderStyle: =BorderStyle.None
         BorderThickness: =2
@@ -199,12 +158,12 @@ Main As screen:
         DisabledColor: =RGBA(161, 159, 157, 1)
         FocusedBorderThickness: =4
         Font: =Font.'Segoe UI'
-        Height: =49
+        Height: =100
         Size: =28
         Text: ="Creativity Mode"
-        Width: =310
+        Width: =178
         X: =155
-        Y: =948
+        Y: =872
         ZIndex: =9
 
     Dropdown1 As dropdown:
@@ -320,6 +279,6 @@ Main As screen:
         PressedFill: =RGBA(0, 0, 0, 0)
         TabIndex: =3
         X: =536
-        Y: =865
+        Y: =882
         ZIndex: =15