diff --git a/fluentui-ard/CanvasManifest.json b/fluentui-ard/CanvasManifest.json
index c317d79999874006061eb825f9c41894f1a79a94..5eac6147bda250f4abd164ac9628f4cc9ac9c92f 100644
--- a/fluentui-ard/CanvasManifest.json
+++ b/fluentui-ard/CanvasManifest.json
@@ -11,7 +11,7 @@
   },
   "Properties": {
     "AppCreationSource": "AppFromScratch",
-    "AppDescription": "Screen",
+    "AppDescription": "Index",
     "AppPreviewFlagsMap": {
       "aibuilderserviceenrollment": false,
       "allowmultiplescreensincanvaspages": false,
diff --git a/fluentui-ard/Entropy/AppCheckerResult.sarif b/fluentui-ard/Entropy/AppCheckerResult.sarif
index ca076988fdf44d505c6c367d0e09eb813a8e7fa0..b92605e80465f612cf1dfe00c96bc03d630860f9 100644
--- a/fluentui-ard/Entropy/AppCheckerResult.sarif
+++ b/fluentui-ard/Entropy/AppCheckerResult.sarif
@@ -64,10 +64,10 @@
             "id": "issue"
           },
           "properties": {
-            "level": "Medium"
+            "level": "Low"
           },
-          "ruleId": "acc-TabIndexShouldBeDefinedForInteractiveControl",
-          "ruleIndex": 1
+          "ruleId": "acc-TabOrderShouldBeChecked",
+          "ruleIndex": 0
         },
         {
           "locations": [
@@ -157,7 +157,7 @@
             "level": "Medium"
           },
           "ruleId": "acc-HelpfulControlSettingNeeded",
-          "ruleIndex": 2
+          "ruleIndex": 1
         },
         {
           "locations": [
@@ -337,7 +337,7 @@
             "level": "Medium"
           },
           "ruleId": "app-UnusedMediaResources",
-          "ruleIndex": 3
+          "ruleIndex": 2
         }
       ],
       "tool": {
@@ -362,23 +362,6 @@
                 "whyFix": "When a screen reader reads the elements of a slide, it's important that they appear in the order that a user would see them, instead of the order they were added to the slide."
               }
             },
-            {
-              "id": "acc-TabIndexShouldBeDefinedForInteractiveControl",
-              "messageStrings": {
-                "issue": {
-                  "text": "Missing tab stop"
-                }
-              },
-              "properties": {
-                "componentType": "app",
-                "howToFix": [
-                  "Set TabIndex to 0 or greater to ensure that interactive elements have a tab stop."
-                ],
-                "level": "Medium",
-                "primaryCategory": "accessibility",
-                "whyFix": "People who use the keyboard with your app will not be able to access this element without a tab stop."
-              }
-            },
             {
               "id": "acc-HelpfulControlSettingNeeded",
               "messageStrings": {
diff --git a/fluentui-ard/Entropy/Entropy.json b/fluentui-ard/Entropy/Entropy.json
index 9067970e8a2453dd60c0eef7fd59bb407b49fe11..6a4490bcbdf97f580a053a72b67b698bf350889f 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 13:51:23",
+  "HeaderLastSavedDateTimeUTC": "01/18/2024 13:55:47",
   "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 b476e5d2f7cd685a282e2030aebc4b6c6788489b..bd6261c98d55e7d4e9a106a7647eec6f27dd4230 100644
--- a/fluentui-ard/Entropy/checksum.json
+++ b/fluentui-ard/Entropy/checksum.json
@@ -4,14 +4,14 @@
     "IsLocalBuild": false
   },
   "ClientPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_tsRBd/dJaB2yaL8OgZrzx/LSubqjh+TYHNgL/UbdJ7M=",
+    "AppCheckerResult.sarif": "C8_uLQpwzreW0wqDMq4VVkJ4DshROt00Srnj3POne0cP5E=",
     "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_+PGry9A/cZTM0UAB4F9jfz9sSgT+gK87UHX4MSoh0w8=",
-    "Header.json": "C8_a5pUtAt4qQGqfUzCmVRTmc76fkzhBgI9MjZ38t5hJ8A=",
-    "Properties.json": "C8_i2W0Cb2yeMEda3qXNLxh4wbSXygE/A2ULBEkP/9ysqE=",
+    "Controls\\4.json": "C8_JY2CXdFgI67CogW+2WG5BwwemdmNmIkKuagrOOLzspw=",
+    "Header.json": "C8_L/13Pl2KOBx0h2FTSylkxigirrWwe5Ps9JvKxBYfR2o=",
+    "Properties.json": "C8_2Nj2nMrhtXCfPyv58YRqId9Pclmrgiq4uUyNsaCtijM=",
     "References\\DataSources.json": "C8_khu+WUDb4a5tvZu/0zvUqAExTFpdTX7df3InxUaD7RQ=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
     "References\\Resources.json": "C8_/Z3a8U+hQac6bzkZ5btLTX7v5KpJfnJmMoWeHQs4HDA=",
@@ -19,16 +19,16 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ClientStampedChecksum": "C8_eyHRDD5hyIJfeRqqPtLnFZ0wHCeI0mGDR24u3vy9xPs=",
+  "ClientStampedChecksum": "C8_lE565PMsOUj3fuYzqYJt0Yzz0skt+b1NWmIGK8LPSEY=",
   "ServerPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_tsRBd/dJaB2yaL8OgZrzx/LSubqjh+TYHNgL/UbdJ7M=",
+    "AppCheckerResult.sarif": "C8_uLQpwzreW0wqDMq4VVkJ4DshROt00Srnj3POne0cP5E=",
     "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_+PGry9A/cZTM0UAB4F9jfz9sSgT+gK87UHX4MSoh0w8=",
-    "Header.json": "C8_a5pUtAt4qQGqfUzCmVRTmc76fkzhBgI9MjZ38t5hJ8A=",
-    "Properties.json": "C8_i2W0Cb2yeMEda3qXNLxh4wbSXygE/A2ULBEkP/9ysqE=",
+    "Controls\\4.json": "C8_JY2CXdFgI67CogW+2WG5BwwemdmNmIkKuagrOOLzspw=",
+    "Header.json": "C8_L/13Pl2KOBx0h2FTSylkxigirrWwe5Ps9JvKxBYfR2o=",
+    "Properties.json": "C8_2Nj2nMrhtXCfPyv58YRqId9Pclmrgiq4uUyNsaCtijM=",
     "References\\DataSources.json": "C8_khu+WUDb4a5tvZu/0zvUqAExTFpdTX7df3InxUaD7RQ=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
     "References\\Resources.json": "C8_/Z3a8U+hQac6bzkZ5btLTX7v5KpJfnJmMoWeHQs4HDA=",
@@ -36,5 +36,5 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ServerStampedChecksum": "C8_eyHRDD5hyIJfeRqqPtLnFZ0wHCeI0mGDR24u3vy9xPs="
+  "ServerStampedChecksum": "C8_lE565PMsOUj3fuYzqYJt0Yzz0skt+b1NWmIGK8LPSEY="
 }
\ No newline at end of file
diff --git a/fluentui-ard/Src/BaseScreen.fx.yaml b/fluentui-ard/Src/BaseScreen.fx.yaml
index dded6d557d2961d25f935aa3a2f8b8c9937874e3..3596fb35ef01225d18685b6aac70d4e0b3154461 100644
--- a/fluentui-ard/Src/BaseScreen.fx.yaml
+++ b/fluentui-ard/Src/BaseScreen.fx.yaml
@@ -23,7 +23,7 @@ BaseScreen As screen:
             Height: =ConBan.Height
             Italic: =true
             Size: =ConBan.Height/3.6
-            TabIndex: =7
+            TabIndex: =8
             Text: |-
                 ="Ask
                 ChatGPT"
@@ -36,7 +36,7 @@ BaseScreen As screen:
             AccessibleLabel: ="ARD Logo"
             Height: =ConBan.Height - (ConBan.Height/6)
             Image: ='ard-logo'
-            TabIndex: =8
+            TabIndex: =9
             Width: =ConBan.Width/3.5
             X: =ConBan.Width/3
             Y: =ConBan.Y + (ConBan.Height/7)
@@ -198,7 +198,7 @@ BaseScreen As screen:
             RadiusTopRight: =10
             Reset: =
             Size: =28
-            TabIndex: =-1
+            TabIndex: =7
             Width: =ConResp.Width - 2*(ConResp.Width/25)
             X: =ConResp.Width - (ConResp.Width - ConResp.Width/25)
             Y: =ConResp.Height - (ConResp.Height - ConResp.Height/50)