diff --git a/AIDevGallery/Controls/ModelPicker/AddHFModelView.xaml b/AIDevGallery/Controls/ModelPicker/AddHFModelView.xaml
index abc7a665..51a7c8af 100644
--- a/AIDevGallery/Controls/ModelPicker/AddHFModelView.xaml
+++ b/AIDevGallery/Controls/ModelPicker/AddHFModelView.xaml
@@ -56,7 +56,9 @@
                     Grid.Row="1"
                     HorizontalAlignment="Center"
                     Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                    Text="Browse and download generative language models from Hugging Face." />
+                    Text="Browse and download generative language models from Hugging Face."
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
                 <Grid
                     Grid.Row="2"
                     MaxWidth="560"
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/ESRGAN/SuperResolution.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/ESRGAN/SuperResolution.xaml.cs
index 7855fade..01398017 100644
--- a/AIDevGallery/Samples/Open Source Models/Image Models/ESRGAN/SuperResolution.xaml.cs	
+++ b/AIDevGallery/Samples/Open Source Models/Image Models/ESRGAN/SuperResolution.xaml.cs	
@@ -133,10 +133,10 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
 
         // Pick a file
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
             // Call function to run inference and classify image
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await EnhanceImage(file.Path);
         }
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml b/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml
index f88a340f..e9d4b6ac 100644
--- a/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml	
+++ b/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml	
@@ -35,6 +35,7 @@
             Visibility="Collapsed" />
         <Grid
             Margin="8"
+            Padding="2"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
             Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}"
@@ -44,6 +45,7 @@
                 Padding="8"
                 AutomationProperties.Name="Select image"
                 Click="UploadButton_Click"
+                FocusVisualMargin="-3"
                 ToolTipService.ToolTip="Select image">
 
                 <FontIcon FontSize="16" Glyph="&#xEE71;" />
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml.cs
index c982b379..8381ae05 100644
--- a/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml.cs	
+++ b/AIDevGallery/Samples/Open Source Models/Image Models/FFNet/SegmentStreets.xaml.cs	
@@ -128,9 +128,9 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
         picker.ViewMode = PickerViewMode.Thumbnail;
 
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await Segment(file.Path);
         }
@@ -148,7 +148,7 @@ private async Task Segment(string filePath)
         UploadButton.Visibility = Visibility.Collapsed;
 
         DefaultImage.Source = new BitmapImage(new Uri(filePath));
-        NarratorHelper.AnnounceImageChanged(DefaultImage, "Image changed: new upload."); // <exclude-line>
+        NarratorHelper.AnnounceImageChanged(DefaultImage, "Content changed: new upload."); // <exclude-line>
 
         using Bitmap originalImage = new(filePath);
         int originalImageWidth = originalImage.Width;
@@ -271,7 +271,7 @@ private async Task Segment(string filePath)
         // Convert the final overlay to BitmapImage for display
         BitmapImage outputImage = BitmapFunctions.ConvertBitmapToBitmapImage(processedImage);
 
-        NarratorHelper.AnnounceImageChanged(DefaultImage, "Image changed: all regions segmented."); // <exclude-line>
+        NarratorHelper.AnnounceImageChanged(DefaultImage, "Content changed: all regions segmented."); // <exclude-line>
 
         DispatcherQueue.TryEnqueue(() =>
         {
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/Faster RCNN/ObjectDetection.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/Faster RCNN/ObjectDetection.xaml.cs
index 95bbb063..4df2152d 100644
--- a/AIDevGallery/Samples/Open Source Models/Image Models/Faster RCNN/ObjectDetection.xaml.cs	
+++ b/AIDevGallery/Samples/Open Source Models/Image Models/Faster RCNN/ObjectDetection.xaml.cs	
@@ -130,9 +130,9 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
         picker.ViewMode = PickerViewMode.Thumbnail;
 
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await DetectObjects(file.Path);
         }
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml b/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml
index 27ab57e6..5453cf03 100644
--- a/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml	
+++ b/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml	
@@ -35,6 +35,7 @@
             Visibility="Collapsed" />
         <Grid
             Margin="8"
+            Padding="2"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
             Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}"
@@ -44,6 +45,7 @@
                 Padding="8"
                 AutomationProperties.Name="Select image"
                 Click="UploadButton_Click"
+                FocusVisualMargin="-3"
                 ToolTipService.ToolTip="Select image">
 
                 <FontIcon FontSize="16" Glyph="&#xEE71;" />
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml.cs
index 73d7687c..721b0295 100644
--- a/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml.cs	
+++ b/AIDevGallery/Samples/Open Source Models/Image Models/HRNetPose/PoseDetection.xaml.cs	
@@ -127,9 +127,9 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
         picker.ViewMode = PickerViewMode.Thumbnail;
 
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await DetectPose(file.Path);
         }
@@ -146,7 +146,7 @@ private async Task DetectPose(string filePath)
         Loader.Visibility = Visibility.Visible;
         UploadButton.Visibility = Visibility.Collapsed;
         DefaultImage.Source = new BitmapImage(new Uri(filePath));
-        NarratorHelper.AnnounceImageChanged(DefaultImage, "Image changed: new upload."); // <exclude-line>
+        NarratorHelper.AnnounceImageChanged(DefaultImage, "Content changed: new upload."); // <exclude-line>
 
         using Bitmap originalImage = new(filePath);
 
@@ -182,7 +182,7 @@ private async Task DetectPose(string filePath)
 
         using Bitmap output = PoseHelper.RenderPredictions(originalImage, predictions, .02f);
         BitmapImage outputImage = BitmapFunctions.ConvertBitmapToBitmapImage(output);
-        NarratorHelper.AnnounceImageChanged(DefaultImage, "Image changed: key points rendered."); // <exclude-line>
+        NarratorHelper.AnnounceImageChanged(DefaultImage, "Content changed: key points rendered."); // <exclude-line>
 
         DispatcherQueue.TryEnqueue(() =>
         {
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml b/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml
index 384138c1..43216e20 100644
--- a/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml	
+++ b/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml	
@@ -35,6 +35,7 @@
             Visibility="Collapsed" />
         <Grid
             Margin="8"
+            Padding="2"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
             Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}"
@@ -44,6 +45,7 @@
                 Padding="8"
                 AutomationProperties.Name="Select image"
                 Click="UploadButton_Click"
+                FocusVisualMargin="-3"
                 ToolTipService.ToolTip="Select image">
 
                 <FontIcon FontSize="16" Glyph="&#xEE71;" />
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml.cs
index 0f2a0983..430870c8 100644
--- a/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml.cs	
+++ b/AIDevGallery/Samples/Open Source Models/Image Models/MultiHRNetPose/Multipose.xaml.cs	
@@ -152,10 +152,10 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
         picker.ViewMode = PickerViewMode.Thumbnail;
 
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
             // Call function to run inference and classify image
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await RunPipeline(file.Path);
         }
diff --git a/AIDevGallery/Samples/Open Source Models/Image Models/YOLOv4/YOLOObjectDetection.xaml.cs b/AIDevGallery/Samples/Open Source Models/Image Models/YOLOv4/YOLOObjectDetection.xaml.cs
index 1dadf1a8..f0511a57 100644
--- a/AIDevGallery/Samples/Open Source Models/Image Models/YOLOv4/YOLOObjectDetection.xaml.cs	
+++ b/AIDevGallery/Samples/Open Source Models/Image Models/YOLOv4/YOLOObjectDetection.xaml.cs	
@@ -136,10 +136,10 @@ private async void UploadButton_Click(object sender, RoutedEventArgs e)
 
         // Pick a file
         var file = await picker.PickSingleFileAsync();
+        UploadButton.Focus(FocusState.Programmatic);
         if (file != null)
         {
             // Call function to run inference and classify image
-            UploadButton.Focus(FocusState.Programmatic);
             SendSampleInteractedEvent("FileSelected"); // <exclude-line>
             await DetectObjects(file.Path);
         }