diff --git a/SampleApp/.vs/SampleApp/xs/UserPrefs.xml b/SampleApp/.vs/SampleApp/xs/UserPrefs.xml
index b519212c10ccbad8e4f04f392cec52a96966f890..eb501b324e2ffb9eac0d9d60e3168cdbd82c8746 100644
--- a/SampleApp/.vs/SampleApp/xs/UserPrefs.xml
+++ b/SampleApp/.vs/SampleApp/xs/UserPrefs.xml
@@ -1,32 +1,28 @@
 <Properties StartupConfiguration="{1EE7473C-9A98-44EF-8124-C4D1E0E468F8}|Default">
-  <MonoDevelop.Ide.Workbench ActiveDocument="SampleApp/ViewModels/ListPageViewModel.cs">
-    <Files>
-      <File FileName="SampleApp/ViewModels/ListPageViewModel.cs" Line="21" Column="56" />
-      <File FileName="SampleApp/Views/MainPage.xaml.cs" Line="1" Column="1" />
-      <File FileName="SampleApp/Views/MainPage.xaml" Line="22" Column="32" />
-    </Files>
+  <MonoDevelop.Ide.Workbench>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="SampleApp" expanded="True">
             <Node name="SampleApp" expanded="True">
-              <Node name="Models" expanded="True" />
-              <Node name="ViewModels" expanded="True">
-                <Node name="ListPageViewModel.cs" selected="True" />
-              </Node>
               <Node name="Views" expanded="True">
+                <Node name="Functionality2.xaml" expanded="True">
+                  <Node name="Functionality2.xaml.cs" selected="True" />
+                </Node>
+                <Node name="Functionality4.xaml" expanded="True" />
                 <Node name="MainPage.xaml" expanded="True" />
               </Node>
             </Node>
+            <Node name="SampleApp.iOS" expanded="True" />
           </Node>
         </State>
       </Pad>
     </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.ItemProperties.SampleApp.Android AndroidDesignerPreferredTheme="Theme.AppCompat.Light.NoActionBar" PreferredExecutionTarget="Android.pixel_2_q_10_0_-_api_29" />
-  <MonoDevelop.Ide.ItemProperties.SampleApp.iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.d0d4bfac7e5fd6f1456633ef7d45122e2fa38791" />
+  <MonoDevelop.Ide.ItemProperties.SampleApp.iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.702581F9-973B-4F9F-A1E7-5A202CF499AB" />
   <MonoDevelop.Ide.DebuggingService.PinnedWatches />
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/SampleApp/SampleApp/Views/Functionality2.xaml b/SampleApp/SampleApp/Views/Functionality2.xaml
index aa580b91991a8dadfea5f8abd3d347515608868e..4202d99ab1134b045ea9d51a9c13cb69324fc48c 100644
--- a/SampleApp/SampleApp/Views/Functionality2.xaml
+++ b/SampleApp/SampleApp/Views/Functionality2.xaml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="SampleApp.Views.Functionality2">
+
     <ContentPage.Content>
         <Grid Margin="10,50">
             <Grid.RowDefinitions>
+                <RowDefinition Height="80"></RowDefinition>
                 <RowDefinition Height="80"></RowDefinition>
                 <RowDefinition Height="80"></RowDefinition>
                 <RowDefinition Height="80"></RowDefinition>
@@ -15,13 +17,13 @@
                 <ColumnDefinition></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>
             </Grid.ColumnDefinitions>
+            <Label x:Name="FocusOrderLabel" Grid.Row="0"></Label>
+            <Label x:Name="label1" Text="1" Grid.Row="1" Grid.Column="0" BackgroundColor="AliceBlue" VerticalTextAlignment="Center" HorizontalTextAlignment="Center"></Label>
+            <Label x:Name="label2" Text="2" Grid.Row="2" Grid.Column="2" BackgroundColor="AntiqueWhite" VerticalTextAlignment="Center" HorizontalTextAlignment="Center"></Label>
+            <Label x:Name="label3" Text="3" Grid.Row="3" Grid.Column="1" BackgroundColor="LightYellow" VerticalTextAlignment="Center" HorizontalTextAlignment="Center"></Label>
+            <Label x:Name="label4" Text="4" Grid.Row="4" Grid.Column="3" BackgroundColor="LightCoral" VerticalTextAlignment="Center" HorizontalTextAlignment="Center"></Label>
 
-            <Label x:Name="label1" Text="1" Grid.Row="0" Grid.Column="0" BackgroundColor="AliceBlue" VerticalTextAlignment="Center" HorizontalTextAlignment="Center"></Label>
-            <Label x:Name="label2" Text="2" Grid.Row="1" Grid.Column="2" BackgroundColor="AntiqueWhite" VerticalTextAlignment="Center" HorizontalTextAlignment="Center"></Label>
-            <Label x:Name="label3" Text="3" Grid.Row="2" Grid.Column="1" BackgroundColor="LightYellow" VerticalTextAlignment="Center" HorizontalTextAlignment="Center"></Label>
-            <Label x:Name="label4" Text="4" Grid.Row="3" Grid.Column="3" BackgroundColor="LightCoral" VerticalTextAlignment="Center" HorizontalTextAlignment="Center"></Label>
-
-            <Button Text="Change focus order to left-right" Grid.Row="4" Grid.ColumnSpan="4" BackgroundColor="Blue" TextColor="White" Clicked="OnButtonClicked" x:Name="ChangeButton"></Button>
+            <Button Text="Change focus order to left-right" Grid.Row="5" Grid.ColumnSpan="4" BackgroundColor="Blue" TextColor="White" Clicked="OnButtonClicked" x:Name="ChangeButton"></Button>
         </Grid>
         
     </ContentPage.Content>
diff --git a/SampleApp/SampleApp/Views/Functionality2.xaml.cs b/SampleApp/SampleApp/Views/Functionality2.xaml.cs
index 26ea0eb2fb7a4fe29beca661360f30871f6ef3f5..d18afc6b97f3be194f1dffc5dad618c0d2388dc0 100644
--- a/SampleApp/SampleApp/Views/Functionality2.xaml.cs
+++ b/SampleApp/SampleApp/Views/Functionality2.xaml.cs
@@ -12,8 +12,9 @@ namespace SampleApp.Views
         {
             InitializeComponent();
 
+            FocusOrderLabel.Text = "Focus order is: TOP-DOWN";
 
-
+            AutomationProperties.SetIsInAccessibleTree(FocusOrderLabel, true);
             AutomationProperties.SetIsInAccessibleTree(label1, true);
             AutomationProperties.SetIsInAccessibleTree(label2, true);
             AutomationProperties.SetIsInAccessibleTree(label3, true);
@@ -37,7 +38,7 @@ namespace SampleApp.Views
                 label3.Text = "2";
                 label3.TabIndex = 2;
                 ChangeButton.Text = "Change focus order to top-down";
-                
+                FocusOrderLabel.Text = "Focus order is: LEFT-RIGHT";
             }
             else
             {
@@ -46,7 +47,7 @@ namespace SampleApp.Views
                 label3.Text = "3";
                 label3.TabIndex = 3;
                 ChangeButton.Text = "Change focus order to left-right";
-                
+                FocusOrderLabel.Text = "Focus order is: TOP-DOWN";
             }
             topDown = !topDown;
 
diff --git a/SampleApp/SampleApp/Views/Functionality4.xaml.cs b/SampleApp/SampleApp/Views/Functionality4.xaml.cs
index 756206e3b71fea4edda37804397b5b57f9c84296..eda6780b3f875a7a4d4d917a34350e700414b8b8 100644
--- a/SampleApp/SampleApp/Views/Functionality4.xaml.cs
+++ b/SampleApp/SampleApp/Views/Functionality4.xaml.cs
@@ -26,6 +26,7 @@ namespace SampleApp.Views
             };
             AutomationProperties.SetIsInAccessibleTree(infoLabel, true);
             AutomationProperties.SetIsInAccessibleTree(BellImage, true);
+            AutomationProperties.SetName(BellImage, "Bell Image");
             background.Children.Add(BellImage);
         }
     }