diff --git a/fluentui-ard/Entropy/Entropy.json b/fluentui-ard/Entropy/Entropy.json
index 4ec04195489a8c3327b7e0148f91e5e12cc54766..a9d5c8bf55ed7fadbef3b8fa886c0c0100e36a06 100644
--- a/fluentui-ard/Entropy/Entropy.json
+++ b/fluentui-ard/Entropy/Entropy.json
@@ -26,7 +26,7 @@
   "DoesTestStepsMetadataExist": true,
   "FunctionParamsInvariantScripts": {},
   "FunctionParamsInvariantScriptsOnInstances": {},
-  "HeaderLastSavedDateTimeUTC": "01/18/2024 14:07:02",
+  "HeaderLastSavedDateTimeUTC": "01/18/2024 14:09:15",
   "IsLegacyComponentAllowGlobalScopeCase": false,
   "LocalConnectionIDReferences": {
     "3949869c-0bc9-4a51-90cd-bf1287c9e326": "\"/providers/microsoft.powerapps/apis/shared_azure-2dopenai-2dconnector-5f1d98e22a441b0e2d-5f3739fab3a930da50/connections/shared-azure-2dopena-3f4cdc89-63b5-4018-882d-1f1c97eb18e0\"",
diff --git a/fluentui-ard/Entropy/checksum.json b/fluentui-ard/Entropy/checksum.json
index b8153ed0b76035613715164bcd06d0fff077bd06..2b7b2e9447da05a4ed2ef86a2f3fa9751d795f24 100644
--- a/fluentui-ard/Entropy/checksum.json
+++ b/fluentui-ard/Entropy/checksum.json
@@ -9,8 +9,8 @@
     "Assets\\Images\\0001.png": "C8_D0WGiAaxVuIcUWpkdQuVcyQy/gSJZuMRDwL63zxJhAk=",
     "Assets\\Images\\0002.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=",
     "Controls\\1.json": "C8_/PwNEU6dV00x9Xr4Yt93zX1EmsxAh36PVgOdFy9WD8g=",
-    "Controls\\4.json": "C8_PFhDymuFacz55/SM01ZTxG9lvIAbQqqutClUA50tsu4=",
-    "Header.json": "C8_LjlJHsQhrDCtlYUw5P5JhjULHBoq8yphr+1EUVLc8L0=",
+    "Controls\\4.json": "C8_Vgi3dc+TpX+lj5SMo5Zl/HDL6NDlfoPPF+z+wo0I+4I=",
+    "Header.json": "C8_3v1ygRpSlcG5NFVQsfVTHvZSUMUSLTTzc2NgS8xJeCI=",
     "Properties.json": "C8_2Nj2nMrhtXCfPyv58YRqId9Pclmrgiq4uUyNsaCtijM=",
     "References\\DataSources.json": "C8_khu+WUDb4a5tvZu/0zvUqAExTFpdTX7df3InxUaD7RQ=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
@@ -19,15 +19,15 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ClientStampedChecksum": "C8_57c8bpCmJQQbMY1iVlx9jJyUfeCUCWyT7oi5EUIqu+M=",
+  "ClientStampedChecksum": "C8_uNA66NIsI01LotmPfTDMaLEiA+yEakdHbADge0VMKc8=",
   "ServerPerFileChecksums": {
     "AppCheckerResult.sarif": "C8_ylqNXPykd9aBjDnhE4nSmloT60jWYay4S0eDA22aOfY=",
     "AppTests\\2.json": "C8_omA4KVA0ye8qkU+fMWC8nSkoW42AEHM4XBnnYkUJCys=",
     "Assets\\Images\\0001.png": "C8_D0WGiAaxVuIcUWpkdQuVcyQy/gSJZuMRDwL63zxJhAk=",
     "Assets\\Images\\0002.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=",
     "Controls\\1.json": "C8_/PwNEU6dV00x9Xr4Yt93zX1EmsxAh36PVgOdFy9WD8g=",
-    "Controls\\4.json": "C8_PFhDymuFacz55/SM01ZTxG9lvIAbQqqutClUA50tsu4=",
-    "Header.json": "C8_LjlJHsQhrDCtlYUw5P5JhjULHBoq8yphr+1EUVLc8L0=",
+    "Controls\\4.json": "C8_Vgi3dc+TpX+lj5SMo5Zl/HDL6NDlfoPPF+z+wo0I+4I=",
+    "Header.json": "C8_3v1ygRpSlcG5NFVQsfVTHvZSUMUSLTTzc2NgS8xJeCI=",
     "Properties.json": "C8_2Nj2nMrhtXCfPyv58YRqId9Pclmrgiq4uUyNsaCtijM=",
     "References\\DataSources.json": "C8_khu+WUDb4a5tvZu/0zvUqAExTFpdTX7df3InxUaD7RQ=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
@@ -36,5 +36,5 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ServerStampedChecksum": "C8_57c8bpCmJQQbMY1iVlx9jJyUfeCUCWyT7oi5EUIqu+M="
+  "ServerStampedChecksum": "C8_uNA66NIsI01LotmPfTDMaLEiA+yEakdHbADge0VMKc8="
 }
\ No newline at end of file
diff --git a/fluentui-ard/Src/BaseScreen.fx.yaml b/fluentui-ard/Src/BaseScreen.fx.yaml
index 8055fc6fdad9ede2c78f1f7f1409ae308d6540d2..0d3d8e52e742b5928f0b35cebf4fbdc65d811ee3 100644
--- a/fluentui-ard/Src/BaseScreen.fx.yaml
+++ b/fluentui-ard/Src/BaseScreen.fx.yaml
@@ -68,6 +68,7 @@ BaseScreen As screen:
             PressedBorderColor: =RGBA(0, 52, 128, 1)
             Size: =18
             TabIndex: =5
+            Tooltip: ="5"
             TrueFill: =RGBA(251, 188, 159, 1)
             TrueHoverFill: =RGBA(251, 188, 159, 1)
             TrueText: ="true"
@@ -119,6 +120,7 @@ BaseScreen As screen:
             PressedColor: =RGBA(251, 188, 159, 1)
             PressedFill: =RGBA(0, 0, 0, 0)
             TabIndex: =3
+            Tooltip: ="3"
             Width: |-
                 =If(ConFkt1.Height<=ConFkt1.Width/6, ConFkt1.Height, 
                 ConFkt1.Height > ConFkt1.Width/6, ConFkt1.Width/6)
@@ -148,6 +150,7 @@ BaseScreen As screen:
             PressedFill: =RGBA(0, 0, 0, 0)
             Rotation: =20
             TabIndex: =6
+            Tooltip: ="6"
             Width: |-
                 =If(ConFkt1.Height<=ConFkt1.Width/6, ConFkt1.Height, 
                 ConFkt1.Height > ConFkt1.Width/6, ConFkt1.Width/6)
@@ -199,6 +202,7 @@ BaseScreen As screen:
             Reset: =
             Size: =28
             TabIndex: =7
+            Tooltip: ="7"
             Width: =ConResp.Width - 2*(ConResp.Width/25)
             X: =ConResp.Width - (ConResp.Width - ConResp.Width/25)
             Y: =ConResp.Height - (ConResp.Height - ConResp.Height/50)
@@ -239,6 +243,7 @@ BaseScreen As screen:
             Reset: =
             Size: =24
             TabIndex: =1
+            Tooltip: ="1"
             Width: |+
                 =ConSend.Width - ((ConSend.Width/25)*2.5) - send1.Width
                 
@@ -292,7 +297,7 @@ BaseScreen As screen:
             PressedColor: =RGBA(251, 188, 159, 1)
             PressedFill: =RGBA(0, 0, 0, 0)
             TabIndex: =2
-            Tooltip: ="1"
+            Tooltip: ="2"
             Width: |-
                 =If(ConSend.Height<=ConSend.Width/6, ConSend.Height, 
                 ConSend.Height > ConSend.Width/6, ConSend.Width/8)
diff --git a/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json b/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json
index 513d4ecde52ea16e65cdc0cc44018345e8430f90..40398f3cffc22f3e68addfcf36acbe6a9da6fca8 100644
--- a/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json
+++ b/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json
@@ -693,6 +693,14 @@
           "InvariantPropertyName": "TabIndex",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "",
+          "InvariantPropertyName": "Tooltip",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
         }
       ],
       "HasDynamicProperties": false,
@@ -734,6 +742,11 @@
           "PropertyName": "AccessibleLabel",
           "RuleProviderType": "Unknown"
         },
+        {
+          "Category": "Data",
+          "PropertyName": "Tooltip",
+          "RuleProviderType": "Unknown"
+        },
         {
           "Category": "Design",
           "PropertyName": "Clear",
@@ -2516,6 +2529,14 @@
           "InvariantPropertyName": "AccessibleLabel",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "",
+          "InvariantPropertyName": "Tooltip",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
         }
       ],
       "HasDynamicProperties": false,
@@ -2537,6 +2558,11 @@
           "PropertyName": "AccessibleLabel",
           "RuleProviderType": "Unknown"
         },
+        {
+          "Category": "Data",
+          "PropertyName": "Tooltip",
+          "RuleProviderType": "Unknown"
+        },
         {
           "Category": "Design",
           "PropertyName": "Color",
@@ -3717,6 +3743,14 @@
           "InvariantPropertyName": "TabIndex",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "",
+          "InvariantPropertyName": "Tooltip",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
         }
       ],
       "HasDynamicProperties": false,
@@ -3738,6 +3772,11 @@
           "PropertyName": "AccessibleLabel",
           "RuleProviderType": "Unknown"
         },
+        {
+          "Category": "Data",
+          "PropertyName": "Tooltip",
+          "RuleProviderType": "Unknown"
+        },
         {
           "Category": "Design",
           "PropertyName": "Rotation",
@@ -4114,6 +4153,14 @@
           "InvariantPropertyName": "TabIndex",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "",
+          "InvariantPropertyName": "Tooltip",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
         }
       ],
       "HasDynamicProperties": false,
@@ -4155,6 +4202,11 @@
           "PropertyName": "AccessibleLabel",
           "RuleProviderType": "Unknown"
         },
+        {
+          "Category": "Data",
+          "PropertyName": "Tooltip",
+          "RuleProviderType": "Unknown"
+        },
         {
           "Category": "Design",
           "PropertyName": "Mode",