From ead511e350327dca97cad6083406101920277007 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Sat, 4 May 2024 16:18:21 +0200
Subject: [PATCH 1/6] First batch

---
 .../Animations/Pages/EasingEditorPage.xaml    |   8 +-
 .../Animations/Pages/EasingsPage.xaml         |   4 +-
 8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml  | 108 +++++------
 .../WeatherTwentyOne/Pages/FavoritesPage.xaml |  66 +++----
 .../WeatherTwentyOne/Pages/SettingsPage.xaml  |  13 +-
 .../Resources/Styles/DefaultTheme.xaml        |   4 +-
 .../Views/Next24HrWidget.xaml                 |   4 +-
 .../WeatherTwentyOne/Views/Next7DWidget.xaml  |   6 +-
 .../WeatherTwentyOne/Views/WidgetsPanel.xaml  |  13 +-
 8.0/Apps/WordPuzzle/WordPuzzle/MainPage.xaml  |   4 +-
 .../BeginnersTask/DetailPage.xaml             |   4 +-
 .../XAML/AttachedNumericValidationPage.xaml   |   4 +-
 .../XAML/EventToCommandBehaviorPage.xaml      |   6 +-
 .../Views/XAML/NumericValidationPage.xaml     |   4 +-
 .../XAML/NumericValidationStylePage.xaml      |   4 +-
 .../Views/AccessTemplateElementPage.xaml      |   4 +-
 .../Views/ContentPresenterPage.xaml           |   4 +-
 .../Views/AlternativeCodeBindingPage.xaml     |   4 +-
 .../Views/AlternativeXamlBindingPage.xaml     |   4 +-
 .../Views/BasicCodeBindingPage.xaml           |   4 +-
 .../Views/BasicXamlBindingPage.xaml           |   4 +-
 .../Views/BetterColorSelectorPage.xaml        |   8 +-
 .../Views/BindingContextInheritancePage.xaml  |   8 +-
 .../Views/CompiledColorSelectorPage.xaml      |   8 +-
 .../Views/EnableButtonsPage.xaml              |   4 +-
 .../Views/MixedBindingsPage.xaml              |   8 +-
 .../Views/MonkeyDetailsPage.xaml              |   4 +-
 .../DataBindingDemos/Views/MonkeysPage.xaml   |   4 +-
 .../Views/MultiBindingFallbackValuePage.xaml  |   4 +-
 .../Views/PathVariationsPage.xaml             |   4 +-
 .../Views/RelativeSourceFindAncestorPage.xaml |   4 +-
 .../Views/RelativeSourceMultiBindingPage.xaml |   4 +-
 .../Views/RelativeSourceSelfPage.xaml         |   4 +-
 .../Views/RgbColorSelectorPage.xaml           |   8 +-
 .../Views/WithDataTemplatePage.xaml           |   8 +-
 .../Views/WithDataTemplatePageFromType.xaml   |   8 +-
 .../Views/WithDataTemplateSelectorPage.xaml   |   5 +-
 .../Views/WithoutDataTemplatePage.xaml        |   8 +-
 .../ControlGallery/ControlGallery.csproj      | 167 +-----------------
 .../Views/XAML/CollectionViewDemoPage.xaml    |   8 +-
 .../Views/XAML/SwipeViewDemoPage.xaml         |   5 +-
 .../Controls/SpacingModifier.xaml             |   5 +-
 .../EmptyViewDataTemplateSelectorPage.xaml    |   7 +-
 .../EmptyView/EmptyViewFilteredPage.xaml      |   7 +-
 .../EmptyViewLoadSimulationPage.xaml          |   4 +-
 .../Views/EmptyView/EmptyViewNullPage.xaml    |   4 +-
 .../Views/EmptyView/EmptyViewSwapPage.xaml    |  16 +-
 .../EmptyView/EmptyViewTemplatePage.xaml      |   8 +-
 .../EmptyViewWithViewsFilteredPage.xaml       |   8 +-
 .../Grouping/VerticalListEmptyGroupsPage.xaml |   4 +-
 .../Grouping/VerticalListGroupingPage.xaml    |   4 +-
 ...icalListGroupingVariableSizeItemsPage.xaml |   8 +-
 .../VerticalListTextGroupingPage.xaml         |   4 +-
 .../HorizontalGridHeaderFooterViewPage.xaml   |   4 +-
 ...ticalListHeaderFooterDataTemplatePage.xaml |   4 +-
 .../VerticalListHeaderFooterStringPage.xaml   |   4 +-
 .../VerticalListHeaderFooterViewPage.xaml     |   4 +-
 .../Views/Layout/HorizontalGridPage.xaml      |   4 +-
 .../Views/Layout/HorizontalGridTextPage.xaml  |   4 +-
 .../Views/Layout/HorizontalListPage.xaml      |   4 +-
 .../Views/Layout/HorizontalListTextPage.xaml  |   4 +-
 .../Views/Layout/VerticalGridPage.xaml        |   4 +-
 .../Views/Layout/VerticalGridTextPage.xaml    |   4 +-
 .../VerticalListDataTemplateSelectorPage.xaml |   4 +-
 .../Views/Layout/VerticalListPage.xaml        |   4 +-
 .../Views/Layout/VerticalListRTLPage.xaml     |   4 +-
 .../Views/Layout/VerticalListTextPage.xaml    |   4 +-
 .../HorizontalGridPullToRefreshPage.xaml      |  15 +-
 .../VerticalListPullToRefreshPage.xaml        |  14 +-
 .../Scrolling/IncrementalLoadingPage.xaml     |   4 +-
 .../ItemsUpdatingScrollModePage.xaml          |   5 +-
 .../Views/Scrolling/ScrollToByIndexPage.xaml  |  23 +--
 .../ScrollToByIndexWithGroupingPage.xaml      |  24 +--
 .../Views/Scrolling/ScrollToByObjectPage.xaml |  22 ++-
 .../ScrollToByObjectWithGroupingPage.xaml     |  22 ++-
 .../VerticalListMultiplePreSelectionPage.xaml |   4 +-
 .../VerticalListMultipleSelectionPage.xaml    |   8 +-
 .../VerticalListSelectionColorPage.xaml       |   4 +-
 .../VerticalListSinglePreSelectionPage.xaml   |   8 +-
 .../VerticalListSingleSelectionPage.xaml      |   8 +-
 .../VerticalListDynamicSizeItemsPage.xaml     |   8 +-
 .../VerticalListVariableSizeItemsPage.xaml    |  13 +-
 .../VerticalListSnapPointsPage.xaml           |  23 +--
 .../Spacing/HorizontalGridSpacingPage.xaml    |   5 +-
 .../Spacing/HorizontalListSpacingPage.xaml    |   5 +-
 .../Spacing/VerticalGridSpacingPage.xaml      |   5 +-
 .../Spacing/VerticalListSpacingPage.xaml      |   5 +-
 .../VerticalListSwipeContextItemsPage.xaml    |   4 +-
 88 files changed, 408 insertions(+), 513 deletions(-)

diff --git a/8.0/Animations/Animations/Pages/EasingEditorPage.xaml b/8.0/Animations/Animations/Pages/EasingEditorPage.xaml
index 668e4d6ce..4b99ff50b 100644
--- a/8.0/Animations/Animations/Pages/EasingEditorPage.xaml
+++ b/8.0/Animations/Animations/Pages/EasingEditorPage.xaml
@@ -43,8 +43,8 @@
                 
                 
             
-                <ScrollView Grid.Row="2">
-                <StackLayout Spacing="0">
+            <ScrollView Grid.Row="2">
+                <VerticalStackLayout Spacing="0">
                     <FlexLayout HorizontalOptions="Center" AlignItems="Center"
                                 BackgroundColor="#1d1d1d">
                         <BoxView FlexLayout.Grow="1" />
@@ -90,8 +90,8 @@
                         </TableSection>
                     </TableView>
                     
-                </StackLayout>
+                </VerticalStackLayout>
             </ScrollView>
-            </Grid>
+        </Grid>
     </ContentPage.Content>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Animations/Animations/Pages/EasingsPage.xaml b/8.0/Animations/Animations/Pages/EasingsPage.xaml
index c5789cf15..5cc878e2b 100644
--- a/8.0/Animations/Animations/Pages/EasingsPage.xaml
+++ b/8.0/Animations/Animations/Pages/EasingsPage.xaml
@@ -7,7 +7,7 @@
              x:Class="Animations.EasingsPage">
 
     <ScrollView>
-        <StackLayout Margin="15" Spacing="30">
+        <VerticalStackLayout Margin="15" Spacing="30">
             <Label Text="Easing functions specify the rate of change of a parameter over time.&lt;br&gt;&lt;br&gt;Explore the easing functions below. Double-tap to visit the easing editor for more options."
                 TextType="Html"
             />
@@ -220,6 +220,6 @@
                           Stroke="{StaticResource InOutGradient}"/>
                 </controls:EasingCard>
             </FlexLayout>
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml b/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml
index d45e503c7..1aeef7bd7 100644
--- a/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml
+++ b/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml
@@ -1,105 +1,105 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:BugSweeper"
-             x:Class="BugSweeper.MainPage"
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:BugSweeper"
+             x:Class="BugSweeper.MainPage"
              Title="Bug Sweeper">
     <Grid RowDefinitions="Auto,*">
         <VerticalStackLayout>
-            <Label Text="Tap to flag/unflag a potential bug."
+            <Label Text="Tap to flag/unflag a potential bug."
                    HorizontalTextAlignment="Center" />
-            <Label Text="Double-tap if you're sure it's not a bug."
-                   Margin="0,10,0,0"
-                   VerticalOptions="Center"
+            <Label Text="Double-tap if you're sure it's not a bug."
+                   Margin="0,10,0,0"
+                   VerticalOptions="Center"
                    HorizontalTextAlignment="Center" />
-            <Label Text="The first double-tap is always safe!"
-                   Margin="0,10,0,0"
-                   VerticalOptions="Center"
+            <Label Text="The first double-tap is always safe!"
+                   Margin="0,10,0,0"
+                   VerticalOptions="Center"
                    HorizontalTextAlignment="Center" />
-            <Label Margin="0,10,0,0"
+            <Label Margin="0,10,0,0"
                    HorizontalTextAlignment="Center">
                 <Label.FormattedText>
                     <FormattedString>
-                        <Span Text="{Binding FlaggedTileCount, StringFormat='Flagged {0} '}"
+                        <Span Text="{Binding FlaggedTileCount, StringFormat='Flagged {0} '}"
                               BindingContext="{x:Reference board}" />
-                        <Span Text="{Binding BugCount, StringFormat=' out of {0} bugs.'}"
+                        <Span Text="{Binding BugCount, StringFormat=' out of {0} bugs.'}"
                               BindingContext="{x:Reference board}" />
                     </FormattedString>
                 </Label.FormattedText>
             </Label>
-            <Label x:Name="timeLabel"
-                   Text="0:00"
-                   Margin="0,10,0,0"
+            <Label x:Name="timeLabel"
+                   Text="0:00"
+                   Margin="0,10,0,0"
                    HorizontalTextAlignment="Center" />
         </VerticalStackLayout>
 
         <!-- Single-cell Grid for Board and overlays. -->
-        <Grid Grid.Row="1"
+        <Grid Grid.Row="1"
               SizeChanged="OnBoardGridSizeChanged">
             <local:Board x:Name="board" />
-            <StackLayout x:Name="congratulationsText"
-                         Orientation="Horizontal"
-                         HorizontalOptions="Center">
-                <Label Text="C"
+            <HorizontalStackLayout
+              x:Name="congratulationsText"
+              HorizontalOptions="Center">
+                <Label Text="C"
                        TextColor="Red" />
-                <Label Text="O"
+                <Label Text="O"
                        TextColor="Red" />
-                <Label Text="N"
+                <Label Text="N"
                        TextColor="Red" />
-                <Label Text="G"
+                <Label Text="G"
                        TextColor="Red" />
-                <Label Text="R"
+                <Label Text="R"
                        TextColor="Red" />
-                <Label Text="A"
+                <Label Text="A"
                        TextColor="Red" />
-                <Label Text="T"
+                <Label Text="T"
                        TextColor="Red" />
-                <Label Text="U"
+                <Label Text="U"
                        TextColor="Red" />
-                <Label Text="L"
+                <Label Text="L"
                        TextColor="Red" />
-                <Label Text="A"
+                <Label Text="A"
                        TextColor="Red" />
-                <Label Text="T"
+                <Label Text="T"
                        TextColor="Red" />
-                <Label Text="I"
+                <Label Text="I"
                        TextColor="Red" />
-                <Label Text="O"
+                <Label Text="O"
                        TextColor="Red" />
-                <Label Text="N"
+                <Label Text="N"
                        TextColor="Red" />
-                <Label Text="S"
+                <Label Text="S"
                        TextColor="Red" />
-                <Label Text="!"
+                <Label Text="!"
                        TextColor="Red" />
             </StackLayout>
-            <HorizontalStackLayout x:Name="consolationText"
+            <HorizontalStackLayout x:Name="consolationText"
                                    HorizontalOptions="Center">
-                <Label Text="T"
+                <Label Text="T"
                        TextColor="Red" />
-                <Label Text="O"
+                <Label Text="O"
                        TextColor="Red" />
-                <Label Text="O"
+                <Label Text="O"
                        TextColor="Red" />
-                <Label Text=" "
+                <Label Text=" "
                        TextColor="Red" />
-                <Label Text="B"
+                <Label Text="B"
                        TextColor="Red" />
-                <Label Text="A"
+                <Label Text="A"
                        TextColor="Red" />
-                <Label Text="D"
+                <Label Text="D"
                        TextColor="Red" />
-                <Label Text="!"
+                <Label Text="!"
                        TextColor="Red" />
             </HorizontalStackLayout>
-            <Button x:Name="playAgainButton"
-                    Text=" Play Another Game? "
-                    HorizontalOptions="Center"
-                    VerticalOptions="Center"
-                    Clicked="OnplayAgainButtonClicked"
-                    BorderColor="Black"
-                    BorderWidth="2"
-                    BackgroundColor="White"
+            <Button x:Name="playAgainButton"
+                    Text=" Play Another Game? "
+                    HorizontalOptions="Center"
+                    VerticalOptions="Center"
+                    Clicked="OnplayAgainButtonClicked"
+                    BorderColor="Black"
+                    BorderWidth="2"
+                    BackgroundColor="White"
                     TextColor="Black" />
         </Grid>
     </Grid>
diff --git a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml
index 833cdf07f..750753844 100644
--- a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml
+++ b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/FavoritesPage.xaml
@@ -125,7 +125,7 @@
     
         <!-- Main Section -->
         <ScrollView>
-            <VerticalStackLayout>
+            <Grid>
 
                 <!-- Search Box -->
                 <HorizontalStackLayout
@@ -147,39 +147,39 @@
                 </HorizontalStackLayout>
 
                 <!-- Actual Content -->
-            <CollectionView
-                Margin="15"
-                ItemsSource="{Binding Favorites}"
-                ItemTemplate="{StaticResource FavTemplate}">
-                <CollectionView.ItemsLayout>
-                    <GridItemsLayout Orientation="Vertical"
-                                     Span="2"
-                                     VerticalItemSpacing="8"
-                                     HorizontalItemSpacing="8"/>
-                </CollectionView.ItemsLayout>
-                <CollectionView.FooterTemplate>
-                    <DataTemplate>
-                        <Border
-                            HeightRequest="132"
-                            WidthRequest="132"
-                            HorizontalOptions="Start"
-                            Margin="{OnIdiom Phone=15,Default=25}"
-                            Stroke="Transparent"
-                            StrokeThickness="1"
-                            BackgroundColor="{StaticResource Background_Mid}">
-                            <Border.StrokeShape>
-                                <RoundRectangle CornerRadius="60"/>
-                            </Border.StrokeShape>
-                            <ImageButton
-                                BackgroundColor="Transparent"
-                                Source="add_icon.png"
-                                VerticalOptions="Center" HorizontalOptions="Center"/>
-                        </Border>
-                    </DataTemplate>
-                </CollectionView.FooterTemplate>
-            </CollectionView>
+                <CollectionView
+                    Margin="15"
+                    ItemsSource="{Binding Favorites}"
+                    ItemTemplate="{StaticResource FavTemplate}">
+                    <CollectionView.ItemsLayout>
+                        <GridItemsLayout Orientation="Vertical"
+                                        Span="2"
+                                        VerticalItemSpacing="8"
+                                        HorizontalItemSpacing="8"/>
+                    </CollectionView.ItemsLayout>
+                    <CollectionView.FooterTemplate>
+                        <DataTemplate>
+                            <Border
+                                HeightRequest="132"
+                                WidthRequest="132"
+                                HorizontalOptions="Start"
+                                Margin="{OnIdiom Phone=15,Default=25}"
+                                Stroke="Transparent"
+                                StrokeThickness="1"
+                                BackgroundColor="{StaticResource Background_Mid}">
+                                <Border.StrokeShape>
+                                    <RoundRectangle CornerRadius="60"/>
+                                </Border.StrokeShape>
+                                <ImageButton
+                                    BackgroundColor="Transparent"
+                                    Source="add_icon.png"
+                                    VerticalOptions="Center" HorizontalOptions="Center"/>
+                            </Border>
+                        </DataTemplate>
+                    </CollectionView.FooterTemplate>
+                </CollectionView>
 
-        </VerticalStackLayout>
+            </Grid>
         </ScrollView>
 
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/SettingsPage.xaml b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/SettingsPage.xaml
index 0ac07f65f..c6374493f 100644
--- a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/SettingsPage.xaml
+++ b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Pages/SettingsPage.xaml
@@ -200,17 +200,16 @@
 
                 <Grid>
                     <Label Text="Theme" class="Subhead"/>
-                    <StackLayout
+                    <HorizontalStackLayout
                         HorizontalOptions="End"
                         Spacing="12"
-                        Orientation="Horizontal"
-                         RadioButtonGroup.GroupName="AppTheme"
-                         RadioButtonGroup.SelectedValue="{Binding SelectedTheme}">
-                        <StackLayout.Resources>
+                        RadioButtonGroup.GroupName="AppTheme"
+                        RadioButtonGroup.SelectedValue="{Binding SelectedTheme}">
+                        <HorizontalStackLayout.Resources>
                             <Style TargetType="RadioButton">
                                 <Setter Property="ControlTemplate" Value="{StaticResource ThemeRadioTemplate}"/>
                             </Style>
-                        </StackLayout.Resources>
+                        </HorizontalStackLayout.Resources>
                         <RadioButton Value="{x:Static am:AppTheme.Unspecified}"
                                      IsChecked="True"
                                      CheckedChanged="RadioButton_CheckedChanged"
@@ -287,7 +286,7 @@
                                 </Grid>
                             </RadioButton.Content>
                         </RadioButton>
-                    </StackLayout>
+                    </HorizontalStackLayout>
                 </Grid>
 
                 </VerticalStackLayout>
diff --git a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml
index 402e690e4..e04b65aac 100644
--- a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml
+++ b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml
@@ -354,13 +354,13 @@
                                    VerticalOptions="Start"
                                      HorizontalOptions="End"/>
 
-                <StackLayout HorizontalOptions="Start"
+                <VerticalStackLayout HorizontalOptions="Start"
                                      Spacing="0"
                                      VerticalOptions="End">
                     <Label Text="2%" class="LargeTitle"/>
                     <Label Text="From" class="Subhead"/>
                     <Label Text="Pond Elementary" class="SubContent"/>
-                </StackLayout>
+                </VerticalStackLayout>
             </Grid>
         </Frame>
     </DataTemplate>
diff --git a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/Next24HrWidget.xaml b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/Next24HrWidget.xaml
index 238e9830f..ac67414ca 100644
--- a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/Next24HrWidget.xaml
+++ b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/Next24HrWidget.xaml
@@ -16,7 +16,7 @@
             BindableLayout.ItemsSource="{Binding Hours}">
             <BindableLayout.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Label
                             Text="{Binding DateTime, StringFormat='{0:h tt}'}"
                             class="Small"
@@ -30,7 +30,7 @@
                             Text="{Binding Temperature.Minimum.Value, StringFormat='{0:F0}°'}"
                             class="Subhead"
                             HorizontalOptions="Center"/>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </BindableLayout.ItemTemplate>
         </HorizontalStackLayout>
diff --git a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/Next7DWidget.xaml b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/Next7DWidget.xaml
index b016426a7..8d0fc45a5 100644
--- a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/Next7DWidget.xaml
+++ b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/Next7DWidget.xaml
@@ -59,8 +59,7 @@
                             Margin="{Binding Temperature.Minimum.Value, Converter={StaticResource MinTempOffsetConverter}}"
                             />
                         <BoxView class="HRule"/>
-                        <StackLayout
-                            Orientation="Horizontal"
+                        <HorizontalStackLayout
                             HeightRequest="40"
                             HorizontalOptions="Center">
                             <Image
@@ -72,8 +71,7 @@
                                 Text="13%" 
                                 class="SubContent" 
                                 VerticalOptions="Center"/>
-                        </StackLayout>
-
+                        </HorizontalStackLayout>
                     </VerticalStackLayout>
                 </DataTemplate>
             </BindableLayout.ItemTemplate>
diff --git a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/WidgetsPanel.xaml b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/WidgetsPanel.xaml
index c321a7bce..6b5bef983 100644
--- a/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/WidgetsPanel.xaml
+++ b/8.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Views/WidgetsPanel.xaml
@@ -30,14 +30,14 @@
                                 HorizontalOptions="End"
                                 />
 
-                    <StackLayout 
+                    <VerticalStackLayout 
                         HorizontalOptions="Start"
                         Spacing="0"
                         VerticalOptions="End">
                         <Label Text="{Binding Value}" class="LargeTitle"/>
                         <Label Text="From" class="Subhead"/>
                         <Label Text="{Binding WeatherStation}" class="SubContent"/>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </Grid>
             </Border>
         </DataTemplate>
@@ -67,13 +67,14 @@
                                    BackgroundColor="Green"
                                 />
 
-                    <StackLayout HorizontalOptions="Start"
-                                        Spacing="0"
-                                        VerticalOptions="End">
+                    <VerticalStackLayout
+                        HorizontalOptions="Start"
+                        Spacing="0"
+                        VerticalOptions="End">
                         <Label Text="{Binding Value}" class="LargeTitle"/>
                         <Label Text="From" class="Subhead"/>
                         <Label Text="{Binding WeatherStation}" class="SubContent"/>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </Grid>
             </Border>
         </DataTemplate>
diff --git a/8.0/Apps/WordPuzzle/WordPuzzle/MainPage.xaml b/8.0/Apps/WordPuzzle/WordPuzzle/MainPage.xaml
index 01c06aa83..2ea14f64a 100644
--- a/8.0/Apps/WordPuzzle/WordPuzzle/MainPage.xaml
+++ b/8.0/Apps/WordPuzzle/WordPuzzle/MainPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="WordPuzzle.MainPage"
              Title="Solve the puzzle to win!">
-    <StackLayout x:Name="stackLayout"
+    <VerticalStackLayout x:Name="stackLayout"
                  Spacing="6"
                  Margin="5"
                  SizeChanged="OnStackSizeChanged">
@@ -21,5 +21,5 @@
                    VerticalOptions="Center" />
         </VerticalStackLayout>
         <AbsoluteLayout x:Name="absoluteLayout" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Beginners-Series/BeginnersTask/DetailPage.xaml b/8.0/Beginners-Series/BeginnersTask/DetailPage.xaml
index 2ee7167db..e23cb3969 100644
--- a/8.0/Beginners-Series/BeginnersTask/DetailPage.xaml
+++ b/8.0/Beginners-Series/BeginnersTask/DetailPage.xaml
@@ -5,7 +5,7 @@
              xmlns:viewmodel="clr-namespace:BeginnersTasks.ViewModel"
              x:DataType="viewmodel:DetailViewModel"
              Title="DetailPage">
-    <StackLayout Padding="20">
+    <VerticalStackLayout Padding="20">
         <Label Text="{Binding Text}"
                FontSize="25"
                VerticalOptions="Center" 
@@ -13,5 +13,5 @@
 
         <Button Text="Go Back"
                 Command="{Binding GoBackCommand}"/>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/AttachedNumericValidationPage.xaml b/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/AttachedNumericValidationPage.xaml
index e28560527..6229ecdd1 100644
--- a/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/AttachedNumericValidationPage.xaml
+++ b/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/AttachedNumericValidationPage.xaml
@@ -5,10 +5,10 @@
              x:Class="BehaviorsDemos.AttachedNumericValidationPage"
              Title="Attached behavior demo"
              IconImageSource="xaml.png">
-    <StackLayout Padding="10,60,10,0">
+    <VerticalStackLayout Padding="10,60,10,0">
         <Label Text="Red when the number isn't valid"
                FontSize="12" />
         <Entry Placeholder="Enter a System.Double"
                local:AttachedNumericValidationBehavior.AttachBehavior="true" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/EventToCommandBehaviorPage.xaml b/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/EventToCommandBehaviorPage.xaml
index a5287906a..52c25b5de 100644
--- a/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/EventToCommandBehaviorPage.xaml
+++ b/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/EventToCommandBehaviorPage.xaml
@@ -12,7 +12,7 @@
             <local:SelectedItemEventArgsToSelectedItemConverter x:Key="SelectedItemConverter" />
         </ResourceDictionary>
     </ContentPage.Resources>
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="*,20">
         <ListView ItemsSource="{Binding People}">
             <ListView.ItemTemplate>
                 <DataTemplate>
@@ -25,6 +25,6 @@
                                               Converter="{StaticResource SelectedItemConverter}" />
             </ListView.Behaviors>
         </ListView>
-        <Label Text="{Binding SelectedItemText}" />
-    </StackLayout>
+        <Label Grid.Row="1" Text="{Binding SelectedItemText}" />
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/NumericValidationPage.xaml b/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/NumericValidationPage.xaml
index 1cfb54d65..8bb0179c6 100644
--- a/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/NumericValidationPage.xaml
+++ b/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/NumericValidationPage.xaml
@@ -5,7 +5,7 @@
              x:Class="BehaviorsDemos.NumericValidationPage"
              Title=".NET MAUI behavior demo"
              IconImageSource="xaml.png">
-    <StackLayout Padding="10,50,10,0">
+    <VerticalStackLayout Padding="10,50,10,0">
         <Label Text="Red when the number isn't valid"
                FontSize="12" />
         <Entry Placeholder="Enter a System.Double">
@@ -13,5 +13,5 @@
                 <local:NumericValidationBehavior />
             </Entry.Behaviors>
         </Entry>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/NumericValidationStylePage.xaml b/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/NumericValidationStylePage.xaml
index 733b28b81..a7e92b15f 100644
--- a/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/NumericValidationStylePage.xaml
+++ b/8.0/Fundamentals/BehaviorsDemos/BehaviorsDemos/Views/XAML/NumericValidationStylePage.xaml
@@ -16,10 +16,10 @@
             </Style>
         </ResourceDictionary>
     </ContentPage.Resources>
-    <StackLayout Padding="10,50,10,0">
+    <VerticalStackLayout Padding="10,50,10,0">
         <Label Text="Red when the number isn't valid"
                FontSize="12" />
         <Entry Placeholder="Enter a System.Double"
                Style="{StaticResource NumericValidationStyle}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/AccessTemplateElementPage.xaml b/8.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/AccessTemplateElementPage.xaml
index 124603a2e..d529a1014 100644
--- a/8.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/AccessTemplateElementPage.xaml
+++ b/8.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/AccessTemplateElementPage.xaml
@@ -7,11 +7,11 @@
              HeaderText="MyApp"
              ControlTemplate="{StaticResource SecondaryColorTemplate}">
 
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Entry Placeholder="Enter username" />
         <Entry Placeholder="Enter password"
                 IsPassword="True" />
         <Button Text="Login" />
-    </StackLayout>
+    </VerticalStackLayout>
 
 </controls:HeaderFooterPage>
diff --git a/8.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/ContentPresenterPage.xaml b/8.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/ContentPresenterPage.xaml
index f34541538..b603e55e8 100644
--- a/8.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/ContentPresenterPage.xaml
+++ b/8.0/Fundamentals/ControlTemplateDemos/ControlTemplateDemos/Views/ContentPresenterPage.xaml
@@ -6,10 +6,10 @@
                            Title="ContentPresenter demo" 
                            HeaderText="MyApp"
                            ControlTemplate="{StaticResource SecondaryColorTemplate}">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Entry Placeholder="Enter username" />
         <Entry Placeholder="Enter password"
                IsPassword="True" />
         <Button Text="Login" />
-    </StackLayout>
+    </VerticalStackLayout>
 </controls:HeaderFooterPage>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/AlternativeCodeBindingPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/AlternativeCodeBindingPage.xaml
index d2c6b242c..a299fb4fc 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/AlternativeCodeBindingPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/AlternativeCodeBindingPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="DataBindingDemos.AlternativeCodeBindingPage"
              Title="Alternative Code Binding">
-    <StackLayout Padding="10, 0">
+    <VerticalStackLayout Padding="10, 0">
         <Label x:Name="label"
                Text="TEXT"
                FontSize="40"
@@ -14,5 +14,5 @@
                 Minimum="-2"
                 Maximum="2"
                 VerticalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/AlternativeXamlBindingPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/AlternativeXamlBindingPage.xaml
index 5771c6fef..767907318 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/AlternativeXamlBindingPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/AlternativeXamlBindingPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="DataBindingDemos.AlternativeXamlBindingPage"
              Title="Alternative XAML Binding">
-    <StackLayout Padding="10, 0">
+    <VerticalStackLayout Padding="10, 0">
         <Label Text="TEXT"
                FontSize="40"
                HorizontalOptions="Center"
@@ -15,5 +15,5 @@
                 Minimum="-2"
                 Maximum="2"
                 VerticalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BasicCodeBindingPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BasicCodeBindingPage.xaml
index 948caf392..09593498d 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BasicCodeBindingPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BasicCodeBindingPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="DataBindingDemos.BasicCodeBindingPage"
              Title="Basic Code Binding">
-    <StackLayout Padding="10, 0">
+    <VerticalStackLayout Padding="10, 0">
         <Label x:Name="label"
                Text="TEXT"
                FontSize="80"
@@ -13,5 +13,5 @@
         <Slider x:Name="slider"
                 Maximum="360"
                 VerticalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BasicXamlBindingPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BasicXamlBindingPage.xaml
index 18f16db3b..ce6e4887e 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BasicXamlBindingPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BasicXamlBindingPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="DataBindingDemos.BasicXamlBindingPage"
              Title="Basic XAML Binding">
-    <StackLayout Padding="10, 0">
+    <VerticalStackLayout Padding="10, 0">
         <Label Text="TEXT"
                FontSize="80"
                HorizontalOptions="Center"
@@ -14,5 +14,5 @@
         <Slider x:Name="slider"
                 Maximum="360"
                 VerticalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BetterColorSelectorPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BetterColorSelectorPage.xaml
index c34472188..a6b015f02 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BetterColorSelectorPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BetterColorSelectorPage.xaml
@@ -20,12 +20,12 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <BoxView Color="{Binding Color}"
                  HeightRequest="100"
                  WidthRequest="100"
                  HorizontalOptions="Center" />
-        <StackLayout Margin="10, 0">
+        <VerticalStackLayout Margin="10, 0">
             <Label Text="{Binding Name}" />
             <Slider Value="{Binding Hue}" />
             <Label Text="{Binding Hue, StringFormat='Hue = {0:F2}'}" />
@@ -33,6 +33,6 @@
             <Label Text="{Binding Saturation, StringFormat='Saturation = {0:F2}'}" />
             <Slider Value="{Binding Luminosity}" />
             <Label Text="{Binding Luminosity, StringFormat='Luminosity = {0:F2}'}" />
-        </StackLayout>
-    </StackLayout>
+        </VerticalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>    
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BindingContextInheritancePage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BindingContextInheritancePage.xaml
index 3d19a82e7..3d8f731bd 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BindingContextInheritancePage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/BindingContextInheritancePage.xaml
@@ -3,9 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="DataBindingDemos.BindingContextInheritancePage"
              Title="BindingContext Inheritance">
-    <StackLayout Padding="10">
+    <VerticalStackLayout Padding="10">
 
-        <StackLayout VerticalOptions="Fill"
+        <VerticalStackLayout VerticalOptions="Fill"
                      BindingContext="{x:Reference slider}">
 
             <Label Text="TEXT"
@@ -20,10 +20,10 @@
                      HorizontalOptions="Center"
                      VerticalOptions="Start"
                      Rotation="{Binding Value}" />
-        </StackLayout>
+        </VerticalStackLayout>
 
         <Slider x:Name="slider" 
                 Maximum="360" />
         
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/CompiledColorSelectorPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/CompiledColorSelectorPage.xaml
index 42405a439..e5c1bffb4 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/CompiledColorSelectorPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/CompiledColorSelectorPage.xaml
@@ -18,12 +18,12 @@
             </Style>
         </ResourceDictionary>
     </ContentPage.Resources>
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <BoxView Color="{Binding Color}"
                  HeightRequest="100"
                  WidthRequest="100"
                  HorizontalOptions="Center" />
-        <StackLayout Margin="10, 0">
+        <VerticalStackLayout Margin="10, 0">
             <Label Text="{Binding Name}" />
             <Slider Value="{Binding Hue}" />
             <Label Text="{Binding Hue, StringFormat='Hue = {0:F2}'}" />
@@ -31,6 +31,6 @@
             <Label Text="{Binding Saturation, StringFormat='Saturation = {0:F2}'}" />
             <Slider Value="{Binding Luminosity}" />
             <Label Text="{Binding Luminosity, StringFormat='Luminosity = {0:F2}'}" />
-        </StackLayout>
-    </StackLayout>    
+        </VerticalStackLayout>
+    </VerticalStackLayout>    
 </ContentPage>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/EnableButtonsPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/EnableButtonsPage.xaml
index 5646c4f7f..853caadbb 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/EnableButtonsPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/EnableButtonsPage.xaml
@@ -8,7 +8,7 @@
         <local:IntToBoolConverter x:Key="intToBool" />
     </ContentPage.Resources>
     
-    <StackLayout Padding="10, 0">
+    <VerticalStackLayout Padding="10, 0">
         <Entry x:Name="entry1"
                Text=""
                Placeholder="enter search term"
@@ -29,5 +29,5 @@
                 IsEnabled="{Binding Source={x:Reference entry2},
                                     Path=Text.Length,
                                     Converter={StaticResource intToBool}}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MixedBindingsPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MixedBindingsPage.xaml
index 7da8081e1..8c3bbed0c 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MixedBindingsPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MixedBindingsPage.xaml
@@ -18,12 +18,12 @@
             </Style>
         </ResourceDictionary>
     </ContentPage.Resources>
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <BoxView Color="{Binding Color}"
                  HeightRequest="100"
                  WidthRequest="100"
                  HorizontalOptions="Center" />
-        <StackLayout x:DataType="{x:Null}"
+        <VerticalStackLayout x:DataType="{x:Null}"
                      Margin="10, 0">
             <Label Text="{Binding Name}" />
             <Slider Value="{Binding Hue}" />
@@ -32,6 +32,6 @@
             <Label Text="{Binding Saturation, StringFormat='Saturation = {0:F2}'}" />
             <Slider Value="{Binding Luminosity}" />
             <Label Text="{Binding Luminosity, StringFormat='Luminosity = {0:F2}'}" />
-        </StackLayout>
-    </StackLayout>    
+        </VerticalStackLayout>
+    </VerticalStackLayout>    
 </ContentPage>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MonkeyDetailsPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MonkeyDetailsPage.xaml
index 46fa00cdd..20efaf89e 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MonkeyDetailsPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MonkeyDetailsPage.xaml
@@ -4,7 +4,7 @@
              x:Class="DataBindingDemos.MonkeyDetailsPage"
              Title="Monkey Details">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="{Binding Name}"
                    HorizontalOptions="Center"
                    Style="{DynamicResource TitleStyle}" />
@@ -29,6 +29,6 @@
                     </FormattedString>
                 </Label.FormattedText>
             </Label>
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MonkeysPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MonkeysPage.xaml
index 1fd05a437..210776fd7 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MonkeysPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MonkeysPage.xaml
@@ -4,7 +4,7 @@
              xmlns:local="clr-namespace:DataBindingDemos"
              x:Class="DataBindingDemos.MonkeysPage"
              Title="Monkeys">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <ListView ItemsSource="{Binding Monkeys}" 
                   HasUnevenRows="true" 
                   ItemTapped="OnListViewItemTapped" 
@@ -39,5 +39,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MultiBindingFallbackValuePage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MultiBindingFallbackValuePage.xaml
index b59eee009..198b41032 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MultiBindingFallbackValuePage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/MultiBindingFallbackValuePage.xaml
@@ -12,7 +12,7 @@
         <local:GroupViewModel />
     </ContentPage.BindingContext>
 
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="Employees"
                FontAttributes="Bold" />
         <Label>
@@ -85,5 +85,5 @@
                 </MultiBinding>
             </Label.Text>
         </Label>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/PathVariationsPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/PathVariationsPage.xaml
index 411e06036..524101ff9 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/PathVariationsPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/PathVariationsPage.xaml
@@ -13,7 +13,7 @@
         </Style>
     </ContentPage.Resources>
 
-    <StackLayout Margin="10, 0">
+    <VerticalStackLayout Margin="10, 0">
         <Label Text="Select a time:" />
 
         <TimePicker x:Name="timePicker" />
@@ -48,5 +48,5 @@
         <Label Text="{Binding Source={x:Reference page},
                               Path=Content.Children[2].Text.Length,
                               StringFormat='The second Label has {0} characters'}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceFindAncestorPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceFindAncestorPage.xaml
index f9345457a..d170729a9 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceFindAncestorPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceFindAncestorPage.xaml
@@ -5,7 +5,7 @@
              x:Class="DataBindingDemos.RelativeSourceFindAncestorPage"
              Title="RelativeSource FindAncestor Mode"
              BindingContext="{Binding Source={RelativeSource Self}, Path=DefaultViewModel}">
-    <StackLayout Margin="10">
+    <Grid Margin="10">
         <!--
         In this example, the page's BindingContext is bound to its own DefaultViewModel property.
         -->        
@@ -30,5 +30,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceMultiBindingPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceMultiBindingPage.xaml
index 65d0f62f3..a61b22234 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceMultiBindingPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceMultiBindingPage.xaml
@@ -80,7 +80,7 @@
         <local:GroupViewModel />
     </ContentPage.BindingContext>
 
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="Expanders vanish upon collapse." />
         <controls:CardViewExpander BorderColor="DarkGray"
                                    CardTitle="John Doe"
@@ -103,5 +103,5 @@
                                    IconImageSource="user.png"
                                    ControlTemplate="{StaticResource CardViewExpanderControlTemplate}"
                                    IsExpanded="True" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceSelfPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceSelfPage.xaml
index 1edaf8c6f..a66a01918 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceSelfPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceSelfPage.xaml
@@ -5,7 +5,7 @@
              x:Class="DataBindingDemos.RelativeSourceSelfPage"
              Title="RelativeSource Self Mode"
              BindingContext="{Binding Source={RelativeSource Self}, Path=Person}">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <!--
         In this example, the WidthRequest property is set to a fixed value, and the HeightRequest property binds to the WidthRequest property.
         -->
@@ -19,5 +19,5 @@
         -->        
         <Label Text="{Binding Fullname, StringFormat='Name: {0}'}"
                HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RgbColorSelectorPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RgbColorSelectorPage.xaml
index a0ff76b58..894f92b56 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RgbColorSelectorPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RgbColorSelectorPage.xaml
@@ -19,12 +19,12 @@
         <local:FloatToIntConverter x:Key="floatToInt" />
     </ContentPage.Resources>
 
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <BoxView Color="{Binding Color}"
                  HeightRequest="100"
                  WidthRequest="100"
                  HorizontalOptions="Center" />
-        <StackLayout Margin="10, 0">
+        <VerticalStackLayout Margin="10, 0">
             <Label Text="{Binding Name}" />
             <Slider Value="{Binding Red}" />
             <Label Text="{Binding Red, 
@@ -48,6 +48,6 @@
                     </Binding>
                 </Label.Text>
             </Label>
-        </StackLayout>
-    </StackLayout>
+        </VerticalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>    
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplatePage.xaml b/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplatePage.xaml
index e854ae4bb..9b33c91bb 100644
--- a/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplatePage.xaml
+++ b/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplatePage.xaml
@@ -5,11 +5,13 @@
              x:Class="DataTemplates.WithDataTemplatePage"
              Title="With a Data Template"
              IconImageSource="xaml.png">
-    <StackLayout Margin="20">
+    <Grid Margin="20" Grid.RowDefinitions="50,*">
         <Label Text="CollectionView with a Data Template"
                FontAttributes="Bold"
                HorizontalOptions="Center" />
-        <CollectionView Margin="0,20,0,0">
+        <CollectionView 
+            Grid.Row="1"
+            Margin="0,20,0,0">
             <CollectionView.ItemsSource>
                 <x:Array Type="{x:Type local:Person}">
                     <local:Person Name="Steve"
@@ -51,5 +53,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplatePageFromType.xaml b/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplatePageFromType.xaml
index 50c365dff..275b8aa41 100644
--- a/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplatePageFromType.xaml
+++ b/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplatePageFromType.xaml
@@ -5,11 +5,13 @@
              x:Class="DataTemplates.WithDataTemplatePageFromType"
              Title="With a Data Template (Type)"
              IconImageSource="xaml.png">
-    <StackLayout Margin="20">
+    <Grid Margin="20" Grid.RowDefinitions="50,*">
         <Label Text="CollectionView with a Data Template (Type)"
                FontAttributes="Bold"
                HorizontalOptions="Center" />
-        <CollectionView Margin="0,20,0,0">
+        <CollectionView 
+            Grid.Row="1"
+            Margin="0,20,0,0">
             <CollectionView.ItemsSource>
                 <x:Array Type="{x:Type local:Person}">
                     <local:Person Name="Steve"
@@ -38,5 +40,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplateSelectorPage.xaml b/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplateSelectorPage.xaml
index a39c46128..6b86946bb 100644
--- a/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplateSelectorPage.xaml
+++ b/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithDataTemplateSelectorPage.xaml
@@ -48,12 +48,13 @@
                                           InvalidTemplate="{StaticResource invalidPersonTemplate}" />
     </ContentPage.Resources>
 
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="50,*">
         <Label Text="CollectionView with a DataTemplateSelector"
                FontAttributes="Bold"
                HorizontalOptions="Center" />
         <CollectionView x:Name="collectionView"
+                        Grid.Row="1"
                         Margin="0,20,0,0"
                         ItemTemplate="{StaticResource personDataTemplateSelector}" />
-    </StackLayout>
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithoutDataTemplatePage.xaml b/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithoutDataTemplatePage.xaml
index ac41aa3a6..c8c3a82b4 100644
--- a/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithoutDataTemplatePage.xaml
+++ b/8.0/Fundamentals/DataTemplateDemos/DataTemplates/Views/WithoutDataTemplatePage.xaml
@@ -5,11 +5,13 @@
              x:Class="DataTemplates.WithoutDataTemplatePage"
              Title="Without a Data Template"
              IconImageSource="xaml.png">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="50,*">
         <Label Text="CollectionView without a Data Template"
                FontAttributes="Bold"
                HorizontalOptions="Center" />
-        <CollectionView Margin="0,20,0,0">
+        <CollectionView 
+            Grid.Row="1"
+            Margin="0,20,0,0">
             <CollectionView.ItemsSource>
                 <x:Array Type="{x:Type local:Person}">
                     <local:Person Name="Steve"
@@ -33,5 +35,5 @@
                 </x:Array>
             </CollectionView.ItemsSource>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/ControlGallery.csproj b/8.0/UserInterface/ControlGallery/ControlGallery/ControlGallery.csproj
index 2989128ae..72e9d1470 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/ControlGallery.csproj
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/ControlGallery.csproj
@@ -57,171 +57,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <MauiXaml Update="Views\XAML\AbsoluteLayoutDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\ActivityIndicatorDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\BlazorWebViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\BorderDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\BoxViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\ButtonDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\CarouselViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\CheckBoxPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\CollectionViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\ContentPageDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\ContentViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\DatePickerDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\EditorDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\EllipseDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\EntryCellDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\EntryDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\FlexLayoutDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\FlyoutPageDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\FrameDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\GraphicsViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\GridDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\HorizontalStackLayoutDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\ImageButtonDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\ImageCellDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\ImageDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\IndicatorViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\LabelDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\LineDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\ListViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\MainPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\NavigationPageDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\PathDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\PickerDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\PolygonDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\PolylineDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\ProgressBarDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\RadioButtonDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\RectangleDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\RefreshViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\RelativeLayoutDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\ScrollViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\SearchBarDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\SliderDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\StackLayoutDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\StepperDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\SwipeViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\SwitchCellDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\SwitchDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\TabbedPageDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\TableViewFormDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\TableViewMenuDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\TextCellDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\TimePickerDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\VerticalStackLayoutDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="Views\XAML\WebViewDemoPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
+		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CollectionViewDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CollectionViewDemoPage.xaml
index d1c486d3c..61d04e75b 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CollectionViewDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CollectionViewDemoPage.xaml
@@ -3,13 +3,15 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.CollectionViewDemoPage"
              Title="CollectionView Demo">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="50,*">
         <Label Text="CollectionView"
                FontSize="50"
                FontAttributes="Bold"
                HorizontalOptions="Center" />
         
-        <CollectionView ItemsSource="{Binding Monkeys}"
+        <CollectionView
+                        Grid.Row="1"
+                        ItemsSource="{Binding Monkeys}"
                         ItemsLayout="VerticalGrid, 2">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -41,5 +43,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwipeViewDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwipeViewDemoPage.xaml
index 9b4d25fb5..e71d0eacd 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwipeViewDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwipeViewDemoPage.xaml
@@ -3,13 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.SwipeViewDemoPage"
              Title="SwipeView Demo">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="50,*">
         <Label Text="SwipeView"
                FontSize="50"
                FontAttributes="Bold"
                HorizontalOptions="Center" />
         
         <CollectionView x:Name="collectionView"
+                        Grid.Row="1"
                         ItemsSource="{Binding Monkeys}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -51,5 +52,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Controls/SpacingModifier.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Controls/SpacingModifier.xaml
index 0a23c644e..752c117ee 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Controls/SpacingModifier.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Controls/SpacingModifier.xaml
@@ -2,8 +2,7 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Controls.SpacingModifier">
-    <StackLayout Orientation="Horizontal"
-                 HorizontalOptions="Center">
+    <HorizontalStackLayout HorizontalOptions="Center">
         <Label Text="Spacing:"
                VerticalTextAlignment="Center" />
         <Entry x:Name="entry"
@@ -11,5 +10,5 @@
                WidthRequest="100" />
         <Button Text="Update"
                 Clicked="OnUpdateButtonClicked" />
-    </StackLayout>
+    </HorizontalStackLayout>
 </ContentView>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
index ad508fe97..9b4af4592 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
@@ -35,12 +35,13 @@
                                                  OtherTemplate="{StaticResource BasicTemplate}" />
     </ContentPage.Resources>
     
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="50,*">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={x:Reference searchBar}, Path=Text}"
                    Placeholder="Filter" />
-        <CollectionView ItemsSource="{Binding Monkeys}"
+        <CollectionView Grid.Row="1"
+                        ItemsSource="{Binding Monkeys}"
                         EmptyView="{Binding Source={x:Reference searchBar}, Path=Text}"
                         EmptyViewTemplate="{StaticResource SearchSelector}">
             <CollectionView.ItemTemplate>
@@ -71,5 +72,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml
index 5cc0c3947..bd02dd7dc 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml
@@ -3,12 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.EmptyViewFilteredPage"
              Title="EmptyView (string)">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="50,*">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={x:Reference searchBar}, Path=Text}"
                    Placeholder="Filter" />
-        <CollectionView ItemsSource="{Binding Monkeys}"
+        <CollectionView Grid.Row="1"
+                        ItemsSource="{Binding Monkeys}"
                         EmptyView="No items match your filter.">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -38,5 +39,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml
index bf62da1ed..932be6edd 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.EmptyViewLoadSimulationPage"
              Title="EmptyView (load simulation)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView x:Name="collectionView"
                         EmptyView="Loading items simulation.">
             <CollectionView.ItemTemplate>
@@ -34,5 +34,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewNullPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewNullPage.xaml
index 65e31ff1c..9c3778a5c 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewNullPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewNullPage.xaml
@@ -3,8 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.EmptyViewNullPage"
              Title="EmptyView (Null ItemsSource)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding EmptyMonkeys}"
                         EmptyView="No items to display" />
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
index 4f321f506..d075b47e9 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
@@ -31,16 +31,20 @@
         </ContentView>
     </ContentPage.Resources>
     
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="50,50,*">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={x:Reference searchBar}, Path=Text}"
                    Placeholder="Filter" />
-        <StackLayout Orientation="Horizontal">
-            <Label Text="Toggle EmptyViews" />
-            <Switch Toggled="OnEmptyViewSwitchToggled" />
-        </StackLayout>
+        <HorizontalStackLayout Grid.Row="1">
+            <Switch Toggled="OnEmptyViewSwitchToggled"
+                    Margin="0,10,0,0"
+                    VerticalOptions="Center" />
+            <Label Text="Toggle EmptyViews"
+                    VerticalOptions="Center" />
+        </HorizontalStackLayout>
         <CollectionView x:Name="collectionView"
+                        Grid.Row="2"
                         ItemsSource="{Binding Monkeys}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -70,5 +74,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml
index a172f9a4b..552352543 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml
@@ -4,12 +4,14 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.EmptyViewTemplatePage"
              Title="EmptyView (template)">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="50,*">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={x:Reference searchBar}, Path=Text}"
                    Placeholder="Filter" />
-        <CollectionView ItemsSource="{Binding Monkeys}">
+        <CollectionView
+            Grid.Row="1"
+            ItemsSource="{Binding Monkeys}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid Padding="10">
@@ -51,5 +53,5 @@
                 </DataTemplate>
             </CollectionView.EmptyViewTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
index c0853c85b..177a60a65 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
@@ -3,12 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.EmptyViewWithViewsFilteredPage"
              Title="EmptyView (multiple views)">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="50,*">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={x:Reference searchBar}, Path=Text}"
                    Placeholder="Filter" />
-        <CollectionView ItemsSource="{Binding Monkeys}">
+        <CollectionView
+            Grid.Row="1"
+            ItemsSource="{Binding Monkeys}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid Padding="10">
@@ -55,5 +57,5 @@
                 </ContentView>
             </CollectionView.EmptyView>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListEmptyGroupsPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListEmptyGroupsPage.xaml
index fa2fb73e9..f66947432 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListEmptyGroupsPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListEmptyGroupsPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.VerticalListEmptyGroupsPage"
              Title="Grouping including empty groups">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Animals}"
                         IsGrouped="true">
             <CollectionView.ItemTemplate>
@@ -48,5 +48,5 @@
                 </DataTemplate>
             </CollectionView.GroupFooterTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingPage.xaml
index 96f78d64f..58ed747c0 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.VerticalListGroupingPage"
              Title="Grouping (with DataTemplates)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Animals}"
                         IsGrouped="true">
             <CollectionView.ItemTemplate>
@@ -48,5 +48,5 @@
                 </DataTemplate>
             </CollectionView.GroupFooterTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingVariableSizeItemsPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingVariableSizeItemsPage.xaml
index f41242022..d732391fa 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingVariableSizeItemsPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingVariableSizeItemsPage.xaml
@@ -4,7 +4,7 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.VerticalListGroupingVariableSizeItemsPage"
              Title="Grouping with variable sized items">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="50,*">
         <StackLayout Orientation="Horizontal"
                      HorizontalOptions="Center">
             <Label Text="ItemSizingStrategy:"
@@ -13,7 +13,9 @@
                                  EnumType="{x:Type ItemSizingStrategy}"
                                  SelectedIndex="0" />
         </StackLayout>
-        <CollectionView ItemsSource="{Binding Animals}"
+        <CollectionView
+                        Grid.Row="1"
+                        ItemsSource="{Binding Animals}"
                         IsGrouped="true"
                         ItemSizingStrategy="{Binding Source={x:Reference enumPicker}, Path=SelectedItem}">
             <CollectionView.ItemTemplate>
@@ -56,7 +58,7 @@
                 </DataTemplate>
             </CollectionView.GroupFooterTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
 
 
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListTextGroupingPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListTextGroupingPage.xaml
index 0bbd8c9dd..77a4e08b4 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListTextGroupingPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListTextGroupingPage.xaml
@@ -3,8 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.VerticalListTextGroupingPage"
              Title="Grouping (without DataTemplates)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Animals}"
                         IsGrouped="true" />
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml
index 8cce443c1..563ca0fd8 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.HorizontalGridHeaderFooterViewPage"
              Title="Grid header and footer (View)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         ItemsLayout="HorizontalGrid, 2">
             <CollectionView.Header>
@@ -50,5 +50,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterDataTemplatePage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterDataTemplatePage.xaml
index 37c46e619..cdb1a0bf0 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterDataTemplatePage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterDataTemplatePage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.VerticalListHeaderFooterDataTemplatePage"
              Title="Header and footer (DataTemplate)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         Header="{Binding .}"
                         Footer="{Binding .}">
@@ -55,5 +55,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterStringPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterStringPage.xaml
index af0706cfa..926f44c5d 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterStringPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterStringPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.VerticalListHeaderFooterStringPage"
              Title="Header and footer (string)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         Header="Monkeys"
                         Footer="2019">
@@ -35,5 +35,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterViewPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterViewPage.xaml
index 6ae1272d6..56174fb41 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterViewPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterViewPage.xaml
@@ -3,7 +3,7 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
               x:Class="CollectionViewDemos.Views.VerticalListHeaderFooterViewPage"
               Title="Header and footer (View)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}">
             <CollectionView.Header>
                 <StackLayout BackgroundColor="LightGray">
@@ -49,5 +49,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridPage.xaml
index 4c10b7393..0cb63adc1 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.HorizontalGridPage"
              Title="Horizontal grid (DataTemplate)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         ItemsLayout="HorizontalGrid, 4">
             <CollectionView.ItemTemplate>
@@ -36,5 +36,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridTextPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridTextPage.xaml
index b5dad6af7..0a8573dd9 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridTextPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalGridTextPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.HorizontalGridTextPage"
              Title="Horizontal grid (text)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsLayout="HorizontalGrid, 4">
             <CollectionView.ItemsSource>
                 <x:Array Type="{x:Type x:String}">
@@ -27,5 +27,5 @@
                 </x:Array>
             </CollectionView.ItemsSource>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListPage.xaml
index 0bdb505a3..4654083d5 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.HorizontalListPage"
              Title="Horizontal list (DataTemplate)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         ItemsLayout="HorizontalList">
             <CollectionView.ItemTemplate>
@@ -36,5 +36,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListTextPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListTextPage.xaml
index 3d898570c..110923be9 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListTextPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/HorizontalListTextPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.HorizontalListTextPage"
              Title="Horizontal list (text)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsLayout="HorizontalList">
             <CollectionView.ItemsSource>
                 <x:Array Type="{x:Type x:String}">
@@ -27,5 +27,5 @@
                 </x:Array>
             </CollectionView.ItemsSource>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalGridPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalGridPage.xaml
index 7869309a1..45f023648 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalGridPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalGridPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.VerticalGridPage"
              Title="Vertical grid (DataTemplate)">
-  <StackLayout Margin="20">
+  <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         ItemsLayout="VerticalGrid, 2">
             <CollectionView.ItemTemplate>
@@ -36,5 +36,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalGridTextPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalGridTextPage.xaml
index 2da7d8842..1eb8fd6e7 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalGridTextPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalGridTextPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.VerticalGridTextPage"
              Title="Vertical grid (text)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsLayout="VerticalGrid, 2">
             <CollectionView.ItemsSource>
                 <x:Array Type="{x:Type x:String}">
@@ -27,5 +27,5 @@
                 </x:Array>
             </CollectionView.ItemsSource>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListDataTemplateSelectorPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListDataTemplateSelectorPage.xaml
index a4541ec62..48cfe0b01 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListDataTemplateSelectorPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListDataTemplateSelectorPage.xaml
@@ -67,8 +67,8 @@
                                              OtherMonkey="{StaticResource OtherMonkeyTemplate}" />
     </ContentPage.Resources>
     
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         ItemTemplate="{StaticResource MonkeySelector}" />
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListPage.xaml
index 2d409e20e..b969249f1 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.VerticalListPage"
              Title="Vertical list (DataTemplate)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -33,5 +33,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListRTLPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListRTLPage.xaml
index 911e60581..09219b63e 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListRTLPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListRTLPage.xaml
@@ -4,7 +4,7 @@
              x:Class="CollectionViewDemos.Views.VerticalListRTLPage"
              Title="Vertical list (RTL FlowDirection)"
              FlowDirection="RightToLeft">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -34,5 +34,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListTextPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListTextPage.xaml
index d4063cd4a..00ab090e9 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListTextPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Layout/VerticalListTextPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.VerticalListTextPage"
              Title="Vertical list (text)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView>
             <CollectionView.ItemsSource>
                 <x:Array Type="{x:Type x:String}">
@@ -27,5 +27,5 @@
                 </x:Array>
             </CollectionView.ItemsSource>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/PullToRefresh/HorizontalGridPullToRefreshPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/PullToRefresh/HorizontalGridPullToRefreshPage.xaml
index 7e75bc7bb..98eb12751 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/PullToRefresh/HorizontalGridPullToRefreshPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/PullToRefresh/HorizontalGridPullToRefreshPage.xaml
@@ -2,11 +2,16 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.HorizontalGridPullToRefreshPage">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="15,15,*">
         <Label Text="Pull the items down to refresh the CollectionView." />
-        <Label Text="{Binding Animals.Count, StringFormat='Number of items: {0}'}" />
-        <RefreshView IsRefreshing="{Binding IsRefreshing}"
-                     Command="{Binding RefreshCommand}">
+        <Label 
+            Grid.Row="1"
+            Text="{Binding Animals.Count, StringFormat='Number of items: {0}'}" />
+
+        <RefreshView
+                    Grid.Row="2"
+                    IsRefreshing="{Binding IsRefreshing}"
+                    Command="{Binding RefreshCommand}">
             <CollectionView ItemsSource="{Binding Animals}"
                             ItemsLayout="HorizontalGrid, 4">
                 <CollectionView.ItemTemplate>
@@ -40,5 +45,5 @@
                 </CollectionView.ItemTemplate>
             </CollectionView>
         </RefreshView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/PullToRefresh/VerticalListPullToRefreshPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/PullToRefresh/VerticalListPullToRefreshPage.xaml
index d7dedda91..3dcff1100 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/PullToRefresh/VerticalListPullToRefreshPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/PullToRefresh/VerticalListPullToRefreshPage.xaml
@@ -3,11 +3,15 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.VerticalListPullToRefreshPage"
              Title="Pull to refresh">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="15,15,*">
         <Label Text="Pull the items down to refresh the CollectionView." />
-        <Label Text="{Binding Animals.Count, StringFormat='Number of items: {0}'}" />
-        <RefreshView IsRefreshing="{Binding IsRefreshing}"
-                     Command="{Binding RefreshCommand}">
+        <Label
+            Grid.Row="1"
+            Text="{Binding Animals.Count, StringFormat='Number of items: {0}'}" />
+        <RefreshView
+                Grid.Row="2"
+                IsRefreshing="{Binding IsRefreshing}"
+                Command="{Binding RefreshCommand}">
             <CollectionView ItemsSource="{Binding Animals}">
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
@@ -38,5 +42,5 @@
                 </CollectionView.ItemTemplate>
             </CollectionView>
         </RefreshView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml
index 479e75d0f..e5ad05fa9 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.IncrementalLoadingPage"
              Title="Incremental loading on scroll">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Animals}"
                         RemainingItemsThreshold="5"
                         RemainingItemsThresholdReached="OnCollectionViewRemainingItemsThresholdReached"
@@ -36,5 +36,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
index df062d5c1..735a6bb21 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
@@ -4,7 +4,7 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.ItemsUpdatingScrollModePage"
              Title="Scroll mode when adding items">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="30,*">
         <StackLayout Orientation="Horizontal"
                      HorizontalOptions="Center">
             <Label Text="UpdatingScrollMode: "
@@ -15,6 +15,7 @@
                                  SelectedIndexChanged="OnItemsUpdatingScrollModeChanged" />
         </StackLayout>
         <CollectionView x:Name="collectionView"
+                        Grid.Row="1"
                         ItemsSource="{Binding Monkeys}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -44,5 +45,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml
index a78a63dd1..42ae6969d 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml
@@ -4,25 +4,28 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.ScrollToByIndexPage"
              Title="Scroll to index">
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <Grid Margin="20" RowDefinitions="30,30,35,*">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="ScrollToPosition: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ScrollToPosition}"
                                  SelectedIndex="0" />
-        </StackLayout>
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        </HorizontalStackLayout>
+        <HorizontalStackLayout
+            Grid.Row="1"
+            HorizontalOptions="Center">
             <Label Text="Animate scroll: "
                    VerticalTextAlignment="Center" />
             <Switch x:Name="animateSwitch"
                     IsToggled="true" />
-        </StackLayout>
-        <Button Text="Scroll to item 12"
-                Clicked="OnButtonClicked" />
+        </HorizontalStackLayout>
+        <Button 
+            Grid.Row="2"
+            Text="Scroll to item 12"
+            Clicked="OnButtonClicked" />
         <CollectionView x:Name="collectionView"
+                        Grid.Row="3"
                         ItemsSource="{Binding Monkeys}"
                         Scrolled="OnCollectionViewScrolled">
             <CollectionView.ItemTemplate>
@@ -53,5 +56,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByIndexWithGroupingPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByIndexWithGroupingPage.xaml
index 4d67ba060..5a891f063 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByIndexWithGroupingPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByIndexWithGroupingPage.xaml
@@ -4,25 +4,29 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.ScrollToByIndexWithGroupingPage"
              Title="Scroll to index (grouped data)">
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <Grid Margin="20" RowDefinitions="30,30,35,*">
+        <HorizontalStackLayout
+            HorizontalOptions="Center">
             <Label Text="ScrollToPosition: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ScrollToPosition}"
                                  SelectedIndex="0" />
-        </StackLayout>
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        </HorizontalStackLayout>
+        <HorizontalStackLayout
+            Grid.Row="1"
+            HorizontalOptions="Center">
             <Label Text="Animate scroll: "
                    VerticalTextAlignment="Center" />
             <Switch x:Name="animateSwitch"
                     IsToggled="true" />
-        </StackLayout>
-        <Button Text="Scroll to third cat"
-                Clicked="OnButtonClicked" />
+        </HorizontalStackLayout>
+        <Button 
+            Grid.Row="2"
+            Text="Scroll to third cat"
+            Clicked="OnButtonClicked" />
         <CollectionView x:Name="collectionView"
+                        Grid.Row="3"
                         ItemsSource="{Binding Animals}"
                         IsGrouped="true"
                         Scrolled="OnCollectionViewScrolled">
@@ -68,5 +72,5 @@
                 </DataTemplate>
             </CollectionView.GroupFooterTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml
index 87f0f3e1b..030807c32 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml
@@ -4,25 +4,29 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.ScrollToByObjectPage"
              Title="Scroll to object">
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <Grid Margin="20" RowDefinitions="30,30,35,*">
+        <HorizontalStackLayout
+            HorizontalOptions="Center">
             <Label Text="ScrollToPosition: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ScrollToPosition}"
                                  SelectedIndex="0" />
-        </StackLayout>
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        </HorizontalStackLayout>
+        <HorizontalStackLayout
+            Grid.Row="1"
+            HorizontalOptions="Center">
             <Label Text="Animate scroll: "
                    VerticalTextAlignment="Center" />
             <Switch x:Name="animateSwitch"
                     IsToggled="true" />
-        </StackLayout>
-        <Button Text="Scroll to Proboscis Monkey"
+        </HorizontalStackLayout>
+        <Button
+                Grid.Row="2"
+                Text="Scroll to Proboscis Monkey"
                 Clicked="OnButtonClicked" />
         <CollectionView x:Name="collectionView"
+                        Grid.Row="3"
                         ItemsSource="{Binding Monkeys}"
                         Scrolled="OnCollectionViewScrolled">
             <CollectionView.ItemTemplate>
@@ -53,5 +57,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByObjectWithGroupingPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByObjectWithGroupingPage.xaml
index cc318b887..40d3249d6 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByObjectWithGroupingPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ScrollToByObjectWithGroupingPage.xaml
@@ -4,25 +4,29 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.ScrollToByObjectWithGroupingPage"
              Title="Scroll to object (grouped data)">
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <Grid Margin="20">
+        <HorizontalStackLayout
+            HorizontalOptions="Center">
             <Label Text="ScrollToPosition: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ScrollToPosition}"
                                  SelectedIndex="0" />
-        </StackLayout>
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        </HorizontalStackLayout>
+        <HorizontalStackLayout
+            Grid.Row="1"
+            HorizontalOptions="Center">
             <Label Text="Animate scroll: "
                    VerticalTextAlignment="Center" />
             <Switch x:Name="animateSwitch"
                     IsToggled="true" />
-        </StackLayout>
-        <Button Text="Scroll to Proboscis Monkey"
+        </HorizontalStackLayout>
+        <Button
+                Grid.Row="2"
+                Text="Scroll to Proboscis Monkey"
                 Clicked="OnButtonClicked" />
         <CollectionView x:Name="collectionView"
+                        Grid.Row="3"
                         ItemsSource="{Binding Animals}"
                         IsGrouped="true"
                         Scrolled="OnCollectionViewScrolled">
@@ -68,5 +72,5 @@
                 </DataTemplate>
             </CollectionView.GroupFooterTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListMultiplePreSelectionPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListMultiplePreSelectionPage.xaml
index 28a25a0c1..ed33345f8 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListMultiplePreSelectionPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListMultiplePreSelectionPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.VerticalListMultiplePreSelectionPage"
              Title="Vertical list (multiple pre-selection)">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView x:Name="collectionView"
                         ItemsSource="{Binding Monkeys}"
                         SelectionMode="Multiple"
@@ -36,5 +36,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListMultipleSelectionPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListMultipleSelectionPage.xaml
index eca526d66..6a015bd67 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListMultipleSelectionPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListMultipleSelectionPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.VerticalListMultipleSelectionPage"
              Title="Vertical list (multiple selection)">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="*,*">
         <ScrollView HeightRequest="150">
             <Grid>
                 <Grid.RowDefinitions>
@@ -24,7 +24,9 @@
                            Grid.Column="1" />
             </Grid>
         </ScrollView>
-        <CollectionView ItemsSource="{Binding Monkeys}"
+        <CollectionView
+                        Grid.Row="1"
+                        ItemsSource="{Binding Monkeys}"
                         SelectionMode="Multiple"
                         SelectionChanged="OnCollectionViewSelectionChanged">
             <CollectionView.ItemTemplate>
@@ -55,5 +57,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSelectionColorPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSelectionColorPage.xaml
index 7ccff0121..56d00d47f 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSelectionColorPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSelectionColorPage.xaml
@@ -20,7 +20,7 @@
             </Setter>
         </Style>
     </ContentPage.Resources>
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}"
                         SelectionMode="Single">
             <CollectionView.ItemTemplate>
@@ -51,5 +51,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSinglePreSelectionPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSinglePreSelectionPage.xaml
index 10550fc03..028fa3c07 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSinglePreSelectionPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSinglePreSelectionPage.xaml
@@ -3,9 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="CollectionViewDemos.Views.VerticalListSinglePreSelectionPage"
              Title="Vertical list (single pre-selection)">
-<StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="15,*">
         <Label Text="{Binding SelectedMonkeyMessage}" />
-        <CollectionView ItemsSource="{Binding Monkeys}"
+        <CollectionView
+                        Grid.Row="1"
+                        ItemsSource="{Binding Monkeys}"
                         SelectionMode="Single"
                         SelectedItem="{Binding SelectedMonkey}"
                         SelectionChangedCommand="{Binding MonkeySelectionChangedCommand}">
@@ -37,5 +39,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSingleSelectionPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSingleSelectionPage.xaml
index 35e6398c2..989303853 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSingleSelectionPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Selection/VerticalListSingleSelectionPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.VerticalListSingleSelectionPage"
              Title="Vertical list (single selection)">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="50, *">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -22,7 +22,9 @@
                    Grid.Row="1"
                    Grid.Column="1" />
         </Grid>
-        <CollectionView ItemsSource="{Binding Monkeys}"
+        <CollectionView
+                        Grid.Row="1"
+                        ItemsSource="{Binding Monkeys}"
                         SelectionMode="Single"
                         SelectionChanged="OnCollectionViewSelectionChanged">
             <CollectionView.ItemTemplate>
@@ -53,5 +55,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Sizing/VerticalListDynamicSizeItemsPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Sizing/VerticalListDynamicSizeItemsPage.xaml
index 4a8968817..695c3fac7 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Sizing/VerticalListDynamicSizeItemsPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Sizing/VerticalListDynamicSizeItemsPage.xaml
@@ -3,9 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CollectionViewDemos.Views.VerticalListDynamicSizeItemsPage"
              Title="Vertical list (dynamic item sizing)">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="20,*">
         <Label Text="Tap each image to dynamically change its size." />
-        <CollectionView ItemsSource="{Binding Monkeys}">
+        <CollectionView 
+            Grid.Row="1"
+            ItemsSource="{Binding Monkeys}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid Padding="10">
@@ -38,5 +40,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Sizing/VerticalListVariableSizeItemsPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Sizing/VerticalListVariableSizeItemsPage.xaml
index f66dd7ad4..16b67bda7 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Sizing/VerticalListVariableSizeItemsPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Sizing/VerticalListVariableSizeItemsPage.xaml
@@ -4,16 +4,17 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.VerticalListVariableSizeItemsPage"
              Title="Vertical list (variable size items)">
-  <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+  <Grid Margin="20" RowDefinitions="30,*">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="ItemSizingStrategy:"
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ItemSizingStrategy}"
                                  SelectedIndex="0" />
-        </StackLayout>
-        <CollectionView ItemsSource="{Binding Monkeys}" 
+        </HorizontalStackLayout>
+        <CollectionView
+                        Grid.Row="1"
+                        ItemsSource="{Binding Monkeys}" 
                         ItemSizingStrategy="{Binding Source={x:Reference enumPicker}, Path=SelectedItem}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -41,5 +42,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/SnapPoints/VerticalListSnapPointsPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/SnapPoints/VerticalListSnapPointsPage.xaml
index d46c33369..54d2b81f6 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/SnapPoints/VerticalListSnapPointsPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/SnapPoints/VerticalListSnapPointsPage.xaml
@@ -4,27 +4,28 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.VerticalListSnapPointsPage"
              Title="Vertical list (snap points)">
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <Grid Margin="20" RowDefinitions="30,30,*">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="SnapPointsType: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="snapPointsTypeEnumPicker"
                               EnumType="{x:Type SnapPointsType}"
                               SelectedIndex="0"
                               SelectedIndexChanged="OnSnapPointsTypeSelectedIndexChanged" />
-        </StackLayout>
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
-            <Label Grid.Row="1" 
-                   Text="SnapPointsAlignment: "
-                   VerticalTextAlignment="Center" />
+        </HorizontalStackLayout>
+        <HorizontalStackLayout
+            Grid.Row="1"
+            HorizontalOptions="Center">
+            <Label
+                Text="SnapPointsAlignment: "
+                VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="snapPointsAlignmentEnumPicker"
                              EnumType="{x:Type SnapPointsAlignment}"
                              SelectedIndex="0"
                              SelectedIndexChanged="OnSnapPointsAlignmentSelectedIndexChanged" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <CollectionView x:Name="collectionView"
+                        Grid.Row="2"
                         ItemsSource="{Binding Monkeys}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -54,5 +55,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/HorizontalGridSpacingPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/HorizontalGridSpacingPage.xaml
index e83be97e6..f5a7bdfa8 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/HorizontalGridSpacingPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/HorizontalGridSpacingPage.xaml
@@ -4,10 +4,11 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.HorizontalGridSpacingPage"
              Title="Horizontal grid (spacing)">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="30,*">
         <controls:SpacingModifier CV="{x:Reference collectionView}"
                                   SpacingText="0,0" />
         <CollectionView x:Name="collectionView"
+                        Grid.Row="1"
                         ItemsSource="{Binding Monkeys}"
                         ItemsLayout="HorizontalGrid, 4">
             <CollectionView.ItemTemplate>
@@ -40,5 +41,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/HorizontalListSpacingPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/HorizontalListSpacingPage.xaml
index 9d06fc346..f029e0151 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/HorizontalListSpacingPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/HorizontalListSpacingPage.xaml
@@ -4,10 +4,11 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.HorizontalListSpacingPage"
              Title="Horizontal list (spacing)">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="30,*">
         <controls:SpacingModifier CV="{x:Reference collectionView}"
                                   SpacingText="0" />
         <CollectionView x:Name="collectionView"
+                        Grid.Row="1"
                         ItemsSource="{Binding Monkeys}"
                         ItemsLayout="HorizontalList">
             <CollectionView.ItemTemplate>
@@ -40,5 +41,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/VerticalGridSpacingPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/VerticalGridSpacingPage.xaml
index 9cdbbd3df..de72a49d9 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/VerticalGridSpacingPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/VerticalGridSpacingPage.xaml
@@ -4,10 +4,11 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.VerticalGridSpacingPage"
              Title="Vertical grid (spacing)">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="30,*">
         <controls:SpacingModifier CV="{x:Reference collectionView}" 
                                   SpacingText="0,0" />
         <CollectionView x:Name="collectionView"
+                        Grid.Row="1"
                         ItemsSource="{Binding Monkeys}"
                         ItemsLayout="VerticalGrid, 2">
             <CollectionView.ItemTemplate>
@@ -40,5 +41,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/VerticalListSpacingPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/VerticalListSpacingPage.xaml
index 669b539ea..36427baaa 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/VerticalListSpacingPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Spacing/VerticalListSpacingPage.xaml
@@ -4,10 +4,11 @@
              xmlns:controls="clr-namespace:CollectionViewDemos.Controls"
              x:Class="CollectionViewDemos.Views.VerticalListSpacingPage"
              Title="Vertical list (spacing)">
-    <StackLayout Margin="20">
+    <Grid Margin="20" RowDefinitions="30,*">
         <controls:SpacingModifier CV="{x:Reference collectionView}"
                                   SpacingText="0" />
         <CollectionView x:Name="collectionView"
+                        Grid.Row="1"
                         ItemsSource="{Binding Monkeys}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -37,5 +38,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Swipe/VerticalListSwipeContextItemsPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Swipe/VerticalListSwipeContextItemsPage.xaml
index 99d2760e1..7e9b90894 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Swipe/VerticalListSwipeContextItemsPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Swipe/VerticalListSwipeContextItemsPage.xaml
@@ -4,7 +4,7 @@
              xmlns:viewmodels="clr-namespace:CollectionViewDemos.ViewModels"
              x:Class="CollectionViewDemos.Views.VerticalListSwipeContextItemsPage"
              Title="Context menu items">
-    <StackLayout Margin="20">
+    <Grid Margin="20">
         <CollectionView x:Name="collectionView"
                         ItemsSource="{Binding Monkeys}">
             <CollectionView.ItemTemplate>
@@ -52,5 +52,5 @@
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
-    </StackLayout>
+    </Grid>
 </ContentPage>

From e9e34ea0d24394849115643d3a351c1149e157cf Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Sat, 4 May 2024 16:37:00 +0200
Subject: [PATCH 2/6] Replace all StackLayout with the oriented ones

---
 8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml  |  2 +-
 .../Views/CompiledColorListPage.xaml          |  4 +-
 .../Views/PersonEntryPage.xaml                |  5 +--
 .../Views/RelativeSourceFindAncestorPage.xaml |  4 +-
 .../RelativeSourceTemplatedParentPage.xaml    |  4 +-
 .../Views/ReverseBindingPage.xaml             |  4 +-
 .../Views/SimpleColorSelectorPage.xaml        |  4 +-
 .../Views/StringFormattingPage.xaml           | 12 +++---
 .../Views/SwitchIndicatorsPage.xaml           | 19 ++++-----
 8.0/Fundamentals/Shell/Xaminals/AppShell.xaml |  4 +-
 .../Shell/Xaminals/Controls/FlyoutFooter.xaml |  4 +-
 .../Shell/Xaminals/Views/AboutPage.xaml       |  4 +-
 .../Shell/Xaminals/Views/BearDetailPage.xaml  |  4 +-
 .../Shell/Xaminals/Views/CatDetailPage.xaml   |  4 +-
 .../Shell/Xaminals/Views/DogDetailPage.xaml   |  4 +-
 .../Xaminals/Views/ElephantDetailPage.xaml    |  4 +-
 .../Xaminals/Views/MonkeyDetailPage.xaml      |  4 +-
 .../Views/AdaptiveTriggerDemoPage.xaml        |  4 +-
 .../Views/CompareStateTriggerDemoPage.xaml    |  4 +-
 .../Views/DataTriggerXaml.xaml                |  4 +-
 .../Views/EnterExitActionXaml.xaml            |  4 +-
 .../Views/EventTriggerXaml.xaml               |  4 +-
 .../Views/MultiTriggerXaml.xaml               |  4 +-
 .../Views/OnClickEventTriggerXaml.xaml        |  4 +-
 .../Views/PropertyTriggerXaml.xaml            |  4 +-
 .../Views/StateTriggerDemoPage.xaml           |  4 +-
 .../Views/AllSensorsPage.xaml                 |  4 +-
 .../Views/AppInfoPage.xaml                    |  4 +-
 .../Views/BatteryPage.xaml                    |  4 +-
 .../Views/BrowserPage.xaml                    |  4 +-
 .../Views/ClipboardPage.xaml                  |  4 +-
 .../Views/ConnectivityPage.xaml               |  4 +-
 .../Views/ContactDetailsPage.xaml             | 12 +++---
 .../Views/ContactsPage.xaml                   |  4 +-
 .../Views/DeviceInfoPage.xaml                 |  4 +-
 .../Views/EmailPage.xaml                      | 12 +++---
 .../Views/FilePickerPage.xaml                 |  4 +-
 .../Views/FileSystemPage.xaml                 |  9 ++--
 .../Views/FlashlightPage.xaml                 |  4 +-
 .../Views/GeocodingPage.xaml                  |  4 +-
 .../Views/GeolocationPage.xaml                |  9 ++--
 .../Views/HapticFeedbackPage.xaml             |  4 +-
 .../Views/KeepScreenOnPage.xaml               |  4 +-
 .../Views/LauncherPage.xaml                   |  4 +-
 .../Views/MapsPage.xaml                       |  4 +-
 .../Views/MediaPickerPage.xaml                |  4 +-
 .../Views/PhoneDialerPage.xaml                |  4 +-
 .../Views/PreferencesPage.xaml                |  4 +-
 .../Views/SMSPage.xaml                        |  4 +-
 .../Views/ScreenshotPage.xaml                 |  4 +-
 .../Views/SecureStoragePage.xaml              |  4 +-
 .../Views/SemanticScreenReaderPage.xaml       |  4 +-
 .../Views/SharePage.xaml                      | 12 +++---
 .../Views/TextToSpeechPage.xaml               |  4 +-
 .../Views/UnitConvertersPage.xaml             |  4 +-
 .../Views/VibrationPage.xaml                  |  4 +-
 .../Views/WebAuthenticatorPage.xaml           |  4 +-
 .../PhotoPuzzle/Pages/PhotoPuzzlePage.xaml    |  4 +-
 .../code/Views/AllNotesPage.xaml              |  4 +-
 .../code/Views/AllNotesPage.xaml              |  4 +-
 .../Controls/GradientColorPicker.xaml         |  8 ++--
 .../BrushesDemos/Views/CSSDemoPage.xaml       |  4 +-
 .../Views/LinearGradientBrushDemoPage.xaml    |  4 +-
 .../Views/RadialGradientBrushDemoPage.xaml    |  4 +-
 .../Views/SolidColorBrushDemoPage.xaml        |  4 +-
 .../Views/UpdateBrushDemoPage.xaml            |  4 +-
 .../Views/XAML/AbsoluteLayoutDemoPage.xaml    |  4 +-
 .../Views/XAML/ActivityIndicatorDemoPage.xaml |  4 +-
 .../Views/XAML/BoxViewDemoPage.xaml           |  4 +-
 .../Views/XAML/ButtonDemoPage.xaml            |  4 +-
 .../Views/XAML/CarouselViewDemoPage.xaml      | 12 +++---
 .../Views/XAML/CheckBoxPage.xaml              |  4 +-
 .../Views/XAML/ContentPageDemoPage.xaml       |  4 +-
 .../Views/XAML/ContentViewDemoPage.xaml       |  4 +-
 .../Views/XAML/DatePickerDemoPage.xaml        |  4 +-
 .../Views/XAML/EditorDemoPage.xaml            |  4 +-
 .../Views/XAML/EllipseDemoPage.xaml           |  4 +-
 .../Views/XAML/EntryCellDemoPage.xaml         |  4 +-
 .../Views/XAML/EntryDemoPage.xaml             |  4 +-
 .../Views/XAML/FlyoutPageDemoPage.xaml        | 16 ++++----
 .../Views/XAML/FrameDemoPage.xaml             |  4 +-
 .../Views/XAML/ImageButtonDemoPage.xaml       |  4 +-
 .../Views/XAML/ImageCellDemoPage.xaml         |  4 +-
 .../Views/XAML/ImageDemoPage.xaml             |  4 +-
 .../Views/XAML/IndicatorViewDemoPage.xaml     | 12 +++---
 .../Views/XAML/LabelDemoPage.xaml             |  4 +-
 .../Views/XAML/LineDemoPage.xaml              |  4 +-
 .../Views/XAML/ListViewDemoPage.xaml          | 13 +++---
 .../Views/XAML/NavigationPageDemoPage.xaml    |  8 ++--
 .../Views/XAML/PathDemoPage.xaml              |  4 +-
 .../Views/XAML/PickerDemoPage.xaml            |  4 +-
 .../Views/XAML/PolygonDemoPage.xaml           |  4 +-
 .../Views/XAML/PolylineDemoPage.xaml          |  4 +-
 .../Views/XAML/ProgressBarDemoPage.xaml       |  4 +-
 .../Views/XAML/RadioButtonDemoPage.xaml       |  4 +-
 .../Views/XAML/RectangleDemoPage.xaml         |  4 +-
 .../Views/XAML/RefreshViewDemoPage.xaml       |  4 +-
 .../Views/XAML/ScrollViewDemoPage.xaml        |  4 +-
 .../Views/XAML/SearchBarDemoPage.xaml         |  4 +-
 .../Views/XAML/SliderDemoPage.xaml            |  4 +-
 .../Views/XAML/StackLayoutDemoPage.xaml       | 14 +++----
 .../Views/XAML/StepperDemoPage.xaml           |  4 +-
 .../Views/XAML/SwitchCellDemoPage.xaml        |  4 +-
 .../Views/XAML/SwitchDemoPage.xaml            |  4 +-
 .../Views/XAML/TabbedPageDemoPage.xaml        | 12 +++---
 .../Views/XAML/TableViewFormDemoPage.xaml     |  4 +-
 .../Views/XAML/TableViewMenuDemoPage.xaml     |  4 +-
 .../Views/XAML/TextCellDemoPage.xaml          |  4 +-
 .../Views/XAML/TimePickerDemoPage.xaml        |  4 +-
 .../Views/XAML/WebViewDemoPage.xaml           |  4 +-
 .../HyperlinkDemo/HyperlinkDemo/MainPage.xaml |  4 +-
 .../Views/XAML/SimpleOverlayDemoPage.xaml     |  4 +-
 ...serProfileEmptyViewLoadSimulationPage.xaml | 29 ++++++-------
 .../Views/UserProfileEmptyViewNullPage.xaml   | 29 ++++++-------
 .../Views/UserProfileEmptyViewSwapPage.xaml   | 41 +++++++++----------
 .../UserProfileEmptyViewTemplatePage.xaml     | 29 ++++++-------
 ...rProfileEmptyViewTemplateSelectorPage.xaml | 37 ++++++++---------
 ...ProfileEmptyViewWithMultipleViewsPage.xaml | 33 +++++++--------
 .../Views/UserProfilePage.xaml                | 29 ++++++-------
 .../Views/BasisExperimentPage.xaml            | 16 ++++----
 .../FlexLayoutDemos/Views/ExperimentPage.xaml |  5 +--
 .../Views/XAML/AlignmentPage.xaml             |  4 +-
 .../Views/XAML/CombinedStackLayoutPage.xaml   | 33 +++++++--------
 .../Views/XAML/HorizontalStackLayoutPage.xaml |  5 +--
 .../Views/XAML/StackLayoutSpacingPage.xaml    |  4 +-
 .../Views/XAML/VerticalStackLayoutPage.xaml   |  4 +-
 .../Views/UserSummaryPage.xaml                |  4 +-
 .../ThemingDemo/Views/ThemeSelectionPage.xaml |  4 +-
 .../ThemingDemo/Views/UserSummaryPage.xaml    |  4 +-
 .../Controls/SpacingModifier.xaml             |  4 +-
 .../EmptyViewDataTemplateSelectorPage.xaml    | 16 ++++----
 .../EmptyView/EmptyViewFilteredPage.xaml      | 12 +++---
 .../EmptyViewLoadSimulationPage.xaml          |  8 ++--
 .../Views/EmptyView/EmptyViewSwapPage.xaml    | 24 +++++------
 .../EmptyView/EmptyViewTemplatePage.xaml      | 12 +++---
 .../EmptyViewWithViewsFilteredPage.xaml       | 16 ++++----
 .../HorizontalLayoutWithIndicatorsPage.xaml   | 12 +++---
 .../CurrentItemAndPositionBindingsPage.xaml   | 12 +++---
 .../CurrentItemAndPositionPage.xaml           | 12 +++---
 .../SetCurrentItemAndPositionPage.xaml        | 12 +++---
 .../Views/Interaction/VisualStatesPage.xaml   |  8 ++--
 ...izontalLayoutDataTemplateSelectorPage.xaml | 16 ++++----
 .../Layout/HorizontalLayoutPeekAreaPage.xaml  |  8 ++--
 .../Layout/HorizontalTemplateLayoutPage.xaml  |  8 ++--
 .../HorizontalTemplateLayoutRTLPage.xaml      |  8 ++--
 .../Layout/HorizontalTextLayoutPage.xaml      |  4 +-
 .../Layout/VerticalTemplateLayoutPage.xaml    |  8 ++--
 .../Views/Layout/VerticalTextLayoutPage.xaml  |  4 +-
 .../HorizontalPullToRefreshPage.xaml          | 12 +++---
 .../VerticalPullToRefreshPage.xaml            | 12 +++---
 .../Scrolling/IncrementalLoadingPage.xaml     | 12 +++---
 .../ItemsUpdatingScrollModePage.xaml          | 17 ++++----
 .../Views/Scrolling/ScrollToByIndexPage.xaml  | 22 +++++-----
 .../Views/Scrolling/ScrollToByObjectPage.xaml | 22 +++++-----
 .../Views/Scrolling/SnapPointsPage.xaml       | 18 ++++----
 .../Views/Sizing/DynamicSizeItemsPage.xaml    | 12 +++---
 .../Views/Spacing/HorizontalSpacingPage.xaml  | 12 +++---
 .../Views/Spacing/VerticalSpacingPage.xaml    | 12 +++---
 .../Views/Swipe/HorizontalSwipeItemsPage.xaml |  8 ++--
 .../EmptyViewDataTemplateSelectorPage.xaml    |  4 +-
 .../Views/EmptyView/EmptyViewSwapPage.xaml    |  8 ++--
 .../EmptyViewWithViewsFilteredPage.xaml       |  4 +-
 ...icalListGroupingVariableSizeItemsPage.xaml |  5 +--
 .../HorizontalGridHeaderFooterViewPage.xaml   |  8 ++--
 ...ticalListHeaderFooterDataTemplatePage.xaml |  8 ++--
 .../VerticalListHeaderFooterViewPage.xaml     |  8 ++--
 .../ItemsUpdatingScrollModePage.xaml          |  5 +--
 .../Views/BasicIndicatorViewPage.xaml         |  8 ++--
 .../Views/ConfigurableIndicatorViewPage.xaml  |  8 ++--
 .../Views/TemplatedIndicatorViewPage.xaml     |  8 ++--
 .../Views/ContextMenuItemsPage.xaml           |  4 +-
 .../Views/DataTemplateSelectorPage.xaml       |  4 +-
 .../ListViewDemos/Views/GroupingPage.xaml     |  4 +-
 .../Views/PullToRefreshPage.xaml              |  4 +-
 .../Views/RightToLeftListPage.xaml            |  4 +-
 .../Views/RuntimeItemSizingPage.xaml          |  4 +-
 .../ListViewDemos/Views/ScrollByItemPage.xaml | 14 +++----
 .../Views/ScrollByItemWithGroupingPage.xaml   | 14 +++----
 .../ListViewDemos/Views/SelectionPage.xaml    |  4 +-
 .../Views/TemplatedHeaderFooterPage.xaml      | 12 +++---
 .../Views/TextHeaderFooterPage.xaml           |  4 +-
 .../ListViewDemos/Views/TextListPage.xaml     |  4 +-
 .../ListViewDemos/Views/VerticalListPage.xaml |  4 +-
 .../Views/ViewHeaderFooterPage.xaml           | 12 +++---
 .../WorkingWithMaps/Views/GeocoderPage.xaml   |  4 +-
 .../WorkingWithMaps/Views/MapAppPage.xaml     |  4 +-
 .../Views/MapPropertiesPage.xaml              |  4 +-
 .../WorkingWithMaps/Views/MapRegionPage.xaml  |  4 +-
 .../WorkingWithMaps/Views/MapTypesPage.xaml   |  8 ++--
 .../Views/PinItemsSourcePage.xaml             |  5 +--
 .../WorkingWithMaps/Views/PinPage.xaml        |  4 +-
 .../Views/BasicRadioButtonsPage.xaml          |  8 ++--
 .../BasicRadioButtonsVisualStatePage.xaml     |  4 +-
 .../Views/GroupedRadioButtonsPage.xaml        |  8 ++--
 .../GroupedRadioButtonsViewModelPage.xaml     |  4 +-
 .../Views/RadioButtonControlTemplatePage.xaml | 25 ++++++-----
 .../Views/RadioButtonsExplainedPage.xaml      |  8 ++--
 .../RefreshViewDemo/MainPage.xaml             |  4 +-
 .../Views/XAML/BlackCatPage.xaml              |  4 +-
 .../Views/XAML/ColorListPage.xaml             |  8 ++--
 .../ShapesDemos/Views/BrushesDemoPage.xaml    |  4 +-
 .../ShapesDemos/Views/ClipDemoPage.xaml       |  4 +-
 .../ShapesDemos/Views/EllipseDemoPage.xaml    |  4 +-
 .../ShapesDemos/Views/LineDemoPage.xaml       |  4 +-
 .../ShapesDemos/Views/PathAspectDemoPage.xaml |  4 +-
 .../ShapesDemos/Views/PathDemoPage.xaml       |  4 +-
 .../Views/PathGeometryDemoPage.xaml           |  4 +-
 .../Views/PathRenderTransformDemoPage.xaml    |  4 +-
 .../PathRenderTransformExamplesDemoPage.xaml  |  4 +-
 .../ShapesDemos/Views/PolygonDemoPage.xaml    |  4 +-
 .../ShapesDemos/Views/PolylineDemoPage.xaml   |  4 +-
 .../ShapesDemos/Views/RectangleDemoPage.xaml  |  4 +-
 .../Views/SwipeViewCustomItemPage.xaml        |  8 ++--
 .../Views/SwipeViewDirectionPage.xaml         |  4 +-
 .../Views/SwipeViewEventsPage.xaml            |  4 +-
 .../Views/SwipeViewModeBehaviorPage.xaml      | 14 +++----
 .../Views/SwipeViewProgrammaticPage.xaml      |  4 +-
 .../Views/SwipeViewResourcePage.xaml          |  4 +-
 .../Views/SwipeViewThresholdPage.xaml         |  4 +-
 .../SwitchDemos/Views/SwitchXamlPage.xaml     |  4 +-
 .../Views/TwoPaneView/MainPage.xaml           |  4 +-
 .../XamlSamples/Views/ListViewDemoPage.xaml   | 14 +++----
 .../Views/OneShotDateTimePage.xaml            |  4 +-
 .../Views/SharedResourcesPage.xaml            |  4 +-
 .../XamlSamples/Views/SliderBindingsPage.xaml |  4 +-
 .../Views/StaticConstantsPage.xaml            |  4 +-
 .../XamlSamples/Views/XamlPlusCodePage.xaml   |  4 +-
 .../Views/AppThemeBindingDemoPage.xaml        |  4 +-
 .../Views/FontImageDemoPage.xaml              |  4 +-
 .../Views/HslColorDemoPage.xaml               |  4 +-
 .../MarkupExtensions/Views/NullDemoPage.xaml  |  4 +-
 .../Views/OnIdiomDemoPage.xaml                |  4 +-
 .../Views/OnPlatformDemoPage.xaml             |  4 +-
 .../Views/ReferenceDemoPage.xaml              |  4 +-
 .../Views/StaticDemoPage.xaml                 |  4 +-
 .../MarkupExtensions/Views/TypeDemoPage.xaml  |  4 +-
 .../Entry/CustomRenderer/MainPageXaml.xaml    |  4 +-
 237 files changed, 814 insertions(+), 870 deletions(-)

diff --git a/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml b/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml
index 1aeef7bd7..6de6e9235 100644
--- a/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml
+++ b/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml
@@ -72,7 +72,7 @@
                        TextColor="Red" />
                 <Label Text="!"
                        TextColor="Red" />
-            </StackLayout>
+            </VerticalStackLayout>
             <HorizontalStackLayout x:Name="consolationText"
                                    HorizontalOptions="Center">
                 <Label Text="T"
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/CompiledColorListPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/CompiledColorListPage.xaml
index df91886d7..10c25fece 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/CompiledColorListPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/CompiledColorListPage.xaml
@@ -17,7 +17,7 @@
             <ListView.ItemTemplate>
                 <DataTemplate x:DataType="local:NamedColor">
                     <ViewCell>
-                        <StackLayout Orientation="Horizontal">
+                        <HorizontalStackLayout>
                             <BoxView Color="{Binding Color}"
                                      HeightRequest="32"
                                      WidthRequest="32"
@@ -26,7 +26,7 @@
                             <Label Text="{Binding FriendlyName}"
                                    FontSize="24"
                                    VerticalOptions="Center" />
-                        </StackLayout>
+                        </HorizontalStackLayout>
                     </ViewCell>
                 </DataTemplate>
             </ListView.ItemTemplate>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/PersonEntryPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/PersonEntryPage.xaml
index 0d26cc54d..dd5e973c5 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/PersonEntryPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/PersonEntryPage.xaml
@@ -39,13 +39,12 @@
                 <Entry Text="{Binding Name}" 
                        Grid.Row="0" Grid.Column="1" />
                 <Label Text="Age: " Grid.Row="1" Grid.Column="0" />
-                <StackLayout Orientation="Horizontal" 
-                             Grid.Row="1" Grid.Column="1">
+                <HorizontalStackLayout Grid.Row="1" Grid.Column="1">
                     <Stepper Value="{Binding Age}"
                              Maximum="100" />
                     <Label Text="{Binding Age, StringFormat='{0} years old'}"
                            VerticalOptions="Center" />
-                </StackLayout>
+                </HorizontalStackLayout>
                 <Label Text="Skills: " Grid.Row="2" Grid.Column="0" />
                 <Entry Text="{Binding Skills}"
                        Grid.Row="2" Grid.Column="1" />
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceFindAncestorPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceFindAncestorPage.xaml
index d170729a9..cc5d622cb 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceFindAncestorPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceFindAncestorPage.xaml
@@ -13,7 +13,7 @@
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <ViewCell>
-                        <StackLayout Orientation="Horizontal">
+                        <HorizontalStackLayout>
                             <Label Text="{Binding Fullname}"
                                    VerticalOptions="Center" />
                             <!--
@@ -25,7 +25,7 @@
                                     Command="{Binding Source={RelativeSource AncestorType={x:Type local:PeopleViewModel}}, Path=DeleteEmployeeCommand}"
                                     CommandParameter="{Binding}"
                                     HorizontalOptions="End" />
-                        </StackLayout>
+                        </HorizontalStackLayout>
                     </ViewCell>
                 </DataTemplate>
             </ListView.ItemTemplate>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceTemplatedParentPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceTemplatedParentPage.xaml
index ac011af23..71fe86d11 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceTemplatedParentPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/RelativeSourceTemplatedParentPage.xaml
@@ -61,7 +61,7 @@
             </Border>
         </ControlTemplate>
     </ContentPage.Resources>
-    <StackLayout Margin="30" Spacing="30">
+    <VerticalStackLayout Margin="30" Spacing="30">
         <controls:CardView BorderColor="DarkGray"
                            CardTitle="John Doe"
                            CardDescription="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla elit dolor, convallis non interdum."
@@ -80,5 +80,5 @@
                            IconBackgroundColor="SlateGray"
                            IconImageSource="user.png"
                            ControlTemplate="{StaticResource CardViewControlTemplate}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/ReverseBindingPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/ReverseBindingPage.xaml
index 843ccfd91..c9560f583 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/ReverseBindingPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/ReverseBindingPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="DataBindingDemos.ReverseBindingPage"
              Title="Reverse Binding">
-    <StackLayout Padding="10, 0">
+    <VerticalStackLayout Padding="10, 0">
 
         <Label x:Name="label" 
                Text="TEXT"
@@ -15,5 +15,5 @@
                 VerticalOptions="Center"
                 Value="{Binding Source={x:Reference label},
                                 Path=Opacity}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/SimpleColorSelectorPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/SimpleColorSelectorPage.xaml
index 976d68cf7..3b3a082cc 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/SimpleColorSelectorPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/SimpleColorSelectorPage.xaml
@@ -21,13 +21,13 @@
         </Grid.RowDefinitions>
         <BoxView Color="{Binding Color}"
                  Grid.Row="0" />
-        <StackLayout Grid.Row="1"
+        <VerticalStackLayout Grid.Row="1"
                      Margin="10, 0">
             <Label Text="{Binding Name}"
                    HorizontalTextAlignment="Center" />
             <Slider Value="{Binding Hue}" />    
             <Slider Value="{Binding Saturation}" />
             <Slider Value="{Binding Luminosity}" />
-        </StackLayout>
+        </VerticalStackLayout>
     </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/StringFormattingPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/StringFormattingPage.xaml
index 05a70cb7c..13f9bf355 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/StringFormattingPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/StringFormattingPage.xaml
@@ -17,7 +17,7 @@
         </Style>
     </ContentPage.Resources>
 
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Slider x:Name="slider" />
         <Label Text="{Binding Source={x:Reference slider},
                               Path=Value,
@@ -39,20 +39,20 @@
 
         <BoxView />
 
-        <StackLayout BindingContext="{x:Static sys:DateTime.Now}">
+        <VerticalStackLayout BindingContext="{x:Static sys:DateTime.Now}">
             <Label Text="{Binding}" />
             <Label Text="{Binding Path=Ticks, 
                                   StringFormat='{0:N0} ticks since 1/1/1'}" />
             <Label Text="{Binding StringFormat='The {{0:MMMM}} specifier produces {0:MMMM}'}" />
             <Label Text="{Binding StringFormat='The long date is {0:D}'}" />
-        </StackLayout>
+        </VerticalStackLayout>
 
         <BoxView />
 
-        <StackLayout BindingContext="{x:Static sys:Math.PI}">
+        <VerticalStackLayout BindingContext="{x:Static sys:Math.PI}">
             <Label Text="{Binding}" />
             <Label Text="{Binding StringFormat='PI to 4 decimal points = {0:F4}'}" />
             <Label Text="{Binding StringFormat='PI in scientific notation = {0:E7}'}" />
-        </StackLayout>
-    </StackLayout>
+        </VerticalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/SwitchIndicatorsPage.xaml b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/SwitchIndicatorsPage.xaml
index 4589f2c5b..12846b2ea 100644
--- a/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/SwitchIndicatorsPage.xaml
+++ b/8.0/Fundamentals/DataBindingDemos/DataBindingDemos/Views/SwitchIndicatorsPage.xaml
@@ -15,9 +15,8 @@
         </Style>
     </ContentPage.Resources>
 
-    <StackLayout Padding="10, 0">
-        <StackLayout Orientation="Horizontal"
-                     VerticalOptions="Center">
+    <VerticalStackLayout Padding="10, 0">
+        <HorizontalStackLayout VerticalOptions="Center">
             <Label Text="Subscribe?" />
             <Switch x:Name="switch1" />
             <Label>
@@ -32,10 +31,9 @@
                     </Binding>
                 </Label.Text>
             </Label>
-        </StackLayout>
+        </HorizontalStackLayout>
 
-        <StackLayout Orientation="Horizontal"
-                     VerticalOptions="Center">
+        <HorizontalStackLayout VerticalOptions="Center">
             <Label Text="Allow popups?" />
             <Switch x:Name="switch2" />
             <Label>
@@ -60,10 +58,9 @@
                     </Binding>
                 </Label.TextColor>
             </Label>
-        </StackLayout>
+        </HorizontalStackLayout>
 
-        <StackLayout Orientation="Horizontal"
-                     VerticalOptions="Center">
+        <HorizontalStackLayout VerticalOptions="Center">
             <Label Text="Learn more?" />
             <Switch x:Name="switch3" />
             <Label FontSize="18"
@@ -93,6 +90,6 @@
                     </Binding>
                 </Label.Style>
             </Label>
-        </StackLayout>
-    </StackLayout>
+        </HorizontalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/Fundamentals/Shell/Xaminals/AppShell.xaml b/8.0/Fundamentals/Shell/Xaminals/AppShell.xaml
index 4049b8418..9b00ab1e0 100644
--- a/8.0/Fundamentals/Shell/Xaminals/AppShell.xaml
+++ b/8.0/Fundamentals/Shell/Xaminals/AppShell.xaml
@@ -87,7 +87,7 @@
     <!-- Not required, as the FlyoutFooter is set above -->
     <!--<Shell.FlyoutFooterTemplate>
         <DataTemplate>
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="Xaminals"
                        TextColor="GhostWhite"
                        FontAttributes="Bold"
@@ -95,7 +95,7 @@
                 <Label Text="{Binding Source={x:Static sys:DateTime.Now}, StringFormat='{0:MMMM dd, yyyy}'}"
                        TextColor="GhostWhite"
                        HorizontalOptions="Center" />
-            </StackLayout>
+            </VerticalStackLayout>
         </DataTemplate>
     </Shell.FlyoutFooterTemplate>-->
 
diff --git a/8.0/Fundamentals/Shell/Xaminals/Controls/FlyoutFooter.xaml b/8.0/Fundamentals/Shell/Xaminals/Controls/FlyoutFooter.xaml
index d220af2f8..6b2470eed 100644
--- a/8.0/Fundamentals/Shell/Xaminals/Controls/FlyoutFooter.xaml
+++ b/8.0/Fundamentals/Shell/Xaminals/Controls/FlyoutFooter.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:sys="clr-namespace:System;assembly=netstandard"
              x:Class="Xaminals.Controls.FlyoutFooter">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Xaminals"
                TextColor="GhostWhite"
                FontAttributes="Bold"
@@ -11,5 +11,5 @@
         <Label Text="{Binding Source={x:Static sys:DateTime.Now}, StringFormat='{0:MMMM dd, yyyy}'}"
                TextColor="GhostWhite"
                HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentView>
diff --git a/8.0/Fundamentals/Shell/Xaminals/Views/AboutPage.xaml b/8.0/Fundamentals/Shell/Xaminals/Views/AboutPage.xaml
index e34ed8cff..16896dd71 100644
--- a/8.0/Fundamentals/Shell/Xaminals/Views/AboutPage.xaml
+++ b/8.0/Fundamentals/Shell/Xaminals/Views/AboutPage.xaml
@@ -14,7 +14,7 @@
                    HorizontalOptions="Center"
                    Aspect="AspectFit" />
             <ScrollView Grid.Row="1">
-                <StackLayout Orientation="Vertical" 
+                <VerticalStackLayout Orientation="Vertical" 
                              Padding="16,40,16,40"
                              Spacing="10">
                     <Label FontSize="22">
@@ -56,7 +56,7 @@
                             CommandParameter="https://docs.microsoft.com/dotnet/maui"
                             BackgroundColor="{StaticResource Primary}"
                             TextColor="White" />
-                </StackLayout>
+                </VerticalStackLayout>
             </ScrollView>
         </Grid>
     </ScrollView>
diff --git a/8.0/Fundamentals/Shell/Xaminals/Views/BearDetailPage.xaml b/8.0/Fundamentals/Shell/Xaminals/Views/BearDetailPage.xaml
index 1a5f49b41..4051e21a2 100644
--- a/8.0/Fundamentals/Shell/Xaminals/Views/BearDetailPage.xaml
+++ b/8.0/Fundamentals/Shell/Xaminals/Views/BearDetailPage.xaml
@@ -4,7 +4,7 @@
              x:Class="Xaminals.Views.BearDetailPage"
              Title="Bear Details">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="{Binding Bear.Name}" 
                    HorizontalOptions="Center" 
                    Style="{DynamicResource TitleStyle}" />
@@ -17,6 +17,6 @@
                    HorizontalOptions="Center" />
             <Label Text="{Binding Bear.Details}" 
                    Style="{DynamicResource BodyStyle}" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/Fundamentals/Shell/Xaminals/Views/CatDetailPage.xaml b/8.0/Fundamentals/Shell/Xaminals/Views/CatDetailPage.xaml
index 6cadf5816..2463b8e21 100644
--- a/8.0/Fundamentals/Shell/Xaminals/Views/CatDetailPage.xaml
+++ b/8.0/Fundamentals/Shell/Xaminals/Views/CatDetailPage.xaml
@@ -4,7 +4,7 @@
              x:Class="Xaminals.Views.CatDetailPage"
              Title="Cat Details">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="{Binding Name}" 
                    HorizontalOptions="Center" 
                    Style="{DynamicResource TitleStyle}" />
@@ -17,6 +17,6 @@
                    HorizontalOptions="Center" />
             <Label Text="{Binding Details}" 
                    Style="{DynamicResource BodyStyle}" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/Fundamentals/Shell/Xaminals/Views/DogDetailPage.xaml b/8.0/Fundamentals/Shell/Xaminals/Views/DogDetailPage.xaml
index 46d1b3a9d..fbf723461 100644
--- a/8.0/Fundamentals/Shell/Xaminals/Views/DogDetailPage.xaml
+++ b/8.0/Fundamentals/Shell/Xaminals/Views/DogDetailPage.xaml
@@ -4,7 +4,7 @@
              x:Class="Xaminals.Views.DogDetailPage"
              Title="Dog Details">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="{Binding Name}" 
                    HorizontalOptions="Center" 
                    Style="{DynamicResource TitleStyle}" />
@@ -17,6 +17,6 @@
                    HorizontalOptions="Center" />
             <Label Text="{Binding Details}" 
                    Style="{DynamicResource BodyStyle}" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/Fundamentals/Shell/Xaminals/Views/ElephantDetailPage.xaml b/8.0/Fundamentals/Shell/Xaminals/Views/ElephantDetailPage.xaml
index 43c892f94..2ba6fd727 100644
--- a/8.0/Fundamentals/Shell/Xaminals/Views/ElephantDetailPage.xaml
+++ b/8.0/Fundamentals/Shell/Xaminals/Views/ElephantDetailPage.xaml
@@ -4,7 +4,7 @@
              x:Class="Xaminals.Views.ElephantDetailPage"
              Title="Elephant Details">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="{Binding Elephant.Name}" 
                    HorizontalOptions="Center" 
                    Style="{DynamicResource TitleStyle}" />
@@ -17,6 +17,6 @@
                    HorizontalOptions="Center" />
             <Label Text="{Binding Elephant.Details}" 
                    Style="{DynamicResource BodyStyle}" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/Fundamentals/Shell/Xaminals/Views/MonkeyDetailPage.xaml b/8.0/Fundamentals/Shell/Xaminals/Views/MonkeyDetailPage.xaml
index 3af36abb4..1ea09848b 100644
--- a/8.0/Fundamentals/Shell/Xaminals/Views/MonkeyDetailPage.xaml
+++ b/8.0/Fundamentals/Shell/Xaminals/Views/MonkeyDetailPage.xaml
@@ -12,7 +12,7 @@
     </Shell.BackButtonBehavior>-->
    
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="{Binding Monkey.Name}" 
                    HorizontalOptions="Center" 
                    Style="{DynamicResource TitleStyle}" />
@@ -25,6 +25,6 @@
                    HorizontalOptions="Center" />
             <Label Text="{Binding Monkey.Details}" 
                    Style="{DynamicResource BodyStyle}" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/AdaptiveTriggerDemoPage.xaml b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/AdaptiveTriggerDemoPage.xaml
index 6ac4e44fe..895063691 100644
--- a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/AdaptiveTriggerDemoPage.xaml
+++ b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/AdaptiveTriggerDemoPage.xaml
@@ -32,10 +32,10 @@
         </Style>
     </ContentPage.Resources>
     
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="This page contains four Label objects in a StackLayout." />
         <Label Text="When the window width is >= 800 the StackLayout orientation will change." />
         <Label Text="This is achieved with an AdaptiveTrigger." />
         <Label Text="This page is most easily demonstrated on Windows." />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/CompareStateTriggerDemoPage.xaml b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/CompareStateTriggerDemoPage.xaml
index 880b0531e..12ccea7ac 100644
--- a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/CompareStateTriggerDemoPage.xaml
+++ b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/CompareStateTriggerDemoPage.xaml
@@ -39,12 +39,12 @@
                Margin="24"
                HorizontalOptions="Center"
                VerticalOptions="Center">
-            <StackLayout Orientation="Horizontal">
+            <HorizontalStackLayout>
                 <CheckBox x:Name="checkBox"
                           VerticalOptions="Center" />
                 <Label Text="Check the CheckBox to modify the Grid background color."
                        VerticalOptions="Center" />
-            </StackLayout>
+            </HorizontalStackLayout>
         </Frame>
     </Grid>
 </ContentPage>
diff --git a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/DataTriggerXaml.xaml b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/DataTriggerXaml.xaml
index 0805af76f..2d48bee24 100644
--- a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/DataTriggerXaml.xaml
+++ b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/DataTriggerXaml.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="WorkingWithTriggers.DataTriggerXaml"
              Padding="20, 50, 20, 0">
-    <StackLayout Spacing="20">
+    <VerticalStackLayout Spacing="20">
         <Label FontSize="20"
                Text="DataTrigger Example" />
         <Label Text="Entry requires length>0 before button is enabled"
@@ -26,5 +26,5 @@
                 </DataTrigger>
             </Button.Triggers>
         </Button>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/EnterExitActionXaml.xaml b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/EnterExitActionXaml.xaml
index 57077b283..0a5cb40fb 100644
--- a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/EnterExitActionXaml.xaml
+++ b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/EnterExitActionXaml.xaml
@@ -26,7 +26,7 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
-    <StackLayout Spacing="20">
+    <VerticalStackLayout Spacing="20">
         <Label Text="EnterAction and ExitAction"
                FontSize="20" />
         <Label Text="FadeTriggerAction is triggered by IsFocused"
@@ -51,5 +51,5 @@
                Text="Xamarin" />
         <Entry Placeholder="enter industry"
                Text="" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/EventTriggerXaml.xaml b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/EventTriggerXaml.xaml
index 192ad2c4d..1d68807d6 100644
--- a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/EventTriggerXaml.xaml
+++ b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/EventTriggerXaml.xaml
@@ -4,7 +4,7 @@
              xmlns:local="clr-namespace:WorkingWithTriggers;assembly=WorkingWithTriggers"
              x:Class="WorkingWithTriggers.EventTriggerXaml"
              Padding="20, 50, 20, 0">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label FontSize="20"
                Text="EventTrigger Example" />
         <Label Text="Text must be a valid double or it will turn red." />
@@ -15,5 +15,5 @@
                 </EventTrigger>
             </Entry.Triggers>
         </Entry>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/MultiTriggerXaml.xaml b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/MultiTriggerXaml.xaml
index d4a7ccf6d..2db83719c 100644
--- a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/MultiTriggerXaml.xaml
+++ b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/MultiTriggerXaml.xaml
@@ -11,7 +11,7 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
-    <StackLayout>
+    <VerticalStackLayout>
         <Label FontSize="20"
                Text="MultiTrigger Example" />
         <Label Text="You must provide either an email or phone number (or both):" />
@@ -83,5 +83,5 @@
         </Button>
         <Label FontSize="10"
                Text="Uses a converter on BindingConditions" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/OnClickEventTriggerXaml.xaml b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/OnClickEventTriggerXaml.xaml
index 31da8a230..f0ee23c03 100644
--- a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/OnClickEventTriggerXaml.xaml
+++ b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/OnClickEventTriggerXaml.xaml
@@ -24,12 +24,12 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="EventTrigger in Style"
                FontSize="10" />
         <Button Text=" Do this! "
                 Clicked="OnDoThisClick" />
         <Button Text=" Do that! "
                 Clicked="OnDoThatClick" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/PropertyTriggerXaml.xaml b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/PropertyTriggerXaml.xaml
index 6241782cb..242c0c008 100644
--- a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/PropertyTriggerXaml.xaml
+++ b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/PropertyTriggerXaml.xaml
@@ -15,7 +15,7 @@
         </Style>
     </ContentPage.Resources>
 
-    <StackLayout Spacing="20">
+    <VerticalStackLayout Spacing="20">
         <Label Text="Property Trigger" FontSize="20" />
         <Label Text="BackgroundColor property change triggered by IsFocused" FontSize="10" />
         <Entry Placeholder="enter name">
@@ -28,5 +28,5 @@
         </Entry>
         <Entry Placeholder="enter address" />
         <Entry Placeholder="enter city and state" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/StateTriggerDemoPage.xaml b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/StateTriggerDemoPage.xaml
index 54dc55bca..6667a1690 100644
--- a/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/StateTriggerDemoPage.xaml
+++ b/8.0/Fundamentals/TriggersDemos/WorkingWithTriggers/Views/StateTriggerDemoPage.xaml
@@ -44,12 +44,12 @@
                Margin="24"
                HorizontalOptions="Center"
                VerticalOptions="Center">
-            <StackLayout Orientation="Horizontal">
+            <HorizontalStackLayout>
                 <CheckBox IsChecked="{Binding IsToggled, Mode=TwoWay}"
                           VerticalOptions="Center" />
                 <Label Text="Check the CheckBox to modify the Grid background color."
                        VerticalOptions="Center" />
-            </StackLayout>
+            </HorizontalStackLayout>
         </Frame>
     </Grid>
 </ContentPage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/AllSensorsPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/AllSensorsPage.xaml
index 0a07f3c7b..e9ffb44e7 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/AllSensorsPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/AllSensorsPage.xaml
@@ -11,7 +11,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="0,0,0,12"
+            <VerticalStackLayout Padding="0,0,0,12"
                          Spacing="6">
 
                 <Label Text="Accelerometer"
@@ -274,7 +274,7 @@
                                 IsEnabled="{Binding IsActive}" />
                     </Grid>
                 </Grid>
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/AppInfoPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/AppInfoPage.xaml
index d672d2a1f..78e0b30b4 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/AppInfoPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/AppInfoPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="App Info:"
                        FontAttributes="Bold"
@@ -33,7 +33,7 @@
 
                 <Button Text="Open Settings"
                         Command="{Binding ShowSettingsUICommand}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/BatteryPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/BatteryPage.xaml
index c25a94ea0..489b05089 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/BatteryPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/BatteryPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="Battery State:"
                        FontAttributes="Bold"
@@ -24,7 +24,7 @@
                 <Label Text="{Binding State, StringFormat='State: {0}'}" />
                 <Label Text="{Binding PowerSource, StringFormat='Power Source: {0}'}" />
                 <Label Text="{Binding EnergySaverStatus, StringFormat='Energy Saver: {0}'}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/BrowserPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/BrowserPage.xaml
index 6fe5b42e2..de15bfd93 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/BrowserPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/BrowserPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
 
                 <Label Text="URI:"
@@ -88,7 +88,7 @@
 
                 <Label Text="{Binding BrowserStatus}" />
 
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ClipboardPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ClipboardPage.xaml
index e184ff774..f89f39628 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ClipboardPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ClipboardPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="Enter some text:" />
                 <Entry Placeholder="Enter text..."
@@ -27,7 +27,7 @@
                 <Button Text="Check Status"
                         Command="{Binding CheckCommand}" />
                 <Label Text="{Binding LastCopied}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ConnectivityPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ConnectivityPage.xaml
index 4017158ce..dca202fc0 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ConnectivityPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ConnectivityPage.xaml
@@ -15,13 +15,13 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,6,12,12"
+            <VerticalStackLayout Padding="12,6,12,12"
                          Spacing="6">
                 <Label Text="Connectivity State:"
                        FontAttributes="Bold" />
                 <Label Text="{Binding NetworkAccess, StringFormat='NetworkAccess: {0}'}" />
                 <Label Text="{Binding ConnectionProfiles, StringFormat='ConnectionProfiles: {0}'}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ContactDetailsPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ContactDetailsPage.xaml
index 90d1701ef..39db9c3af 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ContactDetailsPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ContactDetailsPage.xaml
@@ -9,7 +9,7 @@
                FontAttributes="Bold"
                Margin="12" />
 
-        <StackLayout Padding="12,0,12,12"
+        <VerticalStackLayout Padding="12,0,12,12"
                      Spacing="6"
                      Grid.Row="1">
 
@@ -39,7 +39,7 @@
 
             <Label FontAttributes="Bold"
                    Text="Numbers:" />
-            <StackLayout BindableLayout.ItemsSource="{Binding Contact.Phones}">
+            <VerticalStackLayout BindableLayout.ItemsSource="{Binding Contact.Phones}">
                 <BindableLayout.ItemTemplate>
                     <DataTemplate>
                         <Label>
@@ -51,11 +51,11 @@
                         </Label>
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
+            </VerticalStackLayout>
 
             <Label FontAttributes="Bold"
                    Text="Emails:" />
-            <StackLayout BindableLayout.ItemsSource="{Binding Contact.Emails}">
+            <VerticalStackLayout BindableLayout.ItemsSource="{Binding Contact.Emails}">
                 <BindableLayout.ItemTemplate>
                     <DataTemplate>
                         <Label>
@@ -67,8 +67,8 @@
                         </Label>
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
+            </VerticalStackLayout>
 
-        </StackLayout>
+        </VerticalStackLayout>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ContactsPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ContactsPage.xaml
index 5ae880ef8..187fed06d 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ContactsPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ContactsPage.xaml
@@ -14,14 +14,14 @@
                FontAttributes="Bold"
                Margin="12" />
 
-        <StackLayout Padding="12,0,12,12"
+        <VerticalStackLayout Padding="12,0,12,12"
                      Spacing="6"
                      Grid.Row="1">
             <Button Command="{Binding GetContactCommand}"
                     Text="Pick Contact" />
             <Button Command="{Binding GetAllContactCommand}"
                     Text="Get All Contacts" />
-        </StackLayout>
+        </VerticalStackLayout>
 
         <ListView ItemsSource="{Binding ContactsList}"
                   SelectedItem="{Binding SelectedContact}"
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/DeviceInfoPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/DeviceInfoPage.xaml
index a109a920f..2192499a5 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/DeviceInfoPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/DeviceInfoPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="Device Info:"
                        FontAttributes="Bold"
@@ -46,7 +46,7 @@
                        FontSize="64"
                        HorizontalOptions="Start"
                        Rotation="{Binding Rotation}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/EmailPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/EmailPage.xaml
index 63d6d8a78..acb35d335 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/EmailPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/EmailPage.xaml
@@ -21,7 +21,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <ActivityIndicator IsVisible="{Binding IsBusy}"
                                    IsRunning="{Binding IsBusy}" />
@@ -45,14 +45,14 @@
                        Margin="0,6,0,0" />
                 <Label Text="Subject:" />
                 <Entry Text="{Binding Subject}" />
-                <StackLayout Orientation="Horizontal">
+                <HorizontalStackLayout>
                     <Label Text="Is Html?"
                            HorizontalTextAlignment="End"
                            HorizontalOptions="FillAndExpand"
                            VerticalOptions="Center" />
                     <Switch IsToggled="{Binding IsHtml}"
                             VerticalOptions="Center" />
-                </StackLayout>
+                </HorizontalStackLayout>
                 <Label Text="Body:" />
                 <Editor Text="{Binding Body}"
                         Keyboard="Chat"
@@ -69,20 +69,20 @@
                         Keyboard="Chat"
                         AutoSize="TextChanges" />
 
-                <StackLayout Orientation="Horizontal">
+                <HorizontalStackLayout>
                     <Label Text="Attach Multiple"
                            HorizontalTextAlignment="End"
                            HorizontalOptions="FillAndExpand"
                            VerticalOptions="Center" />
                     <Switch IsToggled="{Binding HasMultipleAttachements}"
                             VerticalOptions="Center" />
-                </StackLayout>
+                </HorizontalStackLayout>
 
                 <Button Text="Send Email"
                         Command="{Binding SendEmailCommand}"
                         IsEnabled="{Binding IsNotBusy}" />
 
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FilePickerPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FilePickerPage.xaml
index c4e86c462..e8ae5b012 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FilePickerPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FilePickerPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Button Text="Pick file"
                         Command="{Binding PickFileCommand}" />
@@ -37,7 +37,7 @@
                        IsVisible="{Binding IsImageVisible}"
                        HorizontalOptions="FillAndExpand"
                        VerticalOptions="FillAndExpand" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FileSystemPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FileSystemPage.xaml
index 0805b2b14..38fe89d7f 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FileSystemPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FileSystemPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="Paths:"
                        FontAttributes="Bold"
@@ -26,8 +26,7 @@
                 <Label Text="Operations:"
                        FontAttributes="Bold"
                        Margin="0,6,0,0" />
-                <StackLayout Orientation="Horizontal"
-                             Spacing="6">
+                <HorizontalStackLayout Spacing="6">
                     <Button Text="Load"
                             Command="{Binding LoadFileCommand}"
                             HorizontalOptions="FillAndExpand" />
@@ -37,12 +36,12 @@
                     <Button Text="Delete"
                             Command="{Binding DeleteFileCommand}"
                             HorizontalOptions="FillAndExpand" />
-                </StackLayout>
+                </HorizontalStackLayout>
 
                 <Label Text="Edit the contents of the file:" />
                 <Editor Text="{Binding CurrentContents}"
                         AutoSize="TextChanges" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FlashlightPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FlashlightPage.xaml
index 307636c85..868a6a2af 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FlashlightPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/FlashlightPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Button Text="Toggle Flashlight"
                         Command="{Binding ToggleCommand}" />
@@ -29,7 +29,7 @@
                        TextColor="Red"
                        FontAttributes="Italic"
                        IsVisible="{Binding IsSupported, Converter={StaticResource InverterConverter}}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/GeocodingPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/GeocodingPage.xaml
index 5c8d5cd53..b6cc6b305 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/GeocodingPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/GeocodingPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <ActivityIndicator IsVisible="{Binding IsBusy}"
                                    IsRunning="{Binding IsBusy}" />
@@ -44,7 +44,7 @@
                         Command="{Binding GetPositionCommand}"
                         IsEnabled="{Binding IsNotBusy}" />
                 <Label Text="{Binding GeocodePosition}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/GeolocationPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/GeolocationPage.xaml
index a1464136e..ccd2b8816 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/GeolocationPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/GeolocationPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <ActivityIndicator IsVisible="{Binding IsBusy}"
                                    IsRunning="{Binding IsBusy}" />
@@ -44,8 +44,7 @@
                 <Label Text="Foreground listener for Location:"
                        FontAttributes="Bold"
                        Margin="0,6,0,0" />
-                <StackLayout Orientation="Horizontal"
-                             Spacing="6">
+                <HorizontalStackLayout Spacing="6">
                     <Button Text="Start Listening"
                             HorizontalOptions="FillAndExpand"
                             Command="{Binding StartListeningCommand}"
@@ -54,10 +53,10 @@
                             HorizontalOptions="FillAndExpand"
                             Command="{Binding StopListeningCommand}"
                             IsEnabled="{Binding IsListening}" />
-                </StackLayout>
+                </HorizontalStackLayout>
                 <Label Text="{Binding ListeningLocationStatus}" />
                 <Label Text="{Binding ListeningLocation}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/HapticFeedbackPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/HapticFeedbackPage.xaml
index 1fd9aeb67..2ec1f626d 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/HapticFeedbackPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/HapticFeedbackPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Button Text="Click"
                         Command="{Binding ClickCommand}" />
@@ -25,7 +25,7 @@
                        TextColor="Red"
                        FontAttributes="Italic"
                        IsVisible="{Binding IsSupported, Converter={StaticResource InverterConverter}}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/KeepScreenOnPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/KeepScreenOnPage.xaml
index d96a6a892..304b2ff8d 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/KeepScreenOnPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/KeepScreenOnPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
 
                 <Label Text="The screen will never go to sleep!"
@@ -28,7 +28,7 @@
                 <Button Text="Get Some Rest"
                         Command="{Binding RequestReleaseCommand}" />
 
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/LauncherPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/LauncherPage.xaml
index f6da4272d..d0d46cc2a 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/LauncherPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/LauncherPage.xaml
@@ -37,7 +37,7 @@
                         Text="Launch Mail"
                         Command="{Binding LaunchMailCommand}" />
 
-                <StackLayout Grid.Row="3"
+                <VerticalStackLayout Grid.Row="3"
                              Grid.ColumnSpan="2">
                     <Label Text="Open File"
                            FontAttributes="Bold"
@@ -51,7 +51,7 @@
                     <Button Text="Open File"
                             Command="{Binding LaunchFileCommand}"
                             CommandParameter="{Binding Source={RelativeSource Self}}" />
-                </StackLayout>
+                </VerticalStackLayout>
             </Grid>
         </ScrollView>
     </Grid>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/MapsPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/MapsPage.xaml
index de278dbc0..0a1117d47 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/MapsPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/MapsPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="Options:" />
                 <Label Text="Navigation Mode" />
@@ -50,7 +50,7 @@
 
                 <Button Text="Open address"
                         Command="{Binding LaunchPlacemarkCommand}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/MediaPickerPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/MediaPickerPage.xaml
index ff779d509..6764b085c 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/MediaPickerPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/MediaPickerPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Button Text="Pick photo"
                         Command="{Binding PickPhotoCommand}" />
@@ -30,7 +30,7 @@
                        IsVisible="{Binding ShowPhoto}"
                        HeightRequest="300" />
                 <!--<MediaElement VerticalOptions="FillAndExpand" Source="{Binding VideoPath}" IsVisible="{Binding ShowVideo}" />-->
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/PhoneDialerPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/PhoneDialerPage.xaml
index 85fca4c16..691b00fe0 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/PhoneDialerPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/PhoneDialerPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="Phone number:" />
                 <Entry Text="{Binding PhoneNumber}"
@@ -23,7 +23,7 @@
                 <Button Text="Open Phone Dialer"
                         Command="{Binding OpenPhoneDialerCommand}"
                         IsEnabled="{Binding IsEnabled}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/PreferencesPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/PreferencesPage.xaml
index c705d37f1..0623f0a6c 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/PreferencesPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/PreferencesPage.xaml
@@ -15,13 +15,13 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="Enter some text to save:" />
                 <Editor Placeholder="Enter text..."
                         Text="{Binding PreferenceValue}"
                         AutoSize="TextChanges" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SMSPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SMSPage.xaml
index f3ae37ea2..5399d32af 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SMSPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SMSPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="Recipents (optional, separate multiple with ',' or '*'):" />
                 <Entry Text="{Binding Recipient}"
@@ -30,7 +30,7 @@
 
                 <ActivityIndicator IsVisible="{Binding IsBusy}"
                                    IsRunning="{Binding IsBusy}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ScreenshotPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ScreenshotPage.xaml
index b467d9f1a..fe74a4bf0 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ScreenshotPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/ScreenshotPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
 
                 <Button Text="Take Screenshot"
@@ -26,7 +26,7 @@
 
                 <Image Source="{Binding Image}" />
 
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SecureStoragePage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SecureStoragePage.xaml
index 17e4e70e3..154a1b54b 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SecureStoragePage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SecureStoragePage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="Key:" />
                 <Entry Placeholder="Enter key..."
@@ -46,7 +46,7 @@
                 <Button Text="Remove All"
                         Command="{Binding RemoveAllCommand}"
                         IsEnabled="{Binding IsNotBusy}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SemanticScreenReaderPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SemanticScreenReaderPage.xaml
index 11a5b4c66..37ce0af16 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SemanticScreenReaderPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SemanticScreenReaderPage.xaml
@@ -10,7 +10,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="We hope the SemanticScreenReader APIs will further enable you to improve the accessibility of your apps"
                        TextColor="RoyalBlue"
@@ -25,7 +25,7 @@
                 <Button Text="Activate to hear announcement text"
                         HorizontalOptions="Center"
                         Clicked="Announce_Clicked" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SharePage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SharePage.xaml
index e7dba05cb..834af8059 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SharePage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/SharePage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
 
                 <Label Text="Share Text"
@@ -28,28 +28,28 @@
                 <Label Text="Subject (Optional)" />
                 <Entry Text="{Binding Subject}" />
 
-                <StackLayout Orientation="Horizontal">
+                <HorizontalStackLayout>
                     <Label Text="Text"
                            HorizontalOptions="StartAndExpand"
                            VerticalOptions="End" />
                     <Switch HorizontalOptions="End"
                             IsToggled="{Binding ShareText}"
                             VerticalOptions="End" />
-                </StackLayout>
+                </HorizontalStackLayout>
 
                 <Editor Text="{Binding Text}"
                         Placeholder="Enter text to share here."
                         Keyboard="Chat"
                         AutoSize="TextChanges" />
 
-                <StackLayout Orientation="Horizontal">
+                <HorizontalStackLayout>
                     <Label Text="URI"
                            HorizontalOptions="StartAndExpand"
                            VerticalOptions="End" />
                     <Switch HorizontalOptions="End"
                             IsToggled="{Binding ShareUri}"
                             VerticalOptions="End" />
-                </StackLayout>
+                </HorizontalStackLayout>
 
                 <Entry Text="{Binding Uri}"
                        Placeholder="Enter URI to share here." />
@@ -112,7 +112,7 @@
                         Command="{Binding RequestFilesCommand}"
                         CommandParameter="{Binding Source={RelativeSource Self}}" />
 
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/TextToSpeechPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/TextToSpeechPage.xaml
index ea408a21c..04e7d3bee 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/TextToSpeechPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/TextToSpeechPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Label Text="Text :" />
                 <Editor Text="{Binding Text}"
@@ -68,7 +68,7 @@
 
                 <ActivityIndicator IsVisible="{Binding IsBusy}"
                                    IsRunning="{Binding IsBusy}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/UnitConvertersPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/UnitConvertersPage.xaml
index 5607a19bb..403a857bb 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/UnitConvertersPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/UnitConvertersPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
 
                 <Label Text="Temperature" />
@@ -54,7 +54,7 @@
                            HorizontalOptions="Center" />
                 </Grid>
 
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/VibrationPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/VibrationPage.xaml
index 81d70b687..931011a17 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/VibrationPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/VibrationPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
                 <Slider Minimum="0"
                         Maximum="5000"
@@ -28,7 +28,7 @@
                        TextColor="Red"
                        FontAttributes="Italic"
                        IsVisible="{Binding IsSupported, Converter={StaticResource InverterConverter}}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/WebAuthenticatorPage.xaml b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/WebAuthenticatorPage.xaml
index 9e4e58c85..ea8b571be 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/WebAuthenticatorPage.xaml
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Views/WebAuthenticatorPage.xaml
@@ -15,7 +15,7 @@
                Margin="12" />
 
         <ScrollView Grid.Row="1">
-            <StackLayout Padding="12,0,12,12"
+            <VerticalStackLayout Padding="12,0,12,12"
                          Spacing="6">
 
                 <Button Text="Microsoft"
@@ -42,7 +42,7 @@
                        TextColor="Red"
                        FontAttributes="Italic" />
 
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 </views:BasePage>
diff --git a/8.0/SkiaSharp/PhotoPuzzle/PhotoPuzzle/Pages/PhotoPuzzlePage.xaml b/8.0/SkiaSharp/PhotoPuzzle/PhotoPuzzle/Pages/PhotoPuzzlePage.xaml
index 6539602f5..4d9f7d7a1 100644
--- a/8.0/SkiaSharp/PhotoPuzzle/PhotoPuzzle/Pages/PhotoPuzzlePage.xaml
+++ b/8.0/SkiaSharp/PhotoPuzzle/PhotoPuzzle/Pages/PhotoPuzzlePage.xaml
@@ -4,7 +4,7 @@
              x:Class="PhotoPuzzle.PhotoPuzzlePage"
              Title="Photo Puzzle">
     <ContentView SizeChanged="OnContentViewSizeChanged">
-        <StackLayout x:Name="stackLayout">
+        <VerticalStackLayout x:Name="stackLayout">
             <Button Margin="0,20,0,20"
                     Text="Randomize"
                     Clicked="OnRandomizeButtonClicked"
@@ -12,6 +12,6 @@
                     VerticalOptions="Center" />
             <AbsoluteLayout x:Name="absoluteLayout"
                             BackgroundColor="Black" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ContentView>
 </ContentPage>
diff --git a/8.0/Tutorials/ConvertToMvvm/code/Views/AllNotesPage.xaml b/8.0/Tutorials/ConvertToMvvm/code/Views/AllNotesPage.xaml
index 06aeccc0d..9e40a5141 100644
--- a/8.0/Tutorials/ConvertToMvvm/code/Views/AllNotesPage.xaml
+++ b/8.0/Tutorials/ConvertToMvvm/code/Views/AllNotesPage.xaml
@@ -28,10 +28,10 @@
         <!-- Define the appearance of each item in the list -->
         <CollectionView.ItemTemplate>
             <DataTemplate>
-                <StackLayout>
+                <VerticalStackLayout>
                     <Label Text="{Binding Text}" FontSize="22"/>
                     <Label Text="{Binding Date}" FontSize="14" TextColor="Silver"/>
-                </StackLayout>
+                </VerticalStackLayout>
             </DataTemplate>
         </CollectionView.ItemTemplate>
     </CollectionView>
diff --git a/8.0/Tutorials/CreateNetMauiApp/code/Views/AllNotesPage.xaml b/8.0/Tutorials/CreateNetMauiApp/code/Views/AllNotesPage.xaml
index faab926c9..49e914271 100644
--- a/8.0/Tutorials/CreateNetMauiApp/code/Views/AllNotesPage.xaml
+++ b/8.0/Tutorials/CreateNetMauiApp/code/Views/AllNotesPage.xaml
@@ -23,10 +23,10 @@
         <!-- Define the appearance of each item in the list -->
         <CollectionView.ItemTemplate>
             <DataTemplate>
-                <StackLayout>
+                <VerticalStackLayout>
                     <Label Text="{Binding Text}" FontSize="22"/>
                     <Label Text="{Binding Date}" FontSize="14" TextColor="Silver"/>
-                </StackLayout>
+                </VerticalStackLayout>
             </DataTemplate>
         </CollectionView.ItemTemplate>
     </CollectionView>
diff --git a/8.0/UserInterface/BrushesDemos/BrushesDemos/Controls/GradientColorPicker.xaml b/8.0/UserInterface/BrushesDemos/BrushesDemos/Controls/GradientColorPicker.xaml
index 7d68ac1a2..46db980f7 100644
--- a/8.0/UserInterface/BrushesDemos/BrushesDemos/Controls/GradientColorPicker.xaml
+++ b/8.0/UserInterface/BrushesDemos/BrushesDemos/Controls/GradientColorPicker.xaml
@@ -15,7 +15,7 @@
                BackgroundColor="White"
                HorizontalOptions="Center"
                VerticalOptions="Center">
-            <StackLayout Spacing="10">
+            <VerticalStackLayout Spacing="10">
                 <ScrollView>
                     <FlexLayout x:Name="colorsLayout"
                                 Direction="Row"
@@ -45,7 +45,7 @@
                         </BindableLayout.ItemTemplate>
                     </FlexLayout>
                 </ScrollView>
-                <StackLayout Orientation="Horizontal"
+                <HorizontalStackLayout
                              HorizontalOptions="End"
                              Spacing="6">
                     <Button Text="Cancel"
@@ -58,8 +58,8 @@
                             FontAttributes="Bold"
                             TextColor="Purple"
                             Clicked="OnOKButtonClicked" />
-                </StackLayout>
-            </StackLayout>
+                </HorizontalStackLayout>
+            </VerticalStackLayout>
         </Frame>
     </Grid>
 </ContentView>
diff --git a/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/CSSDemoPage.xaml b/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/CSSDemoPage.xaml
index 0699316dc..9e44cd957 100644
--- a/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/CSSDemoPage.xaml
+++ b/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/CSSDemoPage.xaml
@@ -39,7 +39,7 @@
     </ContentPage.Resources>
 
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="linear-gradient(90deg, rgb(255, 0, 0),rgb(255, 153, 51))" />
             <Grid StyleClass="linearGradientStyleWithCss90deg" />
             <Label Text="linear-gradient(180deg, rgb(255, 0, 0),rgb(255, 153, 51))" />
@@ -52,6 +52,6 @@
             <Grid StyleClass="radialGradientStyleWithCssLeft" />
             <Label Text="radial-gradient(circle at right, rgb(255, 0, 0) 25%, rgb(0, 255, 0) 50%, rgb(0, 0, 255) 75%)" />
             <Grid StyleClass="radialGradientStyleWithCssRight" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/LinearGradientBrushDemoPage.xaml b/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/LinearGradientBrushDemoPage.xaml
index fb52a6628..3eef407d4 100644
--- a/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/LinearGradientBrushDemoPage.xaml
+++ b/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/LinearGradientBrushDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="BrushesDemos.Views.LinearGradientBrushDemoPage"
              Title="Linear gradient brush demos">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="LinearGradientBrush (Horizontal)"
                    FontAttributes="Bold" />
             <Frame Margin="0,20,0,0"
@@ -62,6 +62,6 @@
                     </LinearGradientBrush>
                 </Frame.Background>
             </Frame>                           
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/RadialGradientBrushDemoPage.xaml b/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/RadialGradientBrushDemoPage.xaml
index 52fe4c136..4a3d032c1 100644
--- a/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/RadialGradientBrushDemoPage.xaml
+++ b/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/RadialGradientBrushDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="BrushesDemos.Views.RadialGradientBrushDemoPage"
              Title="Radial gradient brush demos">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="RadialGradientBrush (Upper left)"
                    FontAttributes="Bold" />
             <Frame Margin="0,20,0,0"
@@ -62,6 +62,6 @@
                     </RadialGradientBrush>
                 </Frame.Background>
             </Frame>                           
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/SolidColorBrushDemoPage.xaml b/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/SolidColorBrushDemoPage.xaml
index fbf43084a..9dc916d24 100644
--- a/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/SolidColorBrushDemoPage.xaml
+++ b/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/SolidColorBrushDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="BrushesDemos.Views.SolidColorBrushDemoPage"
              Title="Solid color brush demos">
     <ScrollView>
-        <StackLayout Margin="20"
+        <VerticalStackLayout Margin="20"
                      Spacing="6">
             <Label Text="SolidColorBrush (Predefined Brush)"
                    FontAttributes="Bold" />
@@ -47,7 +47,7 @@
                     <SolidColorBrush Color="LightSteelBlue" />
                 </Frame.Background>
             </Frame>
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
 
diff --git a/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml b/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml
index eeb971569..4a6f5994a 100644
--- a/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml
+++ b/8.0/UserInterface/BrushesDemos/BrushesDemos/Views/UpdateBrushDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="BrushesDemos.Views.UpdateBrushDemoPage"
              Title="Update Brush demo">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="SolidColorBrush"
                FontAttributes="Bold" />
         <Frame x:Name="solidColorFrame"
@@ -36,5 +36,5 @@
         <Label Margin="0,40,0,0"
                Text="Brushes are updated every second."
                HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/AbsoluteLayoutDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/AbsoluteLayoutDemoPage.xaml
index 4769f9438..989161220 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/AbsoluteLayoutDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/AbsoluteLayoutDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.AbsoluteLayoutDemoPage"
              Title="AbsoluteLayout Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="AbsoluteLayout"
                FontSize="40"
                FontAttributes="Bold"
@@ -23,5 +23,5 @@
                    TextColor="Black"
                    AbsoluteLayout.LayoutFlags="PositionProportional" />
         </AbsoluteLayout>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ActivityIndicatorDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ActivityIndicatorDemoPage.xaml
index fef4cbb3d..a9d8473f9 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ActivityIndicatorDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ActivityIndicatorDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.ActivityIndicatorDemoPage"
              Title="ActivityIndicator">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="ActivityIndicator"
                FontSize="40"
                FontAttributes="Bold"
@@ -11,5 +11,5 @@
 
         <ActivityIndicator IsRunning="True"
                            VerticalOptions="CenterAndExpand" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/BoxViewDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/BoxViewDemoPage.xaml
index 40e038da7..1caef40de 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/BoxViewDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/BoxViewDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.BoxViewDemoPage"
              Title="BoxView Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="BoxView"
                FontSize="50"
                FontAttributes="Bold"
@@ -14,5 +14,5 @@
                  HeightRequest="150"
                  HorizontalOptions="Center"
                  VerticalOptions="CenterAndExpand" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ButtonDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ButtonDemoPage.xaml
index 796fd6a64..0e2994d00 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ButtonDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ButtonDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.ButtonDemoPage"
              Title="Button Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Button"
                FontSize="50"
                FontAttributes="Bold"
@@ -21,5 +21,5 @@
                FontSize="20"
                HorizontalOptions="Center"
                VerticalOptions="CenterAndExpand" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CarouselViewDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CarouselViewDemoPage.xaml
index fdc01a116..ccbb5f4d6 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CarouselViewDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CarouselViewDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.CarouselViewDemoPage"
              Title="CarouselView Demo">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="CarouselView"
                FontSize="50"
                FontAttributes="Bold"
@@ -11,7 +11,7 @@
         <CarouselView ItemsSource="{Binding Monkeys}">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -19,7 +19,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="CenterAndExpand">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -37,11 +37,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CheckBoxPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CheckBoxPage.xaml
index 43ae5cfbb..c64d92ba7 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CheckBoxPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/CheckBoxPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.CheckBoxPage"
              Title="CheckBox Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="CheckBox"
                FontSize="50"
                FontAttributes="Bold"
@@ -27,5 +27,5 @@
                 </DataTrigger>
             </Label.Triggers>
         </Label>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ContentPageDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ContentPageDemoPage.xaml
index 78533b920..2ad922bf1 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ContentPageDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ContentPageDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ControlGallery.Views.XAML.ContentPageDemoPage"
              Title="ContentPage Demo"
              Padding="10, 0">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="ContentPage"
                FontSize="40"
                FontAttributes="Bold"
@@ -24,5 +24,5 @@ to multiple children."
 in turn contains four Label views (including the
 large one at the top)."
                FontSize="20" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ContentViewDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ContentViewDemoPage.xaml
index 77e4ad075..51df7c768 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ContentViewDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ContentViewDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.ContentViewDemoPage"
              Title="ContentView Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="ContentView"
                FontSize="50"
                FontAttributes="Bold"
@@ -25,5 +25,5 @@ color or giving a little margin to its
 child through its own Padding property."
                    TextColor="Purple" />
         </ContentView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/DatePickerDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/DatePickerDemoPage.xaml
index 3d27e532d..158f57629 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/DatePickerDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/DatePickerDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.DatePickerDemoPage"
              Title="DatePicker Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="DatePicker"
                FontSize="50"
                FontAttributes="Bold"
@@ -13,5 +13,5 @@
                     VerticalOptions="CenterAndExpand"
                     Margin="10, 0" />
 
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EditorDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EditorDemoPage.xaml
index 0efba41db..2b5a6448f 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EditorDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EditorDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.EditorDemoPage"
              Title="Editor">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Editor"
                FontSize="50"
                FontAttributes="Bold"
@@ -11,5 +11,5 @@
 
         <Editor VerticalOptions="FillAndExpand"
                 Margin="10" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EllipseDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EllipseDemoPage.xaml
index e2045adef..2fa5a46bc 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EllipseDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EllipseDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.EllipseDemoPage"
              Title="Ellipse Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Ellipse"
                FontSize="50"
                FontAttributes="Bold"
@@ -17,5 +17,5 @@
                  WidthRequest="150"
                  HeightRequest="150"
                  HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EntryCellDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EntryCellDemoPage.xaml
index 79f9d9f7a..a23f0a448 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EntryCellDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EntryCellDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.EntryCellDemoPage"
              Title="EntryCell Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="EntryCell"
                FontSize="50"
                FontAttributes="Bold"
@@ -18,5 +18,5 @@
                 </TableSection>
             </TableRoot>
         </TableView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EntryDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EntryDemoPage.xaml
index 2ec645818..6e2b4c0e4 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EntryDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/EntryDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ControlGallery.Views.XAML.EntryDemoPage"
              Title="Entry"
              Padding="10, 0">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Entry"
                FontSize="50"
                FontAttributes="Bold"
@@ -22,5 +22,5 @@
         <Entry Keyboard="Telephone"
                Placeholder="Enter phone number"
                VerticalOptions="CenterAndExpand" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FlyoutPageDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FlyoutPageDemoPage.xaml
index 053c4ee62..939883239 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FlyoutPageDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FlyoutPageDemoPage.xaml
@@ -6,7 +6,7 @@
                   Title="FlyoutPage Demo">
     <FlyoutPage.Flyout>
         <ContentPage Title="Color List">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="FlyoutPage"
                        FontSize="30"
                        FontAttributes="Bold"
@@ -36,7 +36,7 @@
                         </x:Array>
                     </ListView.ItemsSource>
                 </ListView>
-            </StackLayout>
+            </VerticalStackLayout>
         </ContentPage>
     </FlyoutPage.Flyout>
 
@@ -53,32 +53,32 @@
                 </ResourceDictionary>
             </ContentPage.Resources>
 
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="{Binding Name}"
                        FontSize="50"
                        HorizontalOptions="Center" />
 
-                <StackLayout HorizontalOptions="Center"
+                <VerticalStackLayout HorizontalOptions="Center"
                              VerticalOptions="CenterAndExpand">
 
                     <Label Text="{Binding Color.R, StringFormat='R = {0:F2}'}" />
                     <Label Text="{Binding Color.G, StringFormat='G = {0:F2}'}" />
                     <Label Text="{Binding Color.B, StringFormat='B = {0:F2}'}" />
-                </StackLayout>
+                </VerticalStackLayout>
 
                 <BoxView Color="{Binding Color}"
                          WidthRequest="100"
                          HeightRequest="100"
                          HorizontalOptions="Center" />
 
-                <StackLayout HorizontalOptions="Center"
+                <VerticalStackLayout HorizontalOptions="Center"
                              VerticalOptions="CenterAndExpand">
 
                     <Label Text="{Binding Color.Hue, StringFormat='Hue = {0:F2}'}" />
                     <Label Text="{Binding Color.Saturation, StringFormat='Saturation = {0:F2}'}" />
                     <Label Text="{Binding Color.Luminosity, StringFormat='Luminosity = {0:F2}'}" />
-                </StackLayout>
-            </StackLayout>
+                </VerticalStackLayout>
+            </VerticalStackLayout>
         </ContentPage>
     </FlyoutPage.Detail>
 </FlyoutPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml
index 340189cd0..dbce502a6 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/FrameDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.FrameDemoPage"
              Title="Frame Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Frame"
                FontSize="50"
                FontAttributes="Bold"
@@ -15,5 +15,5 @@
                VerticalOptions="CenterAndExpand">
             <Label Text="I've been framed!" />
         </Frame>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageButtonDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageButtonDemoPage.xaml
index 0f580e922..1d2e2c177 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageButtonDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageButtonDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.ImageButtonDemoPage"
              Title="ImageButton Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="ImageButton"
                FontSize="50"
                FontAttributes="Bold"
@@ -19,5 +19,5 @@
                FontSize="20"
                HorizontalOptions="Center"
                VerticalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageCellDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageCellDemoPage.xaml
index e26bf5558..2f72c7853 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageCellDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageCellDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ControlGallery.Views.XAML.ImageCellDemoPage"
              Title="ImageCell Demo"
              Padding="10, 0">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="ImageCell"
                FontSize="50"
                FontAttributes="Bold"
@@ -20,5 +20,5 @@
                 </TableSection>
             </TableRoot>
         </TableView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageDemoPage.xaml
index 9e9cb21ae..479c69b64 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ImageDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.ImageDemoPage"
              Title="Image Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Image"
                FontSize="50"
                FontAttributes="Bold"
@@ -12,5 +12,5 @@
         <Image Source="https://aka.ms/campus.jpg"
                HorizontalOptions="Center"
                VerticalOptions="CenterAndExpand" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/IndicatorViewDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/IndicatorViewDemoPage.xaml
index f906705cf..3e64a1587 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/IndicatorViewDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/IndicatorViewDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.IndicatorViewDemoPage"
              Title="IndicatorView Demo">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="IndicatorView"
                FontSize="50"
                FontAttributes="Bold"
@@ -12,7 +12,7 @@
                       IndicatorView="indicatorView">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -20,7 +20,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="CenterAndExpand">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -38,9 +38,9 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
@@ -49,5 +49,5 @@
                        IndicatorColor="LightGray"
                        SelectedIndicatorColor="DarkGray"
                        HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/LabelDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/LabelDemoPage.xaml
index 3c963baf9..e73e5d723 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/LabelDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/LabelDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ControlGallery.Views.XAML.LabelDemoPage"
              Title="Label Demo"
              Padding="10, 0">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Label"
                FontSize="50"
                FontAttributes="Bold"
@@ -19,5 +19,5 @@ Windows."
                FontSize="20"
                VerticalOptions="CenterAndExpand"
                Margin="10, 0" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/LineDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/LineDemoPage.xaml
index 6490a906a..227edf306 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/LineDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/LineDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.LineDemoPage"
              Title="Line Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Line"
                FontSize="50"
                FontAttributes="Bold"
@@ -14,5 +14,5 @@
               Y2="120"
               Stroke="Red"
               HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ListViewDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ListViewDemoPage.xaml
index 17fde3991..d8b82ebb8 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ListViewDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ListViewDemoPage.xaml
@@ -4,7 +4,7 @@
              xmlns:models="clr-namespace:ControlGallery.Models"
              x:Class="ControlGallery.Views.XAML.ListViewDemoPage"
              Title="ListView Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="ListView"
                FontSize="50"
                FontAttributes="Bold"
@@ -45,20 +45,19 @@
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <ViewCell>
-                        <StackLayout Padding="0, 5"
-                                     Orientation="Horizontal" 
+                        <HorizontalStackLayout Padding="0, 5"
                                      Spacing="6">
                             <BoxView Color="{Binding FavoriteColor}"
                                      HeightRequest="60" 
                                      WidthRequest="60" />
-                            <StackLayout VerticalOptions="Center">
+                            <VerticalStackLayout VerticalOptions="Center">
                                 <Label Text="{Binding Name}" />
                                 <Label Text="{Binding Birthday, StringFormat='Born {0:d}'}" />
-                            </StackLayout>
-                        </StackLayout>
+                            </VerticalStackLayout>
+                        </HorizontalStackLayout>
                     </ViewCell>
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/NavigationPageDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/NavigationPageDemoPage.xaml
index a8ca1659c..1e1266e9a 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/NavigationPageDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/NavigationPageDemoPage.xaml
@@ -8,13 +8,13 @@
          function as a NavigationPage because the HomePage
          is launched as an ApplicationPage in App. -->
 
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="NavigationPage"
                FontSize="40"
                FontAttributes="Bold"
                HorizontalOptions="Center" />
 
-        <StackLayout HorizontalOptions="Center">
+        <VerticalStackLayout HorizontalOptions="Center">
 
             <Button Text=" Go to Label Demo Page "
                     FontSize="20"
@@ -39,6 +39,6 @@
                     BorderWidth="1" 
                     StyleId="WebViewDemoPage"
                     Clicked="OnButtonClicked" />
-        </StackLayout>
-    </StackLayout>
+        </VerticalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PathDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PathDemoPage.xaml
index 061a34f55..861c4535c 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PathDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PathDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.PathDemoPage"
              Title="Path Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Path"
                FontSize="50"
                FontAttributes="Bold"
@@ -21,5 +21,5 @@
                     L11.9,14.2 0,14.2 0,3.3Z
                     M32,0
                     L32,14.2 13.9,14.2 13.9,1.8Z" />
-       </StackLayout>
+       </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PickerDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PickerDemoPage.xaml
index 71d599947..da32ce249 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PickerDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PickerDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.PickerDemoPage"
              Title="Picker Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Picker"
                FontSize="50"
                FontAttributes="Bold"
@@ -38,5 +38,5 @@
                  HeightRequest="150"
                  HorizontalOptions="Center"
                  VerticalOptions="CenterAndExpand" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PolygonDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PolygonDemoPage.xaml
index c8671e52a..f4c49e164 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PolygonDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PolygonDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.PolygonDemoPage"
              Title="Polygon Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Polygon"
                FontSize="50"
                FontAttributes="Bold"
@@ -13,6 +13,6 @@
                  Stroke="Red"
                  StrokeThickness="3"
                  HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
 
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PolylineDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PolylineDemoPage.xaml
index 080c33e5f..c50fc29fe 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PolylineDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/PolylineDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.PolylineDemoPage"
              Title="Polyline Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Polyline"
                FontSize="50"
                FontAttributes="Bold"
@@ -11,5 +11,5 @@
         <Polyline Points="0,0 10,30, 15,0 18,60 23,30 35,30 40,0 43,60 48,30 100,30"
                   Stroke="Red"
                   HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ProgressBarDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ProgressBarDemoPage.xaml
index cf2859209..db8abd21d 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ProgressBarDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ProgressBarDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.ProgressBarDemoPage"
              Title="ProgressBar">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="ProgressBar"
                FontSize="50"
                FontAttributes="Bold"
@@ -12,5 +12,5 @@
         <ProgressBar x:Name="progressBar"
                      VerticalOptions="CenterAndExpand"
                      Margin="10, 0" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RadioButtonDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RadioButtonDemoPage.xaml
index b54de5bb1..e9f041e9b 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RadioButtonDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RadioButtonDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.RadioButtonDemoPage"
              Title="RadioButton Demo">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label Text="RadioButton"
                FontSize="50"
                FontAttributes="Bold"
@@ -41,5 +41,5 @@
                      CheckedChanged="OnFruitsRadioButtonCheckedChanged" />
         <Label x:Name="fruitLabel"
                Text="You have chosen:" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RectangleDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RectangleDemoPage.xaml
index b79882647..a4ec0eeb8 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RectangleDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RectangleDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.RectangleDemoPage"
              Title="Rectangle Demo">
-    <StackLayout Spacing="6">
+    <VerticalStackLayout Spacing="6">
         <Label Text="Rectangle"
                FontSize="50"
                FontAttributes="Bold"
@@ -17,5 +17,5 @@
                    WidthRequest="150"
                    HeightRequest="150"
                    HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RefreshViewDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RefreshViewDemoPage.xaml
index 414664183..84c92cb51 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RefreshViewDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/RefreshViewDemoPage.xaml
@@ -21,7 +21,7 @@
             </Grid>
         </DataTemplate>
     </ContentPage.Resources>
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label Text="RefreshView"
                FontSize="50"
                FontAttributes="Bold"
@@ -40,5 +40,5 @@
                             BindableLayout.ItemTemplate="{StaticResource ColorItemTemplate}" />
             </ScrollView>
         </RefreshView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ScrollViewDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ScrollViewDemoPage.xaml
index 051f8c7e5..64368ea2b 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ScrollViewDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/ScrollViewDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.ScrollViewDemoPage"
              Title="ScrollView Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="ScrollView"
                FontSize="50"
                FontAttributes="Bold"
@@ -39,5 +39,5 @@ go running off the bottom of the screen."
 
                 FontSize="20" />
         </ScrollView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SearchBarDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SearchBarDemoPage.xaml
index edadc36e2..e90553a82 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SearchBarDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SearchBarDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ControlGallery.Views.XAML.SearchBarDemoPage"
              Title="SearchBar Demo"
              Padding="10, 0">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="SearchBar"
                FontSize="50"
                FontAttributes="Bold"
@@ -16,5 +16,5 @@
         <ScrollView VerticalOptions="FillAndExpand">
             <Label x:Name="resultsLabel" />
         </ScrollView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SliderDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SliderDemoPage.xaml
index df7a1485a..f9d10805a 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SliderDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SliderDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.SliderDemoPage"
              Title="Slider Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Slider"
                FontSize="50"
                FontAttributes="Bold"
@@ -20,5 +20,5 @@
                FontSize="20"
                HorizontalOptions="Center"
                VerticalOptions="CenterAndExpand" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/StackLayoutDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/StackLayoutDemoPage.xaml
index dff666873..75d8e428e 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/StackLayoutDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/StackLayoutDemoPage.xaml
@@ -3,13 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.StackLayoutDemoPage"
              Title="StackLayout">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="StackLayout"
                FontSize="50"
                FontAttributes="Bold"
                HorizontalOptions="Center" />
 
-        <StackLayout Spacing="0"
+        <VerticalStackLayout Spacing="0"
                      VerticalOptions="FillAndExpand"
                      Margin="10">
             <Label Text="StackLayout"
@@ -41,14 +41,12 @@ to the height of its parent."
                    VerticalOptions="CenterAndExpand"
                    HorizontalOptions="End" />
 
-            <StackLayout Spacing="0"
-                         Orientation="Horizontal">
-
+            <HorizontalStackLayout Spacing="0">
                 <Label Text="Stacking" />
                 <Label Text="can also be"
                        HorizontalOptions="CenterAndExpand" />
                 <Label Text="horizontal." />
-            </StackLayout>
-        </StackLayout>
-    </StackLayout>
+            </HorizontalStackLayout>
+        </VerticalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/StepperDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/StepperDemoPage.xaml
index caac1777c..045e8b1bf 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/StepperDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/StepperDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.StepperDemoPage"
              Title="Stepper Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Stepper"
                FontSize="50"
                FontAttributes="Bold"
@@ -22,5 +22,5 @@
                FontSize="20"
                HorizontalOptions="Center"
                VerticalOptions="CenterAndExpand" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwitchCellDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwitchCellDemoPage.xaml
index 0af9ddfeb..60e11dc09 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwitchCellDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwitchCellDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.SwitchCellDemoPage"
              Title="SwitchCell Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="SwitchCell"
                FontSize="50"
                FontAttributes="Bold"
@@ -17,5 +17,5 @@
                 </TableSection>
             </TableRoot>
         </TableView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwitchDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwitchDemoPage.xaml
index 1a1d7e6a8..b2cbaeeef 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwitchDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/SwitchDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.SwitchDemoPage"
              Title="Switch Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Switch"
                FontSize="50"
                FontAttributes="Bold"
@@ -26,5 +26,5 @@
                 </DataTrigger>
             </Label.Triggers>
         </Label>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TabbedPageDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TabbedPageDemoPage.xaml
index 5c4a851b7..70a3bf1e8 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TabbedPageDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TabbedPageDemoPage.xaml
@@ -26,28 +26,28 @@
                     </ResourceDictionary>
                 </ContentPage.Resources>
 
-                <StackLayout>
-                    <StackLayout HorizontalOptions="Center"
+                <VerticalStackLayout>
+                    <VerticalStackLayout HorizontalOptions="Center"
                                  VerticalOptions="CenterAndExpand">
 
                         <Label Text="{Binding Color.R, StringFormat='R = {0:F2}'}" />
                         <Label Text="{Binding Color.G, StringFormat='G = {0:F2}'}" />
                         <Label Text="{Binding Color.B, StringFormat='B = {0:F2}'}" />
-                    </StackLayout>
+                    </VerticalStackLayout>
 
                     <BoxView Color="{Binding Color}"
                          WidthRequest="100"
                          HeightRequest="100"
                          HorizontalOptions="Center" />
 
-                    <StackLayout HorizontalOptions="Center"
+                    <VerticalStackLayout HorizontalOptions="Center"
                                  VerticalOptions="CenterAndExpand">
 
                         <Label Text="{Binding Color.Hue, StringFormat='Hue = {0:F2}'}" />
                         <Label Text="{Binding Color.Saturation, StringFormat='Saturation = {0:F2}'}" />
                         <Label Text="{Binding Color.Luminosity, StringFormat='Luminosity = {0:F2}'}" />
-                    </StackLayout>
-                </StackLayout>
+                    </VerticalStackLayout>
+                </VerticalStackLayout>
             </ContentPage>
         </DataTemplate>
     </TabbedPage.ItemTemplate>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TableViewFormDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TableViewFormDemoPage.xaml
index d595e0824..79013e625 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TableViewFormDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TableViewFormDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.TableViewFormDemoPage"
              Title="TableView Form Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="TableView for a form"
                FontSize="30"
                FontAttributes="Bold"
@@ -38,5 +38,5 @@
                 </TableSection>
             </TableRoot>
         </TableView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TableViewMenuDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TableViewMenuDemoPage.xaml
index 2c91a5eff..a7a421fd7 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TableViewMenuDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TableViewMenuDemoPage.xaml
@@ -4,7 +4,7 @@
              xmlns:views="clr-namespace:ControlGallery.Views.XAML"
              x:Class="ControlGallery.Views.XAML.TableViewMenuDemoPage"
              Title="TableView for a menu Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="TableView Menu"
                FontSize="30"
                FontAttributes="Bold"
@@ -36,5 +36,5 @@
                 </TableSection>
             </TableRoot>
         </TableView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TextCellDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TextCellDemoPage.xaml
index b1e4b31d5..d47fa8daa 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TextCellDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TextCellDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.TextCellDemoPage"
              Title="TextCell Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="TextCell"
                FontSize="50"
                FontAttributes="Bold"
@@ -18,5 +18,5 @@
                 </TableSection>
             </TableRoot>
         </TableView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TimePickerDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TimePickerDemoPage.xaml
index 2e8fd9530..75e9bad13 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TimePickerDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/TimePickerDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.TimePickerDemoPage"
              Title="TimePicker Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="TimePicker"
                FontSize="50"
                FontAttributes="Bold"
@@ -13,5 +13,5 @@
                     VerticalOptions="CenterAndExpand"
                     Margin="10, 0" />
 
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/WebViewDemoPage.xaml b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/WebViewDemoPage.xaml
index 3ba32b553..a7148279f 100644
--- a/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/WebViewDemoPage.xaml
+++ b/8.0/UserInterface/ControlGallery/ControlGallery/Views/XAML/WebViewDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ControlGallery.Views.XAML.WebViewDemoPage"
              Title="WebView Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="WebView"
                FontSize="50"
                FontAttributes="Bold"
@@ -11,5 +11,5 @@
 
         <WebView Source="https://www.microsoft.com"
                  VerticalOptions="FillAndExpand" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/HyperlinkDemo/HyperlinkDemo/MainPage.xaml b/8.0/UserInterface/HyperlinkDemo/HyperlinkDemo/MainPage.xaml
index a0ebf3040..4e996aeab 100644
--- a/8.0/UserInterface/HyperlinkDemo/HyperlinkDemo/MainPage.xaml
+++ b/8.0/UserInterface/HyperlinkDemo/HyperlinkDemo/MainPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:HyperlinkDemo"
              x:Class="HyperlinkDemo.MainPage">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="Hyperlink Demos"
                HorizontalOptions="Center"
                FontAttributes="Bold" />
@@ -48,6 +48,6 @@
                 </FormattedString>
             </Label.FormattedText>
         </Label>
-    </StackLayout>
+    </VerticalStackLayout>
 
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/AbsoluteLayoutDemos/AbsoluteLayoutDemos/Views/XAML/SimpleOverlayDemoPage.xaml b/8.0/UserInterface/Layouts/AbsoluteLayoutDemos/AbsoluteLayoutDemos/Views/XAML/SimpleOverlayDemoPage.xaml
index c6eee9f0b..90f29c1d8 100644
--- a/8.0/UserInterface/Layouts/AbsoluteLayoutDemos/AbsoluteLayoutDemos/Views/XAML/SimpleOverlayDemoPage.xaml
+++ b/8.0/UserInterface/Layouts/AbsoluteLayoutDemos/AbsoluteLayoutDemos/Views/XAML/SimpleOverlayDemoPage.xaml
@@ -4,13 +4,13 @@
              x:Class="AbsoluteLayoutDemos.Views.XAML.SimpleOverlayDemoPage"
              Title="Simple overlay demo">
     <AbsoluteLayout>
-        <StackLayout Margin="20"
+        <VerticalStackLayout Margin="20"
                      AbsoluteLayout.LayoutBounds="0,0,1,1"
                      AbsoluteLayout.LayoutFlags="All">
             <Label Text="This might be a page of UI objects except that the only functional UI object on the page is a Button." />
             <Button Text="Simulate 5-second work item"
                     Clicked="OnButtonClicked" />
-        </StackLayout>
+        </VerticalStackLayout>
 
         <!-- Overlay -->
         <ContentView x:Name="overlay"
diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewLoadSimulationPage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewLoadSimulationPage.xaml
index b58138d25..d81aba965 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewLoadSimulationPage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewLoadSimulationPage.xaml
@@ -64,7 +64,7 @@
                                             MAUITemplate="{StaticResource mauiTemplate}" />        
     </ContentPage.Resources>
     
-    <StackLayout> 
+    <VerticalStackLayout> 
         <AbsoluteLayout BackgroundColor="#909090"
                         HeightRequest="60">
             <Button Text="Cancel" 
@@ -89,14 +89,13 @@
                HorizontalTextAlignment="Center" 
                Text="PROFILE" />
         
-        <StackLayout Margin="20">
-            <StackLayout Spacing="20" 
-                         Orientation="Horizontal">
+        <VerticalStackLayout Margin="20">
+            <HorizontalStackLayout Spacing="20" >
                 <Image Source="david.jpg"
                        Aspect="AspectFill" 
                        WidthRequest="104" 
                        HeightRequest="104" />
-                <StackLayout Spacing="5" 
+                <VerticalStackLayout Spacing="5" 
                              Margin="0,10,0,0">
                     <Label Text="{Binding UserWithoutAchievements.Username}" 
                            TextColor="#303030" 
@@ -106,14 +105,13 @@
                            VerticalTextAlignment="Center" />
                     <Label Text="{Binding UserWithoutAchievements.Email}"
                            Style="{StaticResource labelHeading}" />
-                </StackLayout>
-            </StackLayout>
+                </VerticalStackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Top Followers"
                    Margin="0,20,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
-                         Orientation="Horizontal"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
                          Margin="13,10,0,0">
                 <BindableLayout.ItemTemplate>
                     <DataTemplate>
@@ -124,12 +122,12 @@
                                Margin="10,0,0,0" />
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Favorite Tech"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout Orientation="Horizontal"
+            <HorizontalStackLayout
                          BindableLayout.ItemsSource="{Binding UserWithoutAchievements.FavoriteTech}"
                          BindableLayout.ItemTemplateSelector="{StaticResource TechItemTemplateSelector}"
                          Margin="0,10,0,0" />
@@ -142,9 +140,8 @@
             <Label Text="Achievements"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.ObservableAchievements}"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.ObservableAchievements}"
                          BindableLayout.EmptyView="No achievements"
-                         Orientation="Horizontal"
                          Margin="0,10,0,0"
                          Spacing="20">
                 <BindableLayout.ItemTemplate>
@@ -158,7 +155,7 @@
                         </Image>
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
-        </StackLayout>
-    </StackLayout>
+            </HorizontalStackLayout>
+        </HorizontalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewNullPage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewNullPage.xaml
index 5bd39eea6..389c98cfc 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewNullPage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewNullPage.xaml
@@ -64,7 +64,7 @@
                                             MAUITemplate="{StaticResource mauiTemplate}" />        
     </ContentPage.Resources>
     
-    <StackLayout> 
+    <VerticalStackLayout> 
         <AbsoluteLayout BackgroundColor="#909090"
                         HeightRequest="60">
             <Button Text="Cancel" 
@@ -89,14 +89,13 @@
                HorizontalTextAlignment="Center" 
                Text="PROFILE" />
         
-        <StackLayout Margin="20">
-            <StackLayout Spacing="20" 
-                         Orientation="Horizontal">
+        <VerticalStackLayout Margin="20">
+            <HorizontalStackLayout Spacing="20">
                 <Image Source="david.jpg"
                        Aspect="AspectFill" 
                        WidthRequest="104" 
                        HeightRequest="104" />
-                <StackLayout Spacing="5" 
+                <VerticalStackLayout Spacing="5" 
                              Margin="0,10,0,0">
                     <Label Text="{Binding UserWithoutAchievements.Username}" 
                            TextColor="#303030" 
@@ -106,14 +105,13 @@
                            VerticalTextAlignment="Center" />
                     <Label Text="{Binding UserWithoutAchievements.Email}"
                            Style="{StaticResource labelHeading}" />
-                </StackLayout>
-            </StackLayout>
+                </VerticalStackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Top Followers"
                    Margin="0,20,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
-                         Orientation="Horizontal"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
                          Margin="13,10,0,0">
                 <BindableLayout.ItemTemplate>
                     <DataTemplate>
@@ -124,12 +122,12 @@
                                Margin="10,0,0,0" />
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Favorite Tech"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout Orientation="Horizontal"
+            <HorizontalStackLayout
                          BindableLayout.ItemsSource="{Binding UserWithoutAchievements.FavoriteTech}"
                          BindableLayout.ItemTemplateSelector="{StaticResource TechItemTemplateSelector}"
                          Margin="0,10,0,0" />
@@ -142,9 +140,8 @@
             <Label Text="Achievements"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.Achievements}"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.Achievements}"
                          BindableLayout.EmptyView="No achievements"
-                         Orientation="Horizontal"
                          Margin="0,10,0,0"
                          Spacing="20">
                 <BindableLayout.ItemTemplate>
@@ -158,7 +155,7 @@
                         </Image>
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
-        </StackLayout>
-    </StackLayout>
+            </HorizontalStackLayout>
+        </HorizontalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewSwapPage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewSwapPage.xaml
index f149ba618..fc946a186 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewSwapPage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewSwapPage.xaml
@@ -64,25 +64,25 @@
                                             MAUITemplate="{StaticResource mauiTemplate}" />
 
         <ContentView x:Key="BasicEmptyView">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="No achievements."
                        FontSize="{StaticResource smallTextSize}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ContentView>
         <ContentView x:Key="AdvancedEmptyView">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="None."
                         FontAttributes="Italic"
                         FontSize="{StaticResource smallTextSize}" />
                 <Label Text="Try harder and return later?"
                         FontAttributes="Italic"
                         FontSize="{StaticResource smallTextSize}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ContentView>
 
     </ContentPage.Resources>
     
-    <StackLayout> 
+    <VerticalStackLayout> 
         <AbsoluteLayout BackgroundColor="#909090"
                         HeightRequest="60">
             <Button Text="Cancel" 
@@ -107,14 +107,13 @@
                HorizontalTextAlignment="Center" 
                Text="PROFILE" />
         
-        <StackLayout Margin="20">
-            <StackLayout Spacing="20" 
-                         Orientation="Horizontal">
+        <VerticalStackLayout Margin="20">
+            <HorizontalStackLayout Spacing="20">
                 <Image Source="david.jpg" 
                        Aspect="AspectFill" 
                        WidthRequest="104" 
                        HeightRequest="104" />
-                <StackLayout Spacing="5" 
+                <VerticalStackLayout Spacing="5" 
                              Margin="0,10,0,0">
                     <Label Text="{Binding UserWithoutAchievements.Username}" 
                            TextColor="#303030" 
@@ -124,14 +123,13 @@
                            VerticalTextAlignment="Center" />
                     <Label Text="{Binding UserWithoutAchievements.Email}"
                            Style="{StaticResource labelHeading}" />
-                </StackLayout>
-            </StackLayout>
+                </VerticalStackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Top Followers"
                    Margin="0,20,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
-                         Orientation="Horizontal"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
                          Margin="13,10,0,0">
                 <BindableLayout.ItemTemplate>
                     <DataTemplate>
@@ -142,12 +140,12 @@
                                Margin="10,0,0,0" />
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Favorite Tech"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout Orientation="Horizontal"
+            <HorizontalStackLayout
                          BindableLayout.ItemsSource="{Binding UserWithoutAchievements.FavoriteTech}"
                          BindableLayout.ItemTemplateSelector="{StaticResource TechItemTemplateSelector}"
                          Margin="0,10,0,0" />
@@ -157,7 +155,7 @@
                         JustifyContent="Start"
                         Margin="0,10,0,0" />-->
 
-            <StackLayout Orientation="Horizontal">
+            <HorizontalStackLayout>
                 <Label Text="Achievements"
                        Margin="0,10,0,0"
                        Style="{StaticResource labelHeading}"
@@ -165,10 +163,9 @@
                 <Switch Toggled="OnEmptyViewSwitchToggled"
                         HorizontalOptions="End"                        
                         VerticalOptions="End" />
-            </StackLayout>
-            <StackLayout x:Name="achievementsStackLayout"
+            </HorizontalStackLayout>
+            <HorizontalStackLayout x:Name="achievementsStackLayout"
                          BindableLayout.ItemsSource="{Binding UserWithoutAchievements.Achievements}"
-                         Orientation="Horizontal"
                          Margin="0,10,0,0"
                          Spacing="20">
                 <BindableLayout.ItemTemplate>
@@ -182,8 +179,8 @@
                         </Image>
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
+            </HorizontalStackLayout>
 
-        </StackLayout>
-    </StackLayout>
+        </VerticalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplatePage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplatePage.xaml
index 34d340fdc..58c96b9ba 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplatePage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplatePage.xaml
@@ -64,7 +64,7 @@
                                             MAUITemplate="{StaticResource mauiTemplate}" />        
     </ContentPage.Resources>
     
-    <StackLayout> 
+    <VerticalStackLayout> 
         <AbsoluteLayout BackgroundColor="#909090"
                         HeightRequest="60">
             <Button Text="Cancel" 
@@ -89,14 +89,13 @@
                HorizontalTextAlignment="Center" 
                Text="PROFILE" />
         
-        <StackLayout Margin="20">
-            <StackLayout Spacing="20" 
-                         Orientation="Horizontal">
+        <VerticalStackLayout Margin="20">
+            <HorizontalStackLayout Spacing="20">
                 <Image Source="david.jpg"
                        Aspect="AspectFill" 
                        WidthRequest="104" 
                        HeightRequest="104" />
-                <StackLayout Spacing="5" 
+                <VerticalStackLayout Spacing="5" 
                              Margin="0,10,0,0">
                     <Label x:Name="usernameLabel"
                            Text="{Binding UserWithoutAchievements.Username}" 
@@ -107,14 +106,13 @@
                            VerticalTextAlignment="Center" />
                     <Label Text="{Binding UserWithoutAchievements.Email}"
                            Style="{StaticResource labelHeading}" />
-                </StackLayout>
-            </StackLayout>
+                </VerticalStackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Top Followers"
                    Margin="0,20,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
-                         Orientation="Horizontal"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
                          Margin="13,10,0,0">
                 <BindableLayout.ItemTemplate>
                     <DataTemplate>
@@ -125,12 +123,12 @@
                                Margin="10,0,0,0" />
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Favorite Tech"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout Orientation="Horizontal"
+            <HorizontalStackLayout
                          BindableLayout.ItemsSource="{Binding UserWithoutAchievements.FavoriteTech}"
                          BindableLayout.ItemTemplateSelector="{StaticResource TechItemTemplateSelector}"
                          Margin="0,10,0,0" />
@@ -143,8 +141,7 @@
             <Label Text="Achievements"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.Achievements}"
-                         Orientation="Horizontal"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.Achievements}"
                          Margin="0,10,0,0"
                          Spacing="20">
                 <BindableLayout.ItemTemplate>
@@ -163,7 +160,7 @@
                         <Label Text="{Binding Source={x:Reference usernameLabel}, Path=Text, StringFormat='{0} has no achievements.'}" />
                     </DataTemplate>
                 </BindableLayout.EmptyViewTemplate>
-            </StackLayout>
-        </StackLayout>
-    </StackLayout>
+            </HorizontalStackLayout>
+        </HorizontalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplateSelectorPage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplateSelectorPage.xaml
index 34f7683d8..fa5074cf4 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplateSelectorPage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplateSelectorPage.xaml
@@ -64,21 +64,21 @@
                                             MAUITemplate="{StaticResource mauiTemplate}" />
 
         <DataTemplate x:Key="BasicTemplate">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="No achievements."
                        FontSize="{StaticResource smallTextSize}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </DataTemplate>
 
         <DataTemplate x:Key="AdvancedTemplate">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="None."
                         FontAttributes="Italic"
                         FontSize="{StaticResource smallTextSize}" />
                 <Label Text="Try harder and return later?"
                         FontAttributes="Italic"
                         FontSize="{StaticResource smallTextSize}" />
-            </StackLayout>
+            </VerticalStackLayout>
         </DataTemplate>
 
         <templates:AchievementsDataTemplateSelector x:Key="AchievementsTemplateSelector"
@@ -86,7 +86,7 @@
                                                     OtherTemplate="{StaticResource AdvancedTemplate}" />
     </ContentPage.Resources>
     
-    <StackLayout> 
+    <VerticalStackLayout> 
         <AbsoluteLayout BackgroundColor="#909090"
                         HeightRequest="60">
             <Button Text="Cancel" 
@@ -111,14 +111,13 @@
                HorizontalTextAlignment="Center" 
                Text="PROFILE" />
         
-        <StackLayout Margin="20">
-            <StackLayout Spacing="20" 
-                         Orientation="Horizontal">
+        <VerticalStackLayout Margin="20">
+            <HorizontalStackLayout Spacing="20">
                 <Image Source="david.jpg"
                        Aspect="AspectFill" 
                        WidthRequest="104"
                        HeightRequest="104" />
-                <StackLayout Spacing="5" 
+                <VerticalStackLayout Spacing="5" 
                              Margin="0,10,0,0">
                     <Label Text="{Binding UserWithoutAchievements.Username}" 
                            TextColor="#303030" 
@@ -128,14 +127,13 @@
                            VerticalTextAlignment="Center" />
                     <Label Text="{Binding UserWithoutAchievements.Email}"
                            Style="{StaticResource labelHeading}" />
-                </StackLayout>
-            </StackLayout>
+                </VerticalStackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Top Followers"
                    Margin="0,20,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
-                         Orientation="Horizontal"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
                          Margin="13,10,0,0">
                 <BindableLayout.ItemTemplate>
                     <DataTemplate>
@@ -146,12 +144,12 @@
                                Margin="10,0,0,0" />
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Favorite Tech"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout Orientation="Horizontal"
+            <HorizontalStackLayout
                          BindableLayout.ItemsSource="{Binding UserWithoutAchievements.FavoriteTech}"
                          BindableLayout.ItemTemplateSelector="{StaticResource TechItemTemplateSelector}"
                          Margin="0,10,0,0" />
@@ -165,10 +163,9 @@
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
             <CheckBox x:Name="checkBox" />
-            <StackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.Achievements}"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.Achievements}"
                          BindableLayout.EmptyView="{Binding Source={x:Reference checkBox}, Path=IsChecked}"
                          BindableLayout.EmptyViewTemplate="{StaticResource AchievementsTemplateSelector}"
-                         Orientation="Horizontal"
                          Margin="0,10,0,0"
                          Spacing="20">
                 <BindableLayout.ItemTemplate>
@@ -182,7 +179,7 @@
                         </Image>
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
-        </StackLayout>
-    </StackLayout>
+            </HorizontalStackLayout>
+        </HorizontalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewWithMultipleViewsPage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewWithMultipleViewsPage.xaml
index 9b0c25cf2..8b2e68500 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewWithMultipleViewsPage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewWithMultipleViewsPage.xaml
@@ -64,7 +64,7 @@
                                             MAUITemplate="{StaticResource mauiTemplate}" />        
     </ContentPage.Resources>
     
-    <StackLayout> 
+    <VerticalStackLayout> 
         <AbsoluteLayout BackgroundColor="#909090"
                         HeightRequest="60">
             <Button Text="Cancel" 
@@ -89,14 +89,13 @@
                HorizontalTextAlignment="Center" 
                Text="PROFILE" />
         
-        <StackLayout Margin="20">
-            <StackLayout Spacing="20" 
-                         Orientation="Horizontal">
+        <VerticalStackLayout Margin="20">
+            <HorizontalStackLayout Spacing="20">
                 <Image Source="david.jpg"
                        Aspect="AspectFill" 
                        WidthRequest="104" 
                        HeightRequest="104" />
-                <StackLayout Spacing="5" 
+                <VerticalStackLayout Spacing="5" 
                              Margin="0,10,0,0">
                     <Label Text="{Binding UserWithoutAchievements.Username}" 
                            TextColor="#303030" 
@@ -106,14 +105,13 @@
                            VerticalTextAlignment="Center" />
                     <Label Text="{Binding UserWithoutAchievements.Email}"
                            Style="{StaticResource labelHeading}" />
-                </StackLayout>
-            </StackLayout>
+                </VerticalStackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Top Followers"
                    Margin="0,20,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
-                         Orientation="Horizontal"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.TopFollowers}"
                          Margin="13,10,0,0">
                 <BindableLayout.ItemTemplate>
                     <DataTemplate>
@@ -124,12 +122,12 @@
                                Margin="10,0,0,0" />
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
+            </HorizontalStackLayout>
             
             <Label Text="Favorite Tech"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout Orientation="Horizontal"
+            <HorizontalStackLayout
                          BindableLayout.ItemsSource="{Binding UserWithoutAchievements.FavoriteTech}"
                          BindableLayout.ItemTemplateSelector="{StaticResource TechItemTemplateSelector}"
                          Margin="0,10,0,0" />
@@ -142,8 +140,7 @@
             <Label Text="Achievements"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.Achievements}"
-                         Orientation="Horizontal"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding UserWithoutAchievements.Achievements}"
                          Margin="0,10,0,0"
                          Spacing="20">
                 <BindableLayout.ItemTemplate>
@@ -158,16 +155,16 @@
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
                 <BindableLayout.EmptyView>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Label Text="None."
                                FontAttributes="Italic"
                                FontSize="{StaticResource smallTextSize}" />
                         <Label Text="Try harder and return later?"
                                FontAttributes="Italic"
                                FontSize="{StaticResource smallTextSize}" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </BindableLayout.EmptyView>
-            </StackLayout>
-        </StackLayout>
-    </StackLayout>
+            </HorizontalStackLayout>
+        </HorizontalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfilePage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfilePage.xaml
index 280843c82..86729b00f 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfilePage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfilePage.xaml
@@ -64,7 +64,7 @@
                                             MAUITemplate="{StaticResource mauiTemplate}" />
     </ContentPage.Resources>
 
-    <StackLayout>
+    <VerticalStackLayout>
         <AbsoluteLayout BackgroundColor="#909090"
                         HeightRequest="60">
             <Button Text="Cancel" 
@@ -89,14 +89,13 @@
                HorizontalTextAlignment="Center" 
                Text="PROFILE" />
 
-        <StackLayout Margin="20">
-            <StackLayout Spacing="20" 
-                         Orientation="Horizontal">
+        <VerticalStackLayout Margin="20">
+            <HorizontalStackLayout Spacing="20">
                 <Image Source="david.jpg"
                        Aspect="AspectFill" 
                        WidthRequest="104" 
                        HeightRequest="104" />
-                    <StackLayout Spacing="5" 
+                    <VerticalStackLayout Spacing="5" 
                                  Margin="0,10,0,0">
                     <Label Text="{Binding User.Username}" 
                            TextColor="#303030" 
@@ -106,14 +105,13 @@
                            VerticalTextAlignment="Center" />
                     <Label Text="{Binding User.Email}"
                            Style="{StaticResource labelHeading}" />
-                </StackLayout>
-            </StackLayout>
+                </VerticalStackLayout>
+            </HorizontalStackLayout>
 
             <Label Text="Top Followers"
                    Margin="0,20,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding User.TopFollowers}"
-                         Orientation="Horizontal"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding User.TopFollowers}"
                          Margin="13,10,0,0">
                 <BindableLayout.ItemTemplate>
                     <DataTemplate>
@@ -124,12 +122,12 @@
                                Margin="5,0,0,0" />
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
+            </HorizontalStackLayout>
 
             <Label Text="Favorite Tech"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout Orientation="Horizontal"
+            <HorizontalStackLayout
                          BindableLayout.ItemsSource="{Binding User.FavoriteTech}"
                          BindableLayout.ItemTemplateSelector="{StaticResource TechItemTemplateSelector}"
                          Margin="0,10,0,0" />
@@ -141,8 +139,7 @@
             <Label Text="Achievements"
                    Margin="0,10,0,0"
                    Style="{StaticResource labelHeading}" />
-            <StackLayout BindableLayout.ItemsSource="{Binding User.Achievements}"
-                         Orientation="Horizontal"
+            <HorizontalStackLayout BindableLayout.ItemsSource="{Binding User.Achievements}"
                          Margin="0,10,0,0"
                          Spacing="20">
                 <BindableLayout.ItemTemplate>
@@ -156,7 +153,7 @@
                         </Image>
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
-            </StackLayout>
-        </StackLayout>
-    </StackLayout>
+            </HorizontalStackLayout>
+        </HorizontalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/BasisExperimentPage.xaml b/8.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/BasisExperimentPage.xaml
index 7cbfe41f1..1600b6669 100644
--- a/8.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/BasisExperimentPage.xaml
+++ b/8.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/BasisExperimentPage.xaml
@@ -45,7 +45,7 @@
             <Label Text="Label 2:"
                    Grid.Row="0" Grid.Column="0" />
 
-            <StackLayout Grid.Row="0" Grid.Column="1">
+            <VerticalStackLayout Grid.Row="0" Grid.Column="1">
 
                 <Label Text="Auto" />
 
@@ -53,9 +53,9 @@
                         IsToggled="True"
                         Toggled="OnLabel2AutoSwitchToggled" />
                 
-            </StackLayout>
+            </VerticalStackLayout>
 
-            <StackLayout Grid.Row="0" Grid.Column="2">
+            <VerticalStackLayout Grid.Row="0" Grid.Column="2">
                 <Label Text="Is Relative"
                        IsEnabled="{Binding Source={x:Reference autoSwitch2},
                                            Path=IsToggled,
@@ -67,7 +67,7 @@
                         IsEnabled="{Binding Source={x:Reference autoSwitch2},
                                             Path=IsToggled,
                                             Converter={StaticResource booleanInverse}}" />
-            </StackLayout>
+            </VerticalStackLayout>
 
             <Slider x:Name="slider2"
                     ValueChanged="OnLabel2SliderValueChanged"
@@ -89,7 +89,7 @@
             <Label Text="Label 4:"
                    Grid.Row="3" Grid.Column="0" />
 
-            <StackLayout Grid.Row="3" Grid.Column="1">
+            <VerticalStackLayout Grid.Row="3" Grid.Column="1">
 
                 <Label Text="Auto" />
 
@@ -97,9 +97,9 @@
                         IsToggled="True"
                         Toggled="OnLabel4AutoSwitchToggled" />
 
-            </StackLayout>
+            </VerticalStackLayout>
 
-            <StackLayout Grid.Row="3" Grid.Column="2">
+            <VerticalStackLayout Grid.Row="3" Grid.Column="2">
                 <Label Text="Is Relative"
                        IsEnabled="{Binding Source={x:Reference autoSwitch4},
                                            Path=IsToggled,
@@ -111,7 +111,7 @@
                         IsEnabled="{Binding Source={x:Reference autoSwitch4},
                                             Path=IsToggled,
                                             Converter={StaticResource booleanInverse}}" />
-            </StackLayout>
+            </VerticalStackLayout>
 
             <Slider x:Name="slider4"
                     ValueChanged="OnLabel4SliderValueChanged"
diff --git a/8.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/ExperimentPage.xaml b/8.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/ExperimentPage.xaml
index 55273a9cd..487aa1a81 100644
--- a/8.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/ExperimentPage.xaml
+++ b/8.0/UserInterface/Layouts/FlexLayoutDemos/FlexLayoutDemos/Views/ExperimentPage.xaml
@@ -39,8 +39,7 @@
             <Label Text="Number of items:"
                    Grid.Row="0" Grid.Column="0" />
         
-            <StackLayout Orientation="Horizontal"
-                         Grid.Row="0" Grid.Column="1">
+            <HorizontalStackLayout Grid.Row="0" Grid.Column="1">
                 
                 <Label Text="{Binding Source={x:Reference numberStepper},           
                                       Path=Value,
@@ -52,7 +51,7 @@
                          Increment="1"
                          Value="3"
                          ValueChanged="OnNumberStepperValueChanged" />
-            </StackLayout>
+            </HorizontalStackLayout>
 
             <Label Text="Direction:"
                    Grid.Row="1" Grid.Column="0" />
diff --git a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/AlignmentPage.xaml b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/AlignmentPage.xaml
index 05a4c5fa2..ae99587a3 100644
--- a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/AlignmentPage.xaml
+++ b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/AlignmentPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="StackLayoutDemos.Views.XAML.AlignmentPage"
              Title="Alignment demo">
-    <StackLayout Margin="20"
+    <VerticalStackLayout Margin="20"
                  Spacing="6">
         <Label Text="Start"
                BackgroundColor="Gray"
@@ -17,5 +17,5 @@
         <Label Text="Fill"
                BackgroundColor="Gray"
                HorizontalOptions="Fill" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml
index 5969a6717..24133e056 100644
--- a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml
+++ b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml
@@ -3,74 +3,69 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="StackLayoutDemos.Views.XAML.CombinedStackLayoutPage"
              Title="Combined StackLayouts demo">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="Primary colors" />
         <Frame BorderColor="Black"
                Padding="5">
-            <StackLayout Orientation="Horizontal"
-                         Spacing="15">
+            <HorizontalStackLayout Spacing="15">
                 <BoxView Color="Red"
                          WidthRequest="40" />
                 <Label Text="Red"
                        FontSize="20"
                        VerticalOptions="Center" />
-            </StackLayout>
+            </HorizontalStackLayout>
         </Frame>
         <Frame BorderColor="Black"
                Padding="5">
-            <StackLayout Orientation="Horizontal"
-                         Spacing="15">
+            <HorizontalStackLayout Spacing="15">
                 <BoxView Color="Yellow"
                          WidthRequest="40" />
                 <Label Text="Yellow"
                        FontSize="20"
                        VerticalOptions="Center" />
-            </StackLayout>
+            </HorizontalStackLayout>
         </Frame>
         <Frame BorderColor="Black"
                Padding="5">
-            <StackLayout Orientation="Horizontal"
+            <HorizontalStackLayout
                          Spacing="15">
                 <BoxView Color="Blue"
                          WidthRequest="40" />
                 <Label Text="Blue"
                        FontSize="20"
                        VerticalOptions="Center" />
-            </StackLayout>
+            </VerticalStackLayout>
         </Frame>
         <Label Text="Secondary colors" />
         <Frame BorderColor="Black"
                Padding="5">
-            <StackLayout Orientation="Horizontal"
-                         Spacing="15">
+            <HorizontalStackLayout Spacing="15">
                 <BoxView Color="Green"
                          WidthRequest="40" />
                 <Label Text="Green"
                        FontSize="20"
                        VerticalOptions="Center" />
-            </StackLayout>
+            </HorizontalStackLayout>
         </Frame>
         <Frame BorderColor="Black"
                Padding="5">
-            <StackLayout Orientation="Horizontal"
-                         Spacing="15">
+            <HorizontalStackLayout Spacing="15">
                 <BoxView Color="Orange"
                          WidthRequest="40" />
                 <Label Text="Orange"
                        FontSize="20"
                        VerticalOptions="Center" />
-            </StackLayout>
+            </HorizontalStackLayout>
         </Frame>
         <Frame BorderColor="Black"
                Padding="5">
-            <StackLayout Orientation="Horizontal"
-                         Spacing="15">
+            <HorizontalStackLayout Spacing="15">
                 <BoxView Color="Purple"
                          WidthRequest="40" />
                 <Label Text="Purple"
                        FontSize="20"
                        VerticalOptions="Center" />
-            </StackLayout>
+            </HorizontalStackLayout>
         </Frame>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/HorizontalStackLayoutPage.xaml b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/HorizontalStackLayoutPage.xaml
index 9dcdeab1f..bbc02df38 100644
--- a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/HorizontalStackLayoutPage.xaml
+++ b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/HorizontalStackLayoutPage.xaml
@@ -3,8 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="StackLayoutDemos.Views.XAML.HorizontalStackLayoutPage"
              Title="Horizontal StackLayout demo">
-    <StackLayout Margin="20"
-                 Orientation="Horizontal"
+    <HorizontalStackLayout Margin="20"
                  HorizontalOptions="Center">
         <BoxView Color="Red"
                  WidthRequest="40" />
@@ -18,6 +17,6 @@
                  WidthRequest="40" />
         <BoxView Color="Purple"
                  WidthRequest="40" />
-    </StackLayout>
+    </HorizontalStackLayout>
 </ContentPage>
 
diff --git a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/StackLayoutSpacingPage.xaml b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/StackLayoutSpacingPage.xaml
index f66411498..753b9a4d5 100644
--- a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/StackLayoutSpacingPage.xaml
+++ b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/StackLayoutSpacingPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="StackLayoutDemos.Views.XAML.StackLayoutSpacingPage"
              Title="StackLayout Spacing demo">
-    <StackLayout Margin="20"
+    <VerticalStackLayout Margin="20"
                  Spacing="6">
         <Label Text="Primary colors" />
         <BoxView Color="Red"
@@ -19,5 +19,5 @@
                  HeightRequest="40" />
         <BoxView Color="Purple"
                  HeightRequest="40" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/VerticalStackLayoutPage.xaml b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/VerticalStackLayoutPage.xaml
index 4e2bd8288..2310e2c9b 100644
--- a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/VerticalStackLayoutPage.xaml
+++ b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/VerticalStackLayoutPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="StackLayoutDemos.Views.XAML.VerticalStackLayoutPage"
              Title="Vertical StackLayout demo">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="Primary colors" />
         <BoxView Color="Red"
                  HeightRequest="40" />
@@ -18,5 +18,5 @@
                  HeightRequest="40" />
         <BoxView Color="Purple"
                  HeightRequest="40" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/SystemThemesDemo/SystemThemesDemo/Views/UserSummaryPage.xaml b/8.0/UserInterface/SystemThemesDemo/SystemThemesDemo/Views/UserSummaryPage.xaml
index 3c5d246b6..3da951c03 100644
--- a/8.0/UserInterface/SystemThemesDemo/SystemThemesDemo/Views/UserSummaryPage.xaml
+++ b/8.0/UserInterface/SystemThemesDemo/SystemThemesDemo/Views/UserSummaryPage.xaml
@@ -31,7 +31,7 @@
                            WidthRequest="100" />
                 </Frame>
             </Grid>
-            <StackLayout Grid.Row="1"
+            <VerticalStackLayout Grid.Row="1"
                          Margin="10">
                 <Label Text="This monkey reacts appropriately to ridiculous assertions and actions."
                        Style="{StaticResource SmallLabelStyle}" />
@@ -41,7 +41,7 @@
                        Style="{StaticResource SmallLabelStyle}" />
                 <Label Text="  &#x2022; Doesn't laugh at your jokes."
                        Style="{StaticResource SmallLabelStyle}" />
-            </StackLayout>
+            </VerticalStackLayout>
             <Button Grid.Row="2"
                     Text="MORE INFO"
                     Clicked="OnNavigationInvoked"
diff --git a/8.0/UserInterface/ThemingDemo/ThemingDemo/Views/ThemeSelectionPage.xaml b/8.0/UserInterface/ThemingDemo/ThemingDemo/Views/ThemeSelectionPage.xaml
index 0d4e3dec2..4b5cbdcad 100644
--- a/8.0/UserInterface/ThemingDemo/ThemingDemo/Views/ThemeSelectionPage.xaml
+++ b/8.0/UserInterface/ThemingDemo/ThemingDemo/Views/ThemeSelectionPage.xaml
@@ -4,7 +4,7 @@
              xmlns:local="clr-namespace:ThemingDemo"
              xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
              x:Class="ThemingDemo.ThemeSelectionPage">
-    <StackLayout Margin="20"
+    <VerticalStackLayout Margin="20"
                  VerticalOptions="Center">
         <local:EnumPicker ios:Picker.UpdateMode="WhenFinished"
                           EnumType="{x:Type local:Theme}"
@@ -12,5 +12,5 @@
                           SelectedIndexChanged="OnPickerSelectionChanged" />
         <Label x:Name="statusLabel"
                HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/ThemingDemo/ThemingDemo/Views/UserSummaryPage.xaml b/8.0/UserInterface/ThemingDemo/ThemingDemo/Views/UserSummaryPage.xaml
index 8e5acd4cd..6782196fb 100644
--- a/8.0/UserInterface/ThemingDemo/ThemingDemo/Views/UserSummaryPage.xaml
+++ b/8.0/UserInterface/ThemingDemo/ThemingDemo/Views/UserSummaryPage.xaml
@@ -34,7 +34,7 @@
                            WidthRequest="100" />
                 </Frame>
             </Grid>
-            <StackLayout Grid.Row="1"
+            <VerticalStackLayout Grid.Row="1"
                          Margin="10">
                 <Label Text="This monkey reacts appropriately to ridiculous assertions and actions."
                        Style="{StaticResource SmallLabelStyle}" />
@@ -44,7 +44,7 @@
                        Style="{StaticResource SmallLabelStyle}" />
                 <Label Text="  &#x2022; Doesn't laugh at your jokes."
                        Style="{StaticResource SmallLabelStyle}" />
-            </StackLayout>
+            </VerticalStackLayout>
             <Button Grid.Row="2"
                     Text="MORE INFO"
                     Clicked="OnNavigationInvoked"
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Controls/SpacingModifier.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Controls/SpacingModifier.xaml
index b04bc2e7e..f90767c88 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Controls/SpacingModifier.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Controls/SpacingModifier.xaml
@@ -2,7 +2,7 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CarouselViewDemos.Controls.SpacingModifier">
-    <StackLayout Orientation="Horizontal"
+    <HorizontalStackLayout
                  HorizontalOptions="Center">
         <Label Text="Spacing:"
                VerticalTextAlignment="Center" />
@@ -11,5 +11,5 @@
                WidthRequest="100" />
         <Button Text="Update"
                 Clicked="OnUpdateButtonClicked" />
-    </StackLayout>
+    </HorizontalStackLayout>
 </ContentView>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
index 05c39ac46..d5cf3eca0 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
@@ -11,7 +11,7 @@
 
     <ContentPage.Resources>
         <DataTemplate x:Key="AdvancedTemplate">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="No results matched your filter."
                        Margin="10,25,10,10"
                        FontAttributes="Bold"
@@ -23,7 +23,7 @@
                        FontSize="12"
                        HorizontalOptions="Fill"
                        HorizontalTextAlignment="Center" />
-            </StackLayout>
+            </VerticalStackLayout>
         </DataTemplate>
         
         <DataTemplate x:Key="BasicTemplate">
@@ -40,7 +40,7 @@
                                                  OtherTemplate="{StaticResource BasicTemplate}" />
     </ContentPage.Resources>
 
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={RelativeSource Self}, Path=Text}"
@@ -50,7 +50,7 @@
                       EmptyViewTemplate="{StaticResource SearchSelector}">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -58,7 +58,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -76,11 +76,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml
index a67de8be7..bd875768b 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewFilteredPage.xaml
@@ -7,7 +7,7 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <SearchBar SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={RelativeSource Self}, Path=Text}"
                    Placeholder="Filter"/>
@@ -15,7 +15,7 @@
                       EmptyView="No items match your filter.">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -23,7 +23,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -41,11 +41,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml
index 4b4222a2e..9249b981e 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewLoadSimulationPage.xaml
@@ -11,7 +11,7 @@
                   EmptyView="Loading items simulation.">
         <CarouselView.ItemTemplate>
             <DataTemplate>
-                <StackLayout>
+                <VerticalStackLayout>
                     <Frame HasShadow="True"
                            BorderColor="DarkGray"
                            CornerRadius="5"
@@ -19,7 +19,7 @@
                            HeightRequest="300"
                            HorizontalOptions="Center"
                            VerticalOptions="Center">
-                        <StackLayout>
+                        <VerticalStackLayout>
                             <Label Text="{Binding Name}" 
                                    FontAttributes="Bold"
                                    FontSize="20"
@@ -37,9 +37,9 @@
                                    HorizontalOptions="Center"
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
-                        </StackLayout>
+                        </VerticalStackLayout>
                     </Frame>
-                </StackLayout>
+                </VerticalStackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
     </CarouselView>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
index 76a3bf566..08344d200 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
@@ -10,17 +10,17 @@
 
     <ContentPage.Resources>
         <ContentView x:Key="BasicEmptyView">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="No items to display."
                        Margin="10,25,10,10"
                        FontAttributes="Bold"
                        FontSize="18"
                        HorizontalOptions="Fill"
                        HorizontalTextAlignment="Center" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ContentView>
         <ContentView x:Key="AdvancedEmptyView">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="No results matched your filter."
                        Margin="10,25,10,10"
                        FontAttributes="Bold"
@@ -32,23 +32,23 @@
                        FontSize="12"
                        HorizontalOptions="Fill"
                        HorizontalTextAlignment="Center" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ContentView>
     </ContentPage.Resources>
 
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <SearchBar SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={RelativeSource Self}, Path=Text}"
                    Placeholder="Filter" />
-        <StackLayout Orientation="Horizontal">
+        <HorizontalStackLayout>
             <Label Text="Toggle EmptyViews" />
             <Switch Toggled="OnEmptyViewSwitchToggled" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <CarouselView x:Name="carouselView"
                       ItemsSource="{Binding Monkeys}">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -56,7 +56,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -74,12 +74,12 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml
index 43916aaef..9832ae306 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewTemplatePage.xaml
@@ -8,7 +8,7 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <SearchBar x:Name="searchBar"
                    SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={RelativeSource Self}, Path=Text}"
@@ -29,7 +29,7 @@
             </CarouselView.EmptyViewTemplate>
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -37,7 +37,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -55,11 +55,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
index 89f79b7e5..0512166ba 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
@@ -7,14 +7,14 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <SearchBar SearchCommand="{Binding FilterCommand}"
                    SearchCommandParameter="{Binding Source={RelativeSource Self}, Path=Text}"
                    Placeholder="Filter" />
         <CarouselView ItemsSource="{Binding Monkeys}">
             <CarouselView.EmptyView>
                 <ContentView>
-                    <StackLayout HorizontalOptions="Center"
+                    <VerticalStackLayout HorizontalOptions="Center"
                                  VerticalOptions="Center">
                         <Label Text="No results matched your filter."
                                Margin="10,25,10,10"
@@ -27,12 +27,12 @@
                                FontSize="12"
                                HorizontalOptions="Fill"
                                HorizontalTextAlignment="Center" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </ContentView>
             </CarouselView.EmptyView>
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -40,7 +40,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -58,11 +58,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Indicators/HorizontalLayoutWithIndicatorsPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Indicators/HorizontalLayoutWithIndicatorsPage.xaml
index 1533714fc..4cded32a1 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Indicators/HorizontalLayoutWithIndicatorsPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Indicators/HorizontalLayoutWithIndicatorsPage.xaml
@@ -7,12 +7,12 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout>
+    <VerticalStackLayout>
         <CarouselView ItemsSource="{Binding Monkeys}"
                       IndicatorView="indicatorView">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -20,7 +20,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -38,9 +38,9 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
@@ -50,5 +50,5 @@
                        SelectedIndicatorColor="DarkGray"
                        HorizontalOptions="Center"
                        Margin="0,0,0,40" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionBindingsPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionBindingsPage.xaml
index e1b3d3a0a..d35d1142e 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionBindingsPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionBindingsPage.xaml
@@ -7,7 +7,7 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label Text="{Binding PreviousMonkey.Name, StringFormat='Previous item: {0}', FallbackValue='Previous item:'}" />
         <Label Text="{Binding CurrentMonkey.Name, StringFormat='Current item: {0}', FallbackValue='Current item:'}" />
         <Label Text="{Binding PreviousPosition, StringFormat='Previous position: {0}'}" />
@@ -19,7 +19,7 @@
                       PositionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=Position}">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -27,7 +27,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -45,11 +45,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionPage.xaml
index 37574b97c..de315ebf7 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/CurrentItemAndPositionPage.xaml
@@ -7,7 +7,7 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label x:Name="previousItemLabel" />
         <Label x:Name="currentItemLabel" />
         <Label x:Name="previousItemPositionLabel" />
@@ -17,7 +17,7 @@
                       PositionChanged="OnPositionChanged">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -25,7 +25,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -43,11 +43,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/SetCurrentItemAndPositionPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/SetCurrentItemAndPositionPage.xaml
index 1e0e18a18..34e91913f 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/SetCurrentItemAndPositionPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/SetCurrentItemAndPositionPage.xaml
@@ -7,7 +7,7 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label Text="{Binding Source={x:Reference carouselView}, Path=CurrentItem.Name, StringFormat='Current item: {0}', FallbackValue='Current item:'}" />
         <Label Text="{Binding Source={x:Reference carouselView}, Path=Position, StringFormat='Position: {0}'}" />
         <CarouselView x:Name="carouselView"
@@ -16,7 +16,7 @@
                       Position="{Binding Position}">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -24,7 +24,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -42,11 +42,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/VisualStatesPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/VisualStatesPage.xaml
index 0a93f552d..5e42e01a1 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/VisualStatesPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Interaction/VisualStatesPage.xaml
@@ -12,7 +12,7 @@
                   PeekAreaInsets="100">
         <CarouselView.ItemTemplate>
             <DataTemplate>
-                <StackLayout>
+                <VerticalStackLayout>
                     <VisualStateManager.VisualStateGroups>
                         <VisualStateGroup x:Name="CommonStates">
                             <VisualState x:Name="CurrentItem">
@@ -49,7 +49,7 @@
                            WidthRequest="150"
                            HorizontalOptions="Center"
                            VerticalOptions="Center">
-                        <StackLayout>
+                        <VerticalStackLayout>
                             <Label Text="{Binding Name}" 
                                    FontAttributes="Bold"
                                    FontSize="20"
@@ -67,9 +67,9 @@
                                    HorizontalOptions="Center"
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
-                        </StackLayout>
+                        </VerticalStackLayout>
                     </Frame>
-                </StackLayout>
+                </VerticalStackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
     </CarouselView>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutDataTemplateSelectorPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutDataTemplateSelectorPage.xaml
index bdac58473..f8d82e00a 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutDataTemplateSelectorPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutDataTemplateSelectorPage.xaml
@@ -7,7 +7,7 @@
              Title="Horizontal layout (DataTemplateSelector)">
     <ContentPage.Resources>
         <DataTemplate x:Key="AmericanMonkeyTemplate">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Frame HasShadow="True"
                        BorderColor="DarkGray"
                        CornerRadius="5"
@@ -15,7 +15,7 @@
                        HeightRequest="300"
                        HorizontalOptions="Center"
                        VerticalOptions="Center">
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Label Text="{Binding Name}" 
                                FontAttributes="Bold"
                                FontSize="20"
@@ -33,13 +33,13 @@
                                HorizontalOptions="Center"
                                MaxLines="5"
                                LineBreakMode="TailTruncation" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </Frame>
-            </StackLayout>
+            </VerticalStackLayout>
         </DataTemplate>
 
         <DataTemplate x:Key="OtherMonkeyTemplate">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Frame HasShadow="True"
                        BorderColor="DarkGray"
                        CornerRadius="5"
@@ -47,7 +47,7 @@
                        HeightRequest="300"
                        HorizontalOptions="Center"
                        VerticalOptions="Center">
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Label Text="{Binding Name}"
                                TextColor="Silver"
                                FontAttributes="Bold"
@@ -69,9 +69,9 @@
                                HorizontalOptions="Center"
                                MaxLines="5"
                                LineBreakMode="TailTruncation" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </Frame>
-            </StackLayout>
+            </VerticalStackLayout>
         </DataTemplate>
 
         <controls:MonkeyDataTemplateSelector x:Key="MonkeySelector"
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutPeekAreaPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutPeekAreaPage.xaml
index 8f7fa7a06..30dce1e5f 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutPeekAreaPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalLayoutPeekAreaPage.xaml
@@ -11,7 +11,7 @@
                   PeekAreaInsets="100">
         <CarouselView.ItemTemplate>
             <DataTemplate>
-                <StackLayout>
+                <VerticalStackLayout>
                     <Frame HasShadow="True"
                            BorderColor="DarkGray"
                            CornerRadius="5"
@@ -20,7 +20,7 @@
                            WidthRequest="150"
                            HorizontalOptions="Center"
                            VerticalOptions="Center">
-                        <StackLayout>
+                        <VerticalStackLayout>
                             <Label Text="{Binding Name}" 
                                    FontAttributes="Bold"
                                    FontSize="20"
@@ -38,9 +38,9 @@
                                    HorizontalOptions="Center"
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
-                        </StackLayout>
+                        </VerticalStackLayout>
                     </Frame>
-                </StackLayout>
+                </VerticalStackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
     </CarouselView>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutPage.xaml
index cd1ed22f7..85d41913c 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutPage.xaml
@@ -10,7 +10,7 @@
     <CarouselView ItemsSource="{Binding Monkeys}">
         <CarouselView.ItemTemplate>
             <DataTemplate>
-                <StackLayout>
+                <VerticalStackLayout>
                     <Frame HasShadow="True"
                            BorderColor="DarkGray"
                            CornerRadius="5"
@@ -18,7 +18,7 @@
                            HeightRequest="300"
                            HorizontalOptions="Center"
                            VerticalOptions="Center">
-                        <StackLayout>
+                        <VerticalStackLayout>
                             <Label Text="{Binding Name}" 
                                    FontAttributes="Bold"
                                    FontSize="20"
@@ -36,9 +36,9 @@
                                    HorizontalOptions="Center"
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
-                        </StackLayout>
+                        </VerticalStackLayout>
                     </Frame>
-                </StackLayout>
+                </VerticalStackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
     </CarouselView>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutRTLPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutRTLPage.xaml
index f4b3922a6..1677b8e91 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutRTLPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTemplateLayoutRTLPage.xaml
@@ -11,7 +11,7 @@
     <CarouselView ItemsSource="{Binding Monkeys}">
         <CarouselView.ItemTemplate>
             <DataTemplate>
-                <StackLayout>
+                <VerticalStackLayout>
                     <Frame HasShadow="True"
                            BorderColor="DarkGray"
                            CornerRadius="5"
@@ -19,7 +19,7 @@
                            HeightRequest="300"
                            HorizontalOptions="Center"
                            VerticalOptions="Center">
-                        <StackLayout>
+                        <VerticalStackLayout>
                             <Label Text="{Binding Name}" 
                                    FontAttributes="Bold"
                                    FontSize="20"
@@ -37,9 +37,9 @@
                                    HorizontalOptions="Center"
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
-                        </StackLayout>
+                        </VerticalStackLayout>
                     </Frame>
-                </StackLayout>
+                </VerticalStackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
     </CarouselView>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTextLayoutPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTextLayoutPage.xaml
index 92b4096ec..8659b4c17 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTextLayoutPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/HorizontalTextLayoutPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CarouselViewDemos.Views.HorizontalTextLayoutPage"
              Title="Horizontal layout (text)">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <CarouselView>
             <CarouselView.ItemsSource>
                 <x:Array Type="{x:Type x:String}">
@@ -27,5 +27,5 @@
                 </x:Array>
             </CarouselView.ItemsSource>
         </CarouselView>
-    </StackLayout> 
+    </VerticalStackLayout> 
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTemplateLayoutPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTemplateLayoutPage.xaml
index 3307355c3..210b19e7e 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTemplateLayoutPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTemplateLayoutPage.xaml
@@ -13,7 +13,7 @@
         </CarouselView.ItemsLayout>
         <CarouselView.ItemTemplate>
             <DataTemplate>
-                <StackLayout>
+                <VerticalStackLayout>
                     <Frame HasShadow="True"
                            BorderColor="DarkGray"
                            CornerRadius="5"
@@ -21,7 +21,7 @@
                            HeightRequest="300"
                            HorizontalOptions="Center"
                            VerticalOptions="Center">
-                        <StackLayout>
+                        <VerticalStackLayout>
                             <Label Text="{Binding Name}" 
                                    FontAttributes="Bold"
                                    FontSize="20"
@@ -39,9 +39,9 @@
                                    HorizontalOptions="Center"
                                    MaxLines="5"
                                    LineBreakMode="TailTruncation" />
-                        </StackLayout>
+                        </VerticalStackLayout>
                     </Frame>
-                </StackLayout>
+                </VerticalStackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
     </CarouselView>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTextLayoutPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTextLayoutPage.xaml
index db92e69fa..b03359723 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTextLayoutPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Layout/VerticalTextLayoutPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CarouselViewDemos.Views.VerticalTextLayoutPage"
              Title="Vertical layout (text)">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <CarouselView>
             <CarouselView.ItemsLayout>
                 <LinearItemsLayout Orientation="Vertical" />
@@ -30,5 +30,5 @@
                 </x:Array>
             </CarouselView.ItemsSource>
         </CarouselView>
-    </StackLayout> 
+    </VerticalStackLayout> 
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/HorizontalPullToRefreshPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/HorizontalPullToRefreshPage.xaml
index e2bd9b8ae..a558f9624 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/HorizontalPullToRefreshPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/HorizontalPullToRefreshPage.xaml
@@ -7,7 +7,7 @@
     <ContentPage.BindingContext>
         <viewmodels:AnimalsViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="Pull the items down to refresh the CarouselView." />
         <Label Text="{Binding Animals.Count, StringFormat='Number of items: {0}'}" />
         <RefreshView IsRefreshing="{Binding IsRefreshing}"
@@ -15,7 +15,7 @@
             <CarouselView ItemsSource="{Binding Animals}">
                 <CarouselView.ItemTemplate>
                     <DataTemplate>
-                        <StackLayout>
+                        <VerticalStackLayout>
                             <Frame HasShadow="True"
                                    BorderColor="DarkGray"
                                    CornerRadius="5"
@@ -23,7 +23,7 @@
                                    HeightRequest="300"
                                    HorizontalOptions="Center"
                                    VerticalOptions="Center">
-                                <StackLayout>
+                                <VerticalStackLayout>
                                     <Label Text="{Binding Name}" 
                                            FontAttributes="Bold"
                                            FontSize="20"
@@ -41,14 +41,14 @@
                                            HorizontalOptions="Center"
                                            MaxLines="5"
                                            LineBreakMode="TailTruncation" />
-                                </StackLayout>
+                                </VerticalStackLayout>
                             </Frame>
-                        </StackLayout>
+                        </VerticalStackLayout>
                     </DataTemplate>
                 </CarouselView.ItemTemplate>
             </CarouselView>
         </RefreshView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
 
 
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/VerticalPullToRefreshPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/VerticalPullToRefreshPage.xaml
index 3c2bc1ce0..78f428f6f 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/VerticalPullToRefreshPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/PullToRefresh/VerticalPullToRefreshPage.xaml
@@ -7,7 +7,7 @@
     <ContentPage.BindingContext>
         <viewmodels:AnimalsViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="Pull the items down to refresh the CarouselView." />
         <Label Text="{Binding Animals.Count, StringFormat='Number of items: {0}'}" />
         <RefreshView IsRefreshing="{Binding IsRefreshing}"
@@ -18,7 +18,7 @@
                 </CarouselView.ItemsLayout>
                 <CarouselView.ItemTemplate>
                     <DataTemplate>
-                        <StackLayout>
+                        <VerticalStackLayout>
                             <Frame HasShadow="True"
                                    BorderColor="DarkGray"
                                    CornerRadius="5"
@@ -26,7 +26,7 @@
                                    HeightRequest="300"
                                    HorizontalOptions="Center"
                                    VerticalOptions="Center">
-                                <StackLayout>
+                                <VerticalStackLayout>
                                     <Label Text="{Binding Name}" 
                                            FontAttributes="Bold"
                                            FontSize="20"
@@ -44,12 +44,12 @@
                                            HorizontalOptions="Center"
                                            MaxLines="5"
                                            LineBreakMode="TailTruncation" />
-                                </StackLayout>
+                                </VerticalStackLayout>
                             </Frame>
-                        </StackLayout>
+                        </VerticalStackLayout>
                     </DataTemplate>
                 </CarouselView.ItemTemplate>
             </CarouselView>
         </RefreshView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml
index e87f8292a..ef237b4db 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/IncrementalLoadingPage.xaml
@@ -7,7 +7,7 @@
     <ContentPage.BindingContext>
         <viewmodels:AnimalsViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label Text="{Binding Animals.Count, StringFormat='Number of items: {0}'}" />
         <CarouselView ItemsSource="{Binding Animals}"
                       RemainingItemsThreshold="2"
@@ -15,7 +15,7 @@
                       RemainingItemsThresholdReachedCommand="{Binding LoadMoreDataCommand}">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -23,7 +23,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -41,11 +41,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
index 63765df19..54c6791ba 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
@@ -9,22 +9,21 @@
         <viewmodels:MonkeysViewModelWithDelay />
     </ContentPage.BindingContext>
 
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <VerticalStackLayout Margin="20">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="UpdatingScrollMode: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ItemsUpdatingScrollMode}"
                                  SelectedIndex="0"
                                  SelectedIndexChanged="OnItemsUpdatingScrollModeChanged" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <Label Text="{Binding Monkeys.Count, StringFormat='Number of items: {0}'}" />
         <CarouselView x:Name="carouselView"
                       ItemsSource="{Binding Monkeys}">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -32,7 +31,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                         FontAttributes="Bold"
                                         FontSize="20"
@@ -50,11 +49,11 @@
                                         HorizontalOptions="Center"
                                         MaxLines="5"
                                         LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml
index 78423b2ba..e50fcde50 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByIndexPage.xaml
@@ -8,22 +8,20 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <VerticalStackLayout Margin="20">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="ScrollToPosition: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ScrollToPosition}"
                                  SelectedIndex="0" />
-        </StackLayout>
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        </HorizontalStackLayout>
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="Animate scroll: "
                    VerticalTextAlignment="Center" />
             <Switch x:Name="animateSwitch"
                     IsToggled="true" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <Button Text="Scroll to item 6"
                 Clicked="OnButtonClicked" />
         <CarouselView x:Name="carouselView"
@@ -31,7 +29,7 @@
                       Scrolled="OnCarouselViewScrolled">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -39,7 +37,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -57,11 +55,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml
index 257d36bcc..843ac0e18 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/ScrollToByObjectPage.xaml
@@ -8,22 +8,20 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <VerticalStackLayout Margin="20">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="ScrollToPosition: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ScrollToPosition}"
                                  SelectedIndex="0" />
-        </StackLayout>
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        </HorizontalStackLayout>
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="Animate scroll: "
                    VerticalTextAlignment="Center" />
             <Switch x:Name="animateSwitch"
                     IsToggled="true" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <Button Text="Scroll to Proboscis Monkey"
                 Clicked="OnButtonClicked" />
         <CarouselView x:Name="carouselView"
@@ -31,7 +29,7 @@
                       Scrolled="OnCarouselViewScrolled">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -39,7 +37,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -57,11 +55,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/SnapPointsPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/SnapPointsPage.xaml
index 0c27817fc..80f2c45f7 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/SnapPointsPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Scrolling/SnapPointsPage.xaml
@@ -8,18 +8,16 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <VerticalStackLayout Margin="20">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="SnapPointsType: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="snapPointsTypeEnumPicker"
                                  EnumType="{x:Type SnapPointsType}"
                                  SelectedIndex="2"
                                  SelectedIndexChanged="OnSnapPointsTypeSelectedIndexChanged" />
-        </StackLayout>
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        </HorizontalStackLayout>
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Grid.Row="1" 
                    Text="SnapPointsAlignment: "
                    VerticalTextAlignment="Center" />
@@ -27,13 +25,13 @@
                                  EnumType="{x:Type SnapPointsAlignment}"
                                  SelectedIndex="1"
                                  SelectedIndexChanged="OnSnapPointsAlignmentSelectedIndexChanged" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <CarouselView x:Name="carouselView"
                       ItemsSource="{Binding Monkeys}"
                       PeekAreaInsets="100">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -46,9 +44,9 @@
                                    WidthRequest="100"
                                    HorizontalOptions="Center" />
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml
index a9c108c1a..d39b93e55 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Sizing/DynamicSizeItemsPage.xaml
@@ -7,12 +7,12 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="Tap each image to dynamically change its size." />
         <CarouselView ItemsSource="{Binding Monkeys}">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -20,7 +20,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -42,11 +42,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/HorizontalSpacingPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/HorizontalSpacingPage.xaml
index 788f8e4d7..0a1616742 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/HorizontalSpacingPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/HorizontalSpacingPage.xaml
@@ -8,14 +8,14 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <controls:SpacingModifier CV="{x:Reference carouselView}"
                                   SpacingText="0" />
         <CarouselView x:Name="carouselView"
                       ItemsSource="{Binding Monkeys}">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -23,7 +23,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -41,11 +41,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/VerticalSpacingPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/VerticalSpacingPage.xaml
index 5966f5c11..46dc35a22 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/VerticalSpacingPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Spacing/VerticalSpacingPage.xaml
@@ -8,7 +8,7 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <controls:SpacingModifier CV="{x:Reference carouselView}"
                                   SpacingText="0" />
         <CarouselView x:Name="carouselView"
@@ -18,7 +18,7 @@
             </CarouselView.ItemsLayout>
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -26,7 +26,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -44,11 +44,11 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Swipe/HorizontalSwipeItemsPage.xaml b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Swipe/HorizontalSwipeItemsPage.xaml
index 00bbc3421..c618bdd60 100644
--- a/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Swipe/HorizontalSwipeItemsPage.xaml
+++ b/8.0/UserInterface/Views/CarouselViewDemos/CarouselViewDemos/Views/Swipe/HorizontalSwipeItemsPage.xaml
@@ -11,7 +11,7 @@
                   ItemsSource="{Binding Monkeys}">
         <CarouselView.ItemTemplate>
             <DataTemplate>
-                <StackLayout>
+                <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -38,7 +38,7 @@
                                                    CommandParameter="{Binding}" />
                                     </SwipeItems>
                                 </SwipeView.BottomItems>
-                                <StackLayout>
+                                <VerticalStackLayout>
                                     <Label Text="{Binding Name}" 
                                            FontAttributes="Bold"
                                            FontSize="20"
@@ -56,10 +56,10 @@
                                            HorizontalOptions="Center"
                                            MaxLines="5"
                                            LineBreakMode="TailTruncation" />
-                                </StackLayout>
+                                </VerticalStackLayout>
                             </SwipeView>
                         </Frame>
-                </StackLayout>
+                </VerticalStackLayout>
             </DataTemplate>
         </CarouselView.ItemTemplate>
     </CarouselView>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
index 9b4af4592..50566e9c7 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewDataTemplateSelectorPage.xaml
@@ -6,7 +6,7 @@
              Title="EmptyView (DataTemplateSelector)">
     <ContentPage.Resources>
         <DataTemplate x:Key="AdvancedTemplate">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="No results matched your filter."
                        Margin="10,25,10,10"
                        FontAttributes="Bold"
@@ -18,7 +18,7 @@
                        FontSize="12"
                        HorizontalOptions="Fill"
                        HorizontalTextAlignment="Center" />
-            </StackLayout>
+            </VerticalStackLayout>
         </DataTemplate>
         
         <DataTemplate x:Key="BasicTemplate">
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
index d075b47e9..895791ceb 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewSwapPage.xaml
@@ -5,17 +5,17 @@
              Title="EmptyView (swap)">
     <ContentPage.Resources>
         <ContentView x:Key="BasicEmptyView">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="No items to display."
                        Margin="10,25,10,10"
                        FontAttributes="Bold"
                        FontSize="18"
                        HorizontalOptions="Fill"
                        HorizontalTextAlignment="Center" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ContentView>
         <ContentView x:Key="AdvancedEmptyView">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="No results matched your filter."
                        Margin="10,25,10,10"
                        FontAttributes="Bold"
@@ -27,7 +27,7 @@
                        FontSize="12"
                        HorizontalOptions="Fill"
                        HorizontalTextAlignment="Center" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ContentView>
     </ContentPage.Resources>
     
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
index 177a60a65..92b968e7a 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/EmptyView/EmptyViewWithViewsFilteredPage.xaml
@@ -40,7 +40,7 @@
             </CollectionView.ItemTemplate>
             <CollectionView.EmptyView>
                 <ContentView>
-                    <StackLayout HorizontalOptions="Center"
+                    <VerticalStackLayout HorizontalOptions="Center"
                                  VerticalOptions="Center">
                         <Label Text="No results matched your filter."
                                Margin="10,25,10,10"
@@ -53,7 +53,7 @@
                                FontSize="12"
                                HorizontalOptions="Fill"
                                HorizontalTextAlignment="Center" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </ContentView>
             </CollectionView.EmptyView>
         </CollectionView>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingVariableSizeItemsPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingVariableSizeItemsPage.xaml
index d732391fa..1c06e8f39 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingVariableSizeItemsPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Grouping/VerticalListGroupingVariableSizeItemsPage.xaml
@@ -5,14 +5,13 @@
              x:Class="CollectionViewDemos.Views.VerticalListGroupingVariableSizeItemsPage"
              Title="Grouping with variable sized items">
     <Grid Margin="20" RowDefinitions="50,*">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="ItemSizingStrategy:"
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ItemSizingStrategy}"
                                  SelectedIndex="0" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <CollectionView
                         Grid.Row="1"
                         ItemsSource="{Binding Animals}"
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml
index 563ca0fd8..efca19b37 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml
@@ -7,20 +7,20 @@
         <CollectionView ItemsSource="{Binding Monkeys}"
                         ItemsLayout="HorizontalGrid, 2">
             <CollectionView.Header>
-                <StackLayout BackgroundColor="LightGray">
+                <VerticalStackLayout BackgroundColor="LightGray">
                     <Label Margin="10,0,0,0"
                            Text="Monkeys"
                            FontSize="12"
                            FontAttributes="Bold" />
-                </StackLayout>
+                </VerticalStackLayout>
             </CollectionView.Header>
             <CollectionView.Footer>
-                <StackLayout BackgroundColor="LightGray">
+                <VerticalStackLayout BackgroundColor="LightGray">
                     <Label Margin="10,0,0,0"
                            Text="Friends of Xamarin Monkey"
                            FontSize="12"
                            FontAttributes="Bold" />
-                </StackLayout>
+                </VerticalStackLayout>
             </CollectionView.Footer>
             <CollectionView.ItemTemplate>
                 <DataTemplate>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterDataTemplatePage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterDataTemplatePage.xaml
index cdb1a0bf0..1cee1c0b6 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterDataTemplatePage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterDataTemplatePage.xaml
@@ -9,22 +9,22 @@
                         Footer="{Binding .}">
             <CollectionView.HeaderTemplate>
                 <DataTemplate>
-                    <StackLayout BackgroundColor="LightGray">
+                    <VerticalStackLayout BackgroundColor="LightGray">
                         <Label Margin="10,0,0,0"
                                Text="Monkeys"
                                FontSize="12"
                                FontAttributes="Bold" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CollectionView.HeaderTemplate>
             <CollectionView.FooterTemplate>
                 <DataTemplate>
-                    <StackLayout BackgroundColor="LightGray">
+                    <VerticalStackLayout BackgroundColor="LightGray">
                         <Label Margin="10,0,0,0"
                                Text="Friends of Xamarin Monkey"
                                FontSize="12"
                                FontAttributes="Bold" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CollectionView.FooterTemplate>
             <CollectionView.ItemTemplate>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterViewPage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterViewPage.xaml
index 56174fb41..e08d39fcd 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterViewPage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/VerticalListHeaderFooterViewPage.xaml
@@ -6,20 +6,20 @@
     <Grid Margin="20">
         <CollectionView ItemsSource="{Binding Monkeys}">
             <CollectionView.Header>
-                <StackLayout BackgroundColor="LightGray">
+                <VerticalStackLayout BackgroundColor="LightGray">
                     <Label Margin="10,0,0,0"
                            Text="Monkeys"
                            FontSize="12"
                            FontAttributes="Bold" />
-                </StackLayout>
+                </VerticalStackLayout>
             </CollectionView.Header>
             <CollectionView.Footer>
-                <StackLayout BackgroundColor="LightGray">
+                <VerticalStackLayout BackgroundColor="LightGray">
                     <Label Margin="10,0,0,0"
                            Text="Friends of Xamarin Monkey"
                            FontSize="12"
                            FontAttributes="Bold" />
-                </StackLayout>
+                </VerticalStackLayout>
             </CollectionView.Footer>
             <CollectionView.ItemTemplate>
                 <DataTemplate>
diff --git a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
index 735a6bb21..a4e66fc2e 100644
--- a/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
+++ b/8.0/UserInterface/Views/CollectionViewDemos/CollectionViewDemos/Views/Scrolling/ItemsUpdatingScrollModePage.xaml
@@ -5,15 +5,14 @@
              x:Class="CollectionViewDemos.Views.ItemsUpdatingScrollModePage"
              Title="Scroll mode when adding items">
     <Grid Margin="20" RowDefinitions="30,*">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="UpdatingScrollMode: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ItemsUpdatingScrollMode}"
                                  SelectedIndex="0"
                                  SelectedIndexChanged="OnItemsUpdatingScrollModeChanged" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <CollectionView x:Name="collectionView"
                         Grid.Row="1"
                         ItemsSource="{Binding Monkeys}">
diff --git a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml
index bfe6ed82f..1cdb145f6 100644
--- a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml
+++ b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml
@@ -13,7 +13,7 @@
                       IndicatorView="indicatorView">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -21,7 +21,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -39,9 +39,9 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
diff --git a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml
index b91edb61c..0645e63a3 100644
--- a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml
+++ b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml
@@ -78,7 +78,7 @@
                       IndicatorView="indicatorView">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -86,7 +86,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -104,9 +104,9 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
diff --git a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml
index 71c9420f1..9f0e9c482 100644
--- a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml
+++ b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml
@@ -38,7 +38,7 @@
                       IndicatorView="indicatorView">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Frame HasShadow="True"
                                BorderColor="DarkGray"
                                CornerRadius="5"
@@ -46,7 +46,7 @@
                                HeightRequest="300"
                                HorizontalOptions="Center"
                                VerticalOptions="Center">
-                            <StackLayout>
+                            <VerticalStackLayout>
                                 <Label Text="{Binding Name}" 
                                        FontAttributes="Bold"
                                        FontSize="20"
@@ -64,9 +64,9 @@
                                        HorizontalOptions="Center"
                                        MaxLines="5"
                                        LineBreakMode="TailTruncation" />
-                            </StackLayout>
+                            </VerticalStackLayout>
                         </Frame>
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </CarouselView.ItemTemplate>
         </CarouselView>
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ContextMenuItemsPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ContextMenuItemsPage.xaml
index 7f1fe956b..08f8845b7 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ContextMenuItemsPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ContextMenuItemsPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ListViewDemos.ContextMenuItemsPage"
              Title="Vertical list with context menu items">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <ListView x:Name="listView"
                   ItemsSource="{Binding Monkeys}">
             <ListView.ItemTemplate>
@@ -47,5 +47,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/DataTemplateSelectorPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/DataTemplateSelectorPage.xaml
index 26518fce6..4dfd75fa3 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/DataTemplateSelectorPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/DataTemplateSelectorPage.xaml
@@ -71,8 +71,8 @@
                                              OtherMonkey="{StaticResource OtherMonkeyTemplate}" />
     </ContentPage.Resources>
 
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <ListView ItemsSource="{Binding Monkeys}"
                   ItemTemplate="{StaticResource MonkeySelector}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/GroupingPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/GroupingPage.xaml
index 6f0998723..9e1ff420f 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/GroupingPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/GroupingPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ListViewDemos.GroupingPage"
              Title="Grouping">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <ListView ItemsSource="{Binding Animals}"
                   IsGroupingEnabled="True">
             <ListView.GroupHeaderTemplate>
@@ -46,5 +46,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/PullToRefreshPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/PullToRefreshPage.xaml
index 7f3e7eef5..df1032ca4 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/PullToRefreshPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/PullToRefreshPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ListViewDemos.PullToRefreshPage"
              Title="Pull to refresh list">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="Pull the items down to refresh the ListView." />
         <Label Text="{Binding Animals.Count, StringFormat='Number of items: {0}'}" />
         <ListView ItemsSource="{Binding Animals}"
@@ -40,5 +40,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/RightToLeftListPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/RightToLeftListPage.xaml
index 74ec5a4b4..fb60d3386 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/RightToLeftListPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/RightToLeftListPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ListViewDemos.RightToLeftListPage"
              Title="Right to left list"
              FlowDirection="RightToLeft">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <ListView ItemsSource="{Binding Monkeys}">
             <ListView.ItemTemplate>
                 <DataTemplate>
@@ -36,5 +36,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/RuntimeItemSizingPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/RuntimeItemSizingPage.xaml
index b78ba6e55..abace17ba 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/RuntimeItemSizingPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/RuntimeItemSizingPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ListViewDemos.RuntimeItemSizingPage"
              Title="Runtime item sizing">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <ListView ItemsSource="{Binding Monkeys}"
                   HasUnevenRows="True">
             <ListView.ItemTemplate>
@@ -40,5 +40,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ScrollByItemPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ScrollByItemPage.xaml
index 82c86dc93..71fb625f3 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ScrollByItemPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ScrollByItemPage.xaml
@@ -4,22 +4,20 @@
              xmlns:controls="clr-namespace:ListViewDemos.Controls"
              x:Class="ListViewDemos.ScrollByItemPage"
              Title="Scroll by item">
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <VerticalStackLayout Margin="20">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="ScrollToPosition: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ScrollToPosition}"
                                  SelectedIndex="0" />
-        </StackLayout>
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        </HorizontalStackLayout>
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="Animate scroll: "
                    VerticalTextAlignment="Center" />
             <Switch x:Name="animateSwitch"
                     IsToggled="true" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <Button Text="Scroll to Proboscis Monkey"
                 Clicked="OnButtonClicked" />
         <ListView x:Name="listView"
@@ -55,5 +53,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ScrollByItemWithGroupingPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ScrollByItemWithGroupingPage.xaml
index ecfc510ae..7ced971d2 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ScrollByItemWithGroupingPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ScrollByItemWithGroupingPage.xaml
@@ -4,22 +4,20 @@
              xmlns:controls="clr-namespace:ListViewDemos.Controls"
              x:Class="ListViewDemos.ScrollByItemWithGroupingPage"
              Title="Scroll by item with grouping">
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <VerticalStackLayout Margin="20">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="ScrollToPosition: "
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="enumPicker"
                                  EnumType="{x:Type ScrollToPosition}"
                                  SelectedIndex="0" />
-        </StackLayout>
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        </HorizontalStackLayout>
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="Animate scroll: "
                    VerticalTextAlignment="Center" />
             <Switch x:Name="animateSwitch"
                     IsToggled="true" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <Button Text="Scroll to Proboscis Monkey"
                 Clicked="OnButtonClicked" />
         <ListView x:Name="listView"
@@ -56,5 +54,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/SelectionPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/SelectionPage.xaml
index 2af6ab015..c2b3e4a4d 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/SelectionPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/SelectionPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ListViewDemos.SelectionPage"
              Title="ListView with selection">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -48,5 +48,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TemplatedHeaderFooterPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TemplatedHeaderFooterPage.xaml
index 741c03e16..b5a3eb5a2 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TemplatedHeaderFooterPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TemplatedHeaderFooterPage.xaml
@@ -3,28 +3,28 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ListViewDemos.TemplatedHeaderFooterPage"
               Title="Templated header and footer">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <ListView ItemsSource="{Binding Monkeys}"
                   Header="{Binding .}"
                   Footer="{Binding .}">
             <ListView.HeaderTemplate>
                 <DataTemplate>
-                    <StackLayout BackgroundColor="LightGray">
+                    <VerticalStackLayout BackgroundColor="LightGray">
                         <Label Margin="10,0,0,0"
                                Text="Monkeys"
                                FontSize="12"
                                FontAttributes="Bold" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </ListView.HeaderTemplate>
             <ListView.FooterTemplate>
                 <DataTemplate>
-                    <StackLayout BackgroundColor="LightGray">
+                    <VerticalStackLayout BackgroundColor="LightGray">
                         <Label Margin="10,0,0,0"
                                Text="Friends of Monkey"
                                FontSize="12"
                                FontAttributes="Bold" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </DataTemplate>
             </ListView.FooterTemplate>
             <ListView.ItemTemplate>
@@ -57,5 +57,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TextHeaderFooterPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TextHeaderFooterPage.xaml
index 0e56c1200..2770b51f1 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TextHeaderFooterPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TextHeaderFooterPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ListViewDemos.TextHeaderFooterPage"
              Title="Text header and footer">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <ListView ItemsSource="{Binding Monkeys}"
                   Header="Monkeys"
                   Footer="2022">
@@ -37,5 +37,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TextListPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TextListPage.xaml
index 0df7dd00f..d694e4390 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TextListPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/TextListPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ListViewDemos.TextListPage"
              Title="Text">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <ListView>
             <ListView.ItemsSource>
                 <x:Array Type="{x:Type x:String}">
@@ -27,5 +27,5 @@
                 </x:Array>
             </ListView.ItemsSource>
         </ListView>
-    </StackLayout>    
+    </VerticalStackLayout>    
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/VerticalListPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/VerticalListPage.xaml
index bc58908aa..9ce7f51f9 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/VerticalListPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/VerticalListPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ListViewDemos.VerticalListPage"
              Title="Vertical list">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <ListView ItemsSource="{Binding Monkeys}">
             <ListView.ItemTemplate>
                 <DataTemplate>
@@ -35,5 +35,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ViewHeaderFooterPage.xaml b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ViewHeaderFooterPage.xaml
index 7c7201791..c0ed68ae4 100644
--- a/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ViewHeaderFooterPage.xaml
+++ b/8.0/UserInterface/Views/ListViewDemos/ListViewDemos/Views/ViewHeaderFooterPage.xaml
@@ -3,23 +3,23 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ListViewDemos.ViewHeaderFooterPage"
              Title="View header and footer">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <ListView ItemsSource="{Binding Monkeys}">
             <ListView.Header>
-                <StackLayout BackgroundColor="LightGray">
+                <VerticalStackLayout BackgroundColor="LightGray">
                     <Label Margin="10,0,0,0"
                            Text="Monkeys"
                            FontSize="12"
                            FontAttributes="Bold" />
-                </StackLayout>
+                </VerticalStackLayout>
             </ListView.Header>
             <ListView.Footer>
-                <StackLayout BackgroundColor="LightGray">
+                <VerticalStackLayout BackgroundColor="LightGray">
                     <Label Margin="10,0,0,0"
                            Text="Friends of Monkey"
                            FontSize="12"
                            FontAttributes="Bold" />
-                </StackLayout>
+                </VerticalStackLayout>
             </ListView.Footer>
             <ListView.ItemTemplate>
                 <DataTemplate>
@@ -51,5 +51,5 @@
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/GeocoderPage.xaml b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/GeocoderPage.xaml
index 740f28b3c..163a6f3e3 100644
--- a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/GeocoderPage.xaml
+++ b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/GeocoderPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="WorkingWithMaps.Views.GeocoderPage"
              Title="Geocoder demo">
-	<StackLayout Margin="10">
+	<VerticalStackLayout Margin="10">
 		<Label Text="Geocode:" />
 		<Entry x:Name="geocodeEntry" Text="Pacific Ave, San Francisco, California" />
 		<Button Text="Geocode" Clicked="OnGeocodeButtonClicked" />
@@ -12,5 +12,5 @@
 		<Entry x:Name="reverseGeocodeEntry" Text="37.8044866, -122.4324132" />
 		<Button Text="Reverse Geocode" Clicked="OnReverseGeocodeButtonClicked" />
 		<Label x:Name="reverseGeocodedOutputLabel" />
-	</StackLayout>	
+	</VerticalStackLayout>	
 </ContentPage>
diff --git a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapAppPage.xaml b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapAppPage.xaml
index b8021516d..207b2f72f 100644
--- a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapAppPage.xaml
+++ b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapAppPage.xaml
@@ -3,11 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="WorkingWithMaps.Views.MapAppPage"
              Title="Native map app demo">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label Text="These buttons launch the built-in Maps app for the platform." />
         <Button Text="Open location using Maps app"
                 Clicked="OnLocationButtonClicked" />
         <Button Text="Get directions using Maps app"
                 Clicked="OnDirectionButtonClicked" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapPropertiesPage.xaml b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapPropertiesPage.xaml
index 475bd2ad6..bd744c0c4 100644
--- a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapPropertiesPage.xaml
+++ b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapPropertiesPage.xaml
@@ -4,7 +4,7 @@
              xmlns:maps="http://schemas.microsoft.com/dotnet/2021/maui/maps"
              x:Class="WorkingWithMaps.Views.MapPropertiesPage"
              Title="Map properties demo">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <maps:Map x:Name="map"
                   MapClicked="OnMapClicked" />
         <Grid ColumnDefinitions="0.8*,0.2*"
@@ -36,5 +36,5 @@
                       x:Name="showTrafficCheckBox"
                       CheckedChanged="OnCheckBoxCheckedChanged" />
         </Grid>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapRegionPage.xaml b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapRegionPage.xaml
index 3b65553c1..0d2581549 100644
--- a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapRegionPage.xaml
+++ b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapRegionPage.xaml
@@ -5,7 +5,7 @@
              xmlns:sensors="clr-namespace:Microsoft.Maui.Devices.Sensors;assembly=Microsoft.Maui.Essentials"
              x:Class="WorkingWithMaps.Views.MapRegionPage"
              Title="Map region demo">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <maps:Map>
             <x:Arguments>
                 <maps:MapSpan>
@@ -22,6 +22,6 @@
                 </maps:MapSpan>
             </x:Arguments>
         </maps:Map>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
     
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapTypesPage.xaml b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapTypesPage.xaml
index 22db54806..d2cdf5a9e 100644
--- a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapTypesPage.xaml
+++ b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/MapTypesPage.xaml
@@ -4,14 +4,14 @@
              xmlns:maps="http://schemas.microsoft.com/dotnet/2021/maui/maps"
              x:Class="WorkingWithMaps.Views.MapTypesPage"
              Title="Map types demo">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <maps:Map x:Name="map" />
         <Slider Margin="20,0,20,0"
                 Maximum="18"
                 Minimum="1"
                 Value="12"
                 ValueChanged="OnSliderValueChanged" />
-        <StackLayout Orientation="Horizontal"
+        <HorizontalStackLayout
                      HorizontalOptions="Center"
                      Spacing="30">
             <Button Text="Street"
@@ -20,6 +20,6 @@
                     Clicked="OnButtonClicked" />
             <Button Text="Hybrid"
                     Clicked="OnButtonClicked" />
-        </StackLayout>
-    </StackLayout>
+        </HorizontalStackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/PinItemsSourcePage.xaml b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/PinItemsSourcePage.xaml
index d8916db87..d0c7bdf77 100644
--- a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/PinItemsSourcePage.xaml
+++ b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/PinItemsSourcePage.xaml
@@ -43,8 +43,7 @@
         </maps:Map>
         <ScrollView Grid.Row="1"
                     Orientation="Horizontal">
-            <StackLayout Orientation="Horizontal"
-                         HorizontalOptions="Center">
+            <HorizontalStackLayout HorizontalOptions="Center">
                 <Button Text="Add"
                         Command="{Binding AddLocationCommand}" />
                 <Button Text="Remove"
@@ -55,7 +54,7 @@
                         Command="{Binding UpdateLocationsCommand}" />
                 <Button Text="Replace"
                         Command="{Binding ReplaceLocationCommand}" />
-            </StackLayout>
+            </HorizontalStackLayout>
         </ScrollView>
     </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/PinPage.xaml b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/PinPage.xaml
index df36dcfc8..afca4c1bd 100644
--- a/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/PinPage.xaml
+++ b/8.0/UserInterface/Views/Map/MapDemo/WorkingWithMaps/Views/PinPage.xaml
@@ -5,7 +5,7 @@
              xmlns:sensors="clr-namespace:Microsoft.Maui.Devices.Sensors;assembly=Microsoft.Maui.Essentials"
              x:Class="WorkingWithMaps.Views.PinPage"
              Title="Pins demo">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <maps:Map x:Name="map">
             <x:Arguments>
                 <maps:MapSpan>
@@ -38,5 +38,5 @@
         </maps:Map>
         <Button Text="Add more pins"
                 Clicked="OnButtonClicked" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/BasicRadioButtonsPage.xaml b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/BasicRadioButtonsPage.xaml
index 9f48dfc91..bf55f901b 100644
--- a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/BasicRadioButtonsPage.xaml
+++ b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/BasicRadioButtonsPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="RadioButtonDemos.BasicRadioButtonsPage"
              Title="Basic RadioButtons demo">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label Text="What's your favorite animal?" />
         <!-- RadioButtons with no group name are mutually exclusive at the parent level. -->
         <RadioButton Content="Cat"
@@ -18,7 +18,7 @@
         <Label x:Name="animalLabel"
                Text="You have chosen: Monkey" />
         <Label Text="What's your favorite animal?" />
-        <StackLayout>
+        <VerticalStackLayout>
             <RadioButton Value="Cat"
                          CheckedChanged="OnAnimalImageRadioButtonCheckedChanged">
                 <RadioButton.Content>
@@ -43,8 +43,8 @@
                     <Image Source="monkey.png" />
                 </RadioButton.Content>
             </RadioButton>
-        </StackLayout>
+        </VerticalStackLayout>
         <Label x:Name="animalImageLabel"
                Text="You have chosen:" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/BasicRadioButtonsVisualStatePage.xaml b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/BasicRadioButtonsVisualStatePage.xaml
index 9dc18cbdc..62e6d72f5 100644
--- a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/BasicRadioButtonsVisualStatePage.xaml
+++ b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/BasicRadioButtonsVisualStatePage.xaml
@@ -29,7 +29,7 @@
             </Setter>
         </Style>
     </ContentPage.Resources>
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label Text="What's your favorite mode of transport?" />
         <RadioButton Content="Car"
                      CheckedChanged="OnRadioButtonCheckedChanged" />
@@ -41,5 +41,5 @@
                      CheckedChanged="OnRadioButtonCheckedChanged" />
         <Label x:Name="resultLabel"
                Text="You have chosen:" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/GroupedRadioButtonsPage.xaml b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/GroupedRadioButtonsPage.xaml
index 4ec191244..0dec070bb 100644
--- a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/GroupedRadioButtonsPage.xaml
+++ b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/GroupedRadioButtonsPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="RadioButtonDemos.GroupedRadioButtonsPage"
              Title="Grouped RadioButtons demo">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label Text="What's your favorite color?" />
         <RadioButton Content="Red"
                      GroupName="colors"
@@ -23,7 +23,7 @@
         <Label x:Name="colorLabel"
                Text="You have chosen:" />
         <Label Text="What's your favorite fruit?" />
-        <StackLayout RadioButtonGroup.GroupName="fruits">
+        <VerticalStackLayout RadioButtonGroup.GroupName="fruits">
             <!-- All of the RadioButtons in this StackLayout will automatically be given the
                  GroupName 'fruits' -->
             <RadioButton Content="Apple"
@@ -34,9 +34,9 @@
                          CheckedChanged="OnFruitsRadioButtonCheckedChanged" />
             <RadioButton Content="Other"
                          CheckedChanged="OnFruitsRadioButtonCheckedChanged" />
-        </StackLayout>
+        </VerticalStackLayout>
         <Label x:Name="fruitLabel"
                Text="You have chosen:" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
 
diff --git a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/GroupedRadioButtonsViewModelPage.xaml b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/GroupedRadioButtonsViewModelPage.xaml
index dfca2d2b0..b510107f6 100644
--- a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/GroupedRadioButtonsViewModelPage.xaml
+++ b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/GroupedRadioButtonsViewModelPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="RadioButtonDemos.GroupedRadioButtonsViewModelPage"
              Title="Grouped RadioButtons ViewModel demo">
-    <StackLayout Margin="10"
+    <VerticalStackLayout Margin="10"
                  RadioButtonGroup.GroupName="{Binding GroupName}"
                  RadioButtonGroup.SelectedValue="{Binding Selection}">
         <Label Text="What's your favorite animal?" />
@@ -23,5 +23,5 @@
                 </FormattedString>
             </Label.FormattedText>
         </Label>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/RadioButtonControlTemplatePage.xaml b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/RadioButtonControlTemplatePage.xaml
index adebdce1c..1b436dc05 100644
--- a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/RadioButtonControlTemplatePage.xaml
+++ b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/RadioButtonControlTemplatePage.xaml
@@ -70,64 +70,63 @@
         </Style>
     </ContentPage.Resources>
 
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label Text="What's your favorite animal?" />
-        <StackLayout RadioButtonGroup.GroupName="animals"
-                     Orientation="Horizontal">
+        <HorizontalStackLayout RadioButtonGroup.GroupName="animals">
             <RadioButton Value="Cat"
                          CheckedChanged="OnAnimalRadioButtonCheckedChanged">
                 <RadioButton.Content>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Image Source="cat.png"
                                HorizontalOptions="Center"
                                VerticalOptions="Center" />
                         <Label Text="Cat"
                                HorizontalOptions="Center"
                                VerticalOptions="End" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </RadioButton.Content>
             </RadioButton>
             <RadioButton Value="Dog"
                          CheckedChanged="OnAnimalRadioButtonCheckedChanged">
                 <RadioButton.Content>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Image Source="dog.png"
                                HorizontalOptions="Center"
                                VerticalOptions="Center" />
                         <Label Text="Dog"
                                HorizontalOptions="Center"
                                VerticalOptions="End" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </RadioButton.Content>
             </RadioButton>
             <RadioButton Value="Elephant"
                          CheckedChanged="OnAnimalRadioButtonCheckedChanged">
                 <RadioButton.Content>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Image Source="elephant.png"
                                HorizontalOptions="Center"
                                VerticalOptions="Center" />
                         <Label Text="Elephant"
                                HorizontalOptions="Center"
                                VerticalOptions="End" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </RadioButton.Content>
             </RadioButton>
             <RadioButton Value="Monkey"
                          CheckedChanged="OnAnimalRadioButtonCheckedChanged">
                 <RadioButton.Content>
-                    <StackLayout>
+                    <VerticalStackLayout>
                         <Image Source="monkey.png"
                                HorizontalOptions="Center"
                                VerticalOptions="Center" />
                         <Label Text="Monkey"
                                HorizontalOptions="Center"
                                VerticalOptions="End" />
-                    </StackLayout>
+                    </VerticalStackLayout>
                 </RadioButton.Content>
             </RadioButton>
-        </StackLayout>
+        </HorizontalStackLayout>
         <Label x:Name="animalLabel"
                Text="You have chosen:" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/RadioButtonsExplainedPage.xaml b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/RadioButtonsExplainedPage.xaml
index 8355d2dfc..f4f85fc11 100644
--- a/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/RadioButtonsExplainedPage.xaml
+++ b/8.0/UserInterface/Views/RadioButtonDemos/RadioButtonDemos/Views/RadioButtonsExplainedPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="RadioButtonDemos.RadioButtonsExplainedPage"
              Title="RadioButton Content demos">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Label Text="When RadioButton.Content is a string, it will be translated to text on each platform:" />
         <RadioButton Content="RadioButton containing a string" />
 
@@ -13,11 +13,11 @@
                 <!-- iOS and UWP can assign a View to RadioButton.Content. -->
                 <RadioButton>
                     <RadioButton.Content>
-                        <StackLayout Orientation="Horizontal">
+                        <HorizontalStackLayout>
                             <Image Source="monkey.png" />
                             <Label Text="Monkey"
                                     VerticalTextAlignment="Center" />
-                        </StackLayout>
+                        </HorizontalStackLayout>
                     </RadioButton.Content>
                 </RadioButton>
             </On>
@@ -40,5 +40,5 @@
                 <Image Source="cat.png" />
             </RadioButton.Content>
         </RadioButton>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/RefreshViewDemo/RefreshViewDemo/MainPage.xaml b/8.0/UserInterface/Views/RefreshViewDemo/RefreshViewDemo/MainPage.xaml
index e5ac41e24..ee702884b 100644
--- a/8.0/UserInterface/Views/RefreshViewDemo/RefreshViewDemo/MainPage.xaml
+++ b/8.0/UserInterface/Views/RefreshViewDemo/RefreshViewDemo/MainPage.xaml
@@ -17,7 +17,7 @@
 			</Grid>
 		</DataTemplate>
 	</ContentPage.Resources>
-	<StackLayout Margin="10,35,10,10">
+	<VerticalStackLayout Margin="10,35,10,10">
 		<Label Text="RefreshView Demo"
                FontAttributes="Bold"
                HorizontalOptions="Center" />
@@ -35,5 +35,5 @@
                             BindableLayout.ItemTemplate="{StaticResource ColorItemTemplate}" />
 			</ScrollView>
 		</RefreshView>
-	</StackLayout>	
+	</VerticalStackLayout>	
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ScrollViewDemos/ScrollViewDemos/Views/XAML/BlackCatPage.xaml b/8.0/UserInterface/Views/ScrollViewDemos/ScrollViewDemos/Views/XAML/BlackCatPage.xaml
index 2c8fe3fe8..a26cb104d 100644
--- a/8.0/UserInterface/Views/ScrollViewDemos/ScrollViewDemos/Views/XAML/BlackCatPage.xaml
+++ b/8.0/UserInterface/Views/ScrollViewDemos/ScrollViewDemos/Views/XAML/BlackCatPage.xaml
@@ -13,7 +13,7 @@
                     Grid.Row="1"
                     VerticalOptions="Fill"
                     Scrolled="OnScrollViewScrolled">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="FOR the most wild, yet most homely narrative which I am about to pen, I neither expect nor solicit belief. Mad indeed would I be to expect it, in a case where my very senses reject their own evidence. Yet, mad am I not -- and very surely do I not dream. But to-morrow I die, and to-day I would unburthen my soul. My immediate purpose is to place before the world, plainly, succinctly, and without comment, a series of mere household events. In their consequences, these events have terrified -- have tortured -- have destroyed me. Yet I will not attempt to expound them. To me, they have presented little but Horror -- to many they will seem less terrible than barroques. Hereafter, perhaps, some intellect may be found which will reduce my phantasm to the common-place -- some intellect more calm, more logical, and far less excitable than my own, which will perceive, in the circumstances I detail with awe, nothing more than an ordinary succession of very natural causes and effects." />
                 <Label Text="From my infancy I was noted for the docility and humanity of my disposition. My tenderness of heart was even so conspicuous as to make me the jest of my companions. I was especially fond of animals, and was indulged by my parents with a great variety of pets. With these I spent most of my time, and never was so happy as when feeding and caressing them. This peculiarity of character grew with my growth, and, in my manhood, I derived from it one of my principal sources of pleasure. To those who have cherished an affection for a faithful and sagacious dog, I need hardly be at the trouble of explaining the nature or the intensity of the gratification thus derivable. There is something in the unselfish and self-sacrificing love of a brute, which goes directly to the heart of him who has had frequent occasion to test the paltry friendship and gossamer fidelity of mere Man." />
                 <Label Text="I married early, and was happy to find in my wife a disposition not uncongenial with my own. Observing my partiality for domestic pets, she lost no opportunity of procuring those of the most agreeable kind. We had birds, gold-fish, a fine dog, rabbits, a small monkey, and a cat." />
@@ -24,7 +24,7 @@
                 <Label Text="When reason returned with the morning -- when I had slept off the fumes of the night's debauch -- I experienced a sentiment half of horror, half of remorse, for the crime of which I had been guilty; but it was, at best, a feeble and equivocal feeling, and the soul remained untouched. I again plunged into excess, and soon drowned in wine all memory of the deed." />
                 <Label x:Name="finalLabel"
                        Text="In the meantime the cat slowly recovered. The socket of the lost eye presented, it is true, a frightful appearance, but he no longer appeared to suffer any pain. He went about the house as usual, but, as might be expected, fled in extreme terror at my approach. I had so much of my old heart left, as to be at first grieved by this evident dislike on the part of a creature which had once so loved me. But this feeling soon gave place to irritation. And then came, as if to my final and irrevocable overthrow, the spirit of PERVERSENESS. Of this spirit philosophy takes no account. Yet I am not more sure that my soul lives, than I am that perverseness is one of the primitive impulses of the human heart -- one of the indivisible primary faculties, or sentiments, which give direction to the character of Man. Who has not, a hundred times, found himself committing a vile or a silly action, for no other reason than because he knows he should not? Have we not a perpetual inclination, in the teeth of our best judgment, to violate that which is Law, merely because we understand it to be such? This spirit of perverseness, I say, came to my final overthrow. It was this unfathomable longing of the soul to vex itself -- to offer violence to its own nature -- to do wrong for the wrong's sake only -- that urged me to continue and finally to consummate the injury I had inflicted upon the unoffending brute. One morning, in cool blood, I slipped a noose about its neck and hung it to the limb of a tree; -- hung it with the tears streaming from my eyes, and with the bitterest remorse at my heart; -- hung it because I knew that it had loved me, and because I felt it had given me no reason of offence; -- hung it because I knew that in so doing I was committing a sin -- a deadly sin that would so jeopardize my immortal soul as to place it -- if such a thing were possible -- even beyond the reach of the infinite mercy of the Most Merciful and Most Terrible God." />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
         <Button Grid.Row="2"
                 Text="Scroll to end"
diff --git a/8.0/UserInterface/Views/ScrollViewDemos/ScrollViewDemos/Views/XAML/ColorListPage.xaml b/8.0/UserInterface/Views/ScrollViewDemos/ScrollViewDemos/Views/XAML/ColorListPage.xaml
index befb65387..7174afd29 100644
--- a/8.0/UserInterface/Views/ScrollViewDemos/ScrollViewDemos/Views/XAML/ColorListPage.xaml
+++ b/8.0/UserInterface/Views/ScrollViewDemos/ScrollViewDemos/Views/XAML/ColorListPage.xaml
@@ -5,10 +5,10 @@
              x:Class="ScrollViewDemos.Views.XAML.ColorListPage"
              Title="ScrollView demo">
     <ScrollView Margin="20">
-        <StackLayout BindableLayout.ItemsSource="{x:Static local:NamedColor.All}">
+        <VerticalStackLayout BindableLayout.ItemsSource="{x:Static local:NamedColor.All}">
             <BindableLayout.ItemTemplate>
                 <DataTemplate>
-                    <StackLayout Orientation="Horizontal">
+                    <HorizontalStackLayout>
                         <BoxView Color="{Binding Color}"
                                  HeightRequest="32"
                                  WidthRequest="32"
@@ -16,9 +16,9 @@
                         <Label Text="{Binding FriendlyName}"
                                FontSize="24"
                                VerticalOptions="Center" />
-                    </StackLayout>
+                    </HorizontalStackLayout>
                 </DataTemplate>
             </BindableLayout.ItemTemplate>
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/BrushesDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/BrushesDemoPage.xaml
index f4ef52bd1..0a79ef5c8 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/BrushesDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/BrushesDemoPage.xaml
@@ -47,7 +47,7 @@
     </ContentPage.Resources>
 
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="Ellipse with a LinearGradientBrush" />
             <Ellipse Stroke="{StaticResource LinearGradientBrushStroke}"
                      Fill="{StaticResource LinearGradientBrushFill}"
@@ -96,6 +96,6 @@
                   HorizontalOptions="Start"
                   HeightRequest="100"
                   WidthRequest="100" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/ClipDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/ClipDemoPage.xaml
index 6311e3f37..7a7a4ce8b 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/ClipDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/ClipDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ShapesDemos.Views.ClipDemoPage"
              Title="Clipping demos">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="Unclipped image" />
             <Image Source="monkeyface.png" />
             <Label Text="Clipped image with RectangleGeometry" />
@@ -53,6 +53,6 @@
                     <PathGeometry Figures="M 75.6446,45 C 72.2146,45.0073 68.857,46.9543 67.1304,49.9245 L 40.2748,96.5755 C 38.5751,99.5537 38.5751,103.446 40.2748,106.424 L 67.1304,153.076 C 68.8572,156.046 72.2146,157.993 75.6446,158 L 129.355,158 C 132.785,157.993 136.143,156.046 137.87,153.076 L 164.725,106.424 C 166.425,103.446 166.425,99.5537 164.725,96.5755 L 137.87,49.9245 C 136.143,46.9543 132.785,45.0067 129.355,45 L 75.6446,45 75.6446,45 Z M 76.132,72.2914 C 76.2058,72.2841 76.2832,72.2841 76.3572,72.2914 L 85.6215,72.2914 C 86.0316,72.2999 86.4294,72.5369 86.6342,72.8929 L 102.35,100.899 C 102.429,101.037 102.48,101.191 102.499,101.35 102.519,101.191 102.57,101.037 102.649,100.899 L 118.327,72.8929 C 118.538,72.5261 118.955,72.2878 119.377,72.2914 L 128.641,72.2914 C 129.462,72.2987 130.076,73.332 129.692,74.0582 L 114.351,101.5 129.692,128.904 C 130.113,129.635 129.483,130.716 128.641,130.709 L 119.377,130.709 C 118.947,130.705 118.528,130.45 118.327,130.07 L 102.649,102.064 C 102.57,101.925 102.519,101.771 102.499,101.613 102.48,101.771 102.429,101.925 102.35,102.064 L 86.6342,130.07 C 86.4387,130.439 86.0388,130.692 85.6215,130.709 L 76.3572,130.709 C 75.5156,130.716 74.8863,129.635 75.3071,128.904 L 90.6476,101.5 75.3071,74.0582 C 74.9394,73.3956 75.388,72.4329 76.132,72.2914 L 76.132,72.2914 Z" />
                 </Image.Clip>
             </Image>
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/EllipseDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/EllipseDemoPage.xaml
index f37f5841a..3d0d816c1 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/EllipseDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/EllipseDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ShapesDemos.Views.EllipseDemoPage"
              Title="Ellipse demos">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="Filled ellipse" />
             <Ellipse Fill="Red"
                      WidthRequest="150"
@@ -38,6 +38,6 @@
                      WidthRequest="150"
                      HeightRequest="50"
                      HorizontalOptions="Start" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/LineDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/LineDemoPage.xaml
index cbb6ec6a1..716e05b8b 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/LineDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/LineDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ShapesDemos.Views.LineDemoPage"
              Title="Line demos">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="Line" />
             <Line X1="40"
                   Y1="0"
@@ -51,6 +51,6 @@
                   StrokeLineCap="Round"
                   Stroke="Red"
                   StrokeThickness="12" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathAspectDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathAspectDemoPage.xaml
index e63fc519d..6ac882517 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathAspectDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathAspectDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ShapesDemos.Views.PathAspectDemoPage"
              Title="Path aspect demo page">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="None" />
             <Path Aspect="None"
                   Stroke="Yellow"
@@ -41,6 +41,6 @@
                   HeightRequest="100"
                   WidthRequest="100"
                   Data="M8.0886959,0L8.687694,0C12.279728,0.2989963 14.275696,2.2949993 15.971676,4.9890003 16.271724,4.5899982 16.470699,4.1909961 16.670711,3.8920001 18.765678,0.89799553 23.056684,-1.0980074 27.247655,0.79800445 28.544711,1.3970038 29.842683,2.2949993 30.740692,3.5919966 31.239652,4.3909931 31.837675,5.6880059 31.93765,6.8849973 32.336696,10.677006 30.740692,13.470998 29.442659,15.866003L26.648658,15.866003C26.149696,15.168005 26.050697,14.069998 25.351663,13.571004 24.453716,14.369009 24.353679,15.966009 23.75572,17.064001 23.156721,17.263006 22.457687,16.96401 21.759691,17.163 21.260667,17.761999 20.960681,19.359001 20.761707,20.257011 20.761707,19.458 20.561695,17.761999 20.462695,16.664007 20.262683,14.668997 20.162708,12.472997 19.963674,10.278004 19.863698,9.3800086 19.963674,8.1830015 19.164724,8.1830015 18.566703,8.1830015 18.466728,9.3800086 18.466728,9.9790077 18.266715,12.07401 17.867731,14.27001 17.468683,16.465002 16.969722,15.467001 16.670711,14.27001 16.171687,14.27001 15.57269,14.668997 15.27368,15.36701 14.973692,15.966009L13.975708,15.966009C13.876709,15.666998 13.576723,15.567007 13.277712,15.567007 12.878725,15.567007 12.47974,15.966009 12.47974,16.465002 12.47974,16.96401 12.878725,17.362997 13.277712,17.362997 13.476686,17.362997 13.776735,17.263006 13.876709,17.064001 14.375732,17.163 15.073729,17.064001 15.57269,17.064001 15.871701,16.664007 15.971676,16.265005 16.171687,15.966009 16.76971,16.763998 16.670711,18.161003 17.767694,18.660011 18.166679,18.361 18.266715,17.961998 18.366691,17.463003 18.566703,16.066 18.865714,14.569006 19.065725,13.071996 19.065725,12.873006 19.164724,11.675008 19.264699,11.375997 19.464712,14.069998 19.763723,17.761999 19.963674,20.556007 20.062671,21.354011 20.262683,21.554008 20.861682,21.953011 21.360704,21.554008 21.459703,21.454002 21.659715,20.855003 21.958665,20.157005 22.0587,19.359001 22.258712,18.560005 22.757675,18.461006 23.75572,18.760002 24.353679,18.461006 24.852703,17.662008 25.052713,16.364996 25.4517,15.567007 25.750711,16.066 25.950662,16.763998 26.249671,17.163L28.844699,17.163C28.445651,17.761999 27.846654,18.361 27.447667,18.760002 24.253703,22.352013 20.162708,25.545008 16.071712,27.641001 10.982733,24.84701 5.6937417,20.955009 2.4007186,15.567007 0.90371192,13.071996 -0.79226869,8.9810066 0.40475065,5.3889946 0.60476232,4.8900012 0.90371192,4.4899921 1.2037603,3.9909992 2.4007183,1.7959909 5.0947441,2.1702817E-07 8.0886959,0z" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathDemoPage.xaml
index 4a160be24..1947c11e2 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ShapesDemos.Views.PathDemoPage"
              Title="Path demos">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="Path" />
             <Path Data="M 10,50 L 200,70"
                   Stroke="Black"
@@ -35,6 +35,6 @@
                   TranslationX="-30"
                   TranslationY="-30"
                   Data="M 75.6446,45 C 72.2146,45.0073 68.857,46.9543 67.1304,49.9245 L 40.2748,96.5755 C 38.5751,99.5537 38.5751,103.446 40.2748,106.424 L 67.1304,153.076 C 68.8572,156.046 72.2146,157.993 75.6446,158 L 129.355,158 C 132.785,157.993 136.143,156.046 137.87,153.076 L 164.725,106.424 C 166.425,103.446 166.425,99.5537 164.725,96.5755 L 137.87,49.9245 C 136.143,46.9543 132.785,45.0067 129.355,45 L 75.6446,45 75.6446,45 Z M 76.132,72.2914 C 76.2058,72.2841 76.2832,72.2841 76.3572,72.2914 L 85.6215,72.2914 C 86.0316,72.2999 86.4294,72.5369 86.6342,72.8929 L 102.35,100.899 C 102.429,101.037 102.48,101.191 102.499,101.35 102.519,101.191 102.57,101.037 102.649,100.899 L 118.327,72.8929 C 118.538,72.5261 118.955,72.2878 119.377,72.2914 L 128.641,72.2914 C 129.462,72.2987 130.076,73.332 129.692,74.0582 L 114.351,101.5 129.692,128.904 C 130.113,129.635 129.483,130.716 128.641,130.709 L 119.377,130.709 C 118.947,130.705 118.528,130.45 118.327,130.07 L 102.649,102.064 C 102.57,101.925 102.519,101.771 102.499,101.613 102.48,101.771 102.429,101.925 102.35,102.064 L 86.6342,130.07 C 86.4387,130.439 86.0388,130.692 85.6215,130.709 L 76.3572,130.709 C 75.5156,130.716 74.8863,129.635 75.3071,128.904 L 90.6476,101.5 75.3071,74.0582 C 74.9394,73.3956 75.388,72.4329 76.132,72.2914 L 76.132,72.2914 Z" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathGeometryDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathGeometryDemoPage.xaml
index c3397ac53..e4c9b4893 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathGeometryDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathGeometryDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ShapesDemos.Views.PathGeometryDemoPage"
              Title="Path geometry demos">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="EllipseGeometry" />
             <Path Fill="Blue"
                   Stroke="Red">
@@ -338,6 +338,6 @@
                     </GeometryGroup>
                 </Path.Data>
             </Path>
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathRenderTransformDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathRenderTransformDemoPage.xaml
index 997a2b4c9..41aaeee82 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathRenderTransformDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathRenderTransformDemoPage.xaml
@@ -67,7 +67,7 @@
             </Path>
         </Grid>
         <ScrollView Grid.Row="1">
-            <StackLayout>
+            <VerticalStackLayout>
                 <Label Text="RotateTransform"
                        Style="{StaticResource HeaderStyle}" />
                 <Label Text="{Binding Source={x:Reference rotation}, Path=Value, StringFormat='Rotation: {0:F0}'}"
@@ -126,7 +126,7 @@
                 <Slider x:Name="translateY"
                         Minimum="0"
                         Maximum="200" />
-            </StackLayout>
+            </VerticalStackLayout>
         </ScrollView>
     </Grid>
 
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathRenderTransformExamplesDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathRenderTransformExamplesDemoPage.xaml
index 135616720..f645fe3d8 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathRenderTransformExamplesDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PathRenderTransformExamplesDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ShapesDemos.Views.PathRenderTransformExamplesDemoPage"
              Title="Path render transform examples">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="Path with RotateTransform" />
             <Path Stroke="Black"
                   Aspect="Uniform"
@@ -122,6 +122,6 @@
                   WidthRequest="100"
                   RenderTransform="1.5,1,0,1,10,100"
                   Data="M13.908992,16.207977L32.000049,16.207977 32.000049,31.999985 13.908992,30.109983z M0,16.207977L11.904009,16.207977 11.904009,29.900984 0,28.657984z M11.904036,2.0979624L11.904036,14.202982 2.7656555E-05,14.202982 2.7656555E-05,3.3409645z M32.000058,0L32.000058,14.203001 13.909059,14.203001 13.909059,1.8890382z" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PolygonDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PolygonDemoPage.xaml
index 8096be5dd..c46363665 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PolygonDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PolygonDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ShapesDemos.Views.PolygonDemoPage"
              Title="Polygon demos">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="Polygon" />
             <Polygon Points="40,10 70,80 10,50"
                      Fill="AliceBlue"
@@ -29,6 +29,6 @@
                      FillRule="Nonzero"
                      Stroke="Yellow"
                      StrokeThickness="3" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PolylineDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PolylineDemoPage.xaml
index d4f2eea0d..a260fb22a 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PolylineDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/PolylineDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ShapesDemos.Views.PolylineDemoPage"
              Title="Polyline demos">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="Polyline" />
             <Polyline Points="0,0 10,30, 15,0 18,60 23,30 35,30 40,0 43,60 48,30 100,30"
                       Stroke="Red" />
@@ -41,6 +41,6 @@
                       Stroke="DarkBlue"
                       StrokeThickness="20"
                       StrokeLineJoin="Round" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/RectangleDemoPage.xaml b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/RectangleDemoPage.xaml
index d162794b5..d81dd4356 100644
--- a/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/RectangleDemoPage.xaml
+++ b/8.0/UserInterface/Views/ShapesDemos/ShapesDemos/Views/RectangleDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="ShapesDemos.Views.RectangleDemoPage"
              Title="Rectangle demos">
     <ScrollView>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Label Text="Filled rectangle" />
             <Rectangle Fill="Red"
                        WidthRequest="150"
@@ -47,6 +47,6 @@
                        WidthRequest="200"
                        HeightRequest="100"
                        HorizontalOptions="Start" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewCustomItemPage.xaml b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewCustomItemPage.xaml
index 8b3568d6b..5daa422eb 100644
--- a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewCustomItemPage.xaml
+++ b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewCustomItemPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="SwipeViewDemos.SwipeViewCustomItemPage"
              Title="Custom SwipeViewItem demo">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="Questions"
                FontAttributes="Bold"
                HorizontalOptions="Center" />
@@ -47,7 +47,7 @@
                 <SwipeItems>
                     <SwipeItemView Command="{Binding CheckAnswerCommand}"
                                    CommandParameter="{Binding Source={x:Reference resultEntry}, Path=Text}">
-                        <StackLayout Margin="10"
+                        <VerticalStackLayout Margin="10"
                                      WidthRequest="300">
                             <Entry x:Name="resultEntry"
                                    Placeholder="Enter answer"
@@ -55,7 +55,7 @@
                             <Label Text="Check"
                                    FontAttributes="Bold"
                                    HorizontalOptions="Center" />
-                        </StackLayout>
+                        </VerticalStackLayout>
                     </SwipeItemView>
                 </SwipeItems>
             </SwipeView.LeftItems>
@@ -68,5 +68,5 @@
             </Grid>
         </SwipeView>
 
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewDirectionPage.xaml b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewDirectionPage.xaml
index 4ac164ed6..b5b3741dd 100644
--- a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewDirectionPage.xaml
+++ b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewDirectionPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="SwipeViewDemos.SwipeViewDirectionPage"
              Title="SwipeView swipe direction demo">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
          <SwipeView>
             <SwipeView.RightItems>
                 <SwipeItems>
@@ -115,5 +115,5 @@
                        VerticalOptions="Center" />
             </Grid>
         </SwipeView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewEventsPage.xaml b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewEventsPage.xaml
index 75917df47..63f1bff56 100644
--- a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewEventsPage.xaml
+++ b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewEventsPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="SwipeViewDemos.SwipeViewEventsPage"
              Title="SwipeView events demo">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <SwipeView x:Name="swipeView"
                    SwipeStarted="OnSwipeStarted"
                    SwipeChanging="OnSwipeChanging"
@@ -31,5 +31,5 @@
         </SwipeView>
         <Button Text="Close Swipe"
                 Clicked="OnCloseButtonClicked" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewModeBehaviorPage.xaml b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewModeBehaviorPage.xaml
index 5e8911ae6..83f0a0f77 100644
--- a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewModeBehaviorPage.xaml
+++ b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewModeBehaviorPage.xaml
@@ -4,25 +4,23 @@
              xmlns:controls="clr-namespace:SwipeViewDemos.Controls"
              x:Class="SwipeViewDemos.SwipeViewModeBehaviorPage"
              Title="SwipeView mode and behavior demo">
-    <StackLayout Margin="20">
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+    <VerticalStackLayout Margin="20">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="SwipeMode:"
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="modeEnumPicker"
                                  EnumType="{x:Type SwipeMode}"
                                  SelectedIndex="0"
                                  SelectedIndexChanged="OnSwipeViewModeChanged" />
-        </StackLayout>
-        <StackLayout Orientation="Horizontal"
-                     HorizontalOptions="Center">
+        </HorizontalStackLayout>
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Label Text="SwipeBehaviorOnInvoked:"
                    VerticalTextAlignment="Center" />
             <controls:EnumPicker x:Name="behaviorEnumPicker"
                                  EnumType="{x:Type SwipeBehaviorOnInvoked}"
                                  SelectedIndex="0"
                                  SelectedIndexChanged="OnSwipeViewBehaviorChanged" />
-        </StackLayout>
+        </HorizontalStackLayout>
         <SwipeView x:Name="swipeView1">
             <SwipeView.LeftItems>
                 <SwipeItems>
@@ -61,5 +59,5 @@
                        VerticalOptions="Center" />
             </Grid>
         </SwipeView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewProgrammaticPage.xaml b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewProgrammaticPage.xaml
index 8c8259b8b..14c007644 100644
--- a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewProgrammaticPage.xaml
+++ b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewProgrammaticPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="SwipeViewDemos.SwipeViewProgrammaticPage"
              Title="SwipeView open and close demo">
-    <StackLayout Margin="10">
+    <VerticalStackLayout Margin="10">
         <Button Text="Open SwipeView"
                 Clicked="OnOpenSwipeViewClicked" />
         <Button Text="Close SwipeView"
@@ -29,5 +29,5 @@
                        VerticalOptions="Center" />
             </Grid>
         </SwipeView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewResourcePage.xaml b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewResourcePage.xaml
index aab32596d..e61dea882 100644
--- a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewResourcePage.xaml
+++ b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewResourcePage.xaml
@@ -15,7 +15,7 @@
                        Invoked="OnDeleteSwipeItemInvoked" />
         </SwipeItems>
     </ContentPage.Resources>
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <SwipeView LeftItems="{StaticResource SwipeItems}">
             <Grid HeightRequest="60"
                   WidthRequest="300"
@@ -34,5 +34,5 @@
                        VerticalOptions="Center" />
             </Grid>
         </SwipeView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewThresholdPage.xaml b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewThresholdPage.xaml
index 34bde064c..d5f23b7e8 100644
--- a/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewThresholdPage.xaml
+++ b/8.0/UserInterface/Views/SwipeViewDemos/SwipeViewDemos/Views/SwipeViewThresholdPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="SwipeViewDemos.SwipeViewThresholdPage"
              Title="SwipeView threshold demo">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="Use the Slider to set the SwipeView threshold." />
         <Slider x:Name="slider"
                 Maximum="200"
@@ -32,5 +32,5 @@
                        VerticalOptions="Center" />
             </Grid>
         </SwipeView>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/SwitchDemos/SwitchDemos/Views/SwitchXamlPage.xaml b/8.0/UserInterface/Views/SwitchDemos/SwitchDemos/Views/SwitchXamlPage.xaml
index 70931ee42..4da68b54b 100644
--- a/8.0/UserInterface/Views/SwitchDemos/SwitchDemos/Views/SwitchXamlPage.xaml
+++ b/8.0/UserInterface/Views/SwitchDemos/SwitchDemos/Views/SwitchXamlPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="SwitchDemos.SwitchXamlPage"
              Title="Switch XAML Demo">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label x:Name="switchStateLabel"
                 Text="The switch is off"
                 VerticalOptions="Center" 
@@ -15,5 +15,5 @@
                 ThumbColor="Green"
                 VerticalOptions="Center"
                 HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/UserInterface/Views/TwoPaneView/MainPage.xaml b/8.0/UserInterface/Views/TwoPaneView/MainPage.xaml
index fd6c33978..f3f641b9a 100644
--- a/8.0/UserInterface/Views/TwoPaneView/MainPage.xaml
+++ b/8.0/UserInterface/Views/TwoPaneView/MainPage.xaml
@@ -14,7 +14,7 @@
         <foldable:TwoPaneView.Pane1
             BackgroundColor="#dddddd">
             <Frame BorderColor="Red">
-                <StackLayout BackgroundColor="Blue"
+                <VerticalStackLayout BackgroundColor="Blue"
                                  Orientation="Vertical"
                                  VerticalOptions="StartAndExpand"
                                  Padding="5"
@@ -44,7 +44,7 @@
                     <Label Text=""/>
                     <Label Text="Jetpack Window Manager 1.0.0"/>
                     <Button Text="Reset TwoPaneView" Clicked="OnReset" HorizontalOptions="Center"/>
-                </StackLayout>
+                </VerticalStackLayout>
             </Frame>
         </foldable:TwoPaneView.Pane1>
         <foldable:TwoPaneView.Pane2>
diff --git a/8.0/XAML/Fundamentals/XamlSamples/Views/ListViewDemoPage.xaml b/8.0/XAML/Fundamentals/XamlSamples/Views/ListViewDemoPage.xaml
index 4b1ee7172..947a9d26b 100644
--- a/8.0/XAML/Fundamentals/XamlSamples/Views/ListViewDemoPage.xaml
+++ b/8.0/XAML/Fundamentals/XamlSamples/Views/ListViewDemoPage.xaml
@@ -15,19 +15,17 @@
         <ListView.ItemTemplate>
             <DataTemplate>
                 <ViewCell>
-                    <StackLayout Padding="5, 5, 0, 5"
-                                 Orientation="Horizontal"
+                    <HorizontalStackLayout Padding="5, 5, 0, 5"
                                  Spacing="15">
                         <BoxView WidthRequest="{StaticResource boxSize}"
                                  HeightRequest="{StaticResource boxSize}"
                                  Color="{Binding Color}" />
-                        <StackLayout Padding="5, 0, 0, 0"
+                        <VerticalStackLayout Padding="5, 0, 0, 0"
                                      VerticalOptions="Center">
                             <Label Text="{Binding FriendlyName}"
                                    FontAttributes="Bold"
                                    FontSize="14" />
-                            <StackLayout Orientation="Horizontal"
-                                         Spacing="0">
+                            <HorizontalStackLayout Spacing="0">
                                 <Label Text="{Binding Red,
                                        Converter={StaticResource intConverter},
                                        ConverterParameter=255,
@@ -40,9 +38,9 @@
                                        Converter={StaticResource intConverter},
                                        ConverterParameter=255,
                                        StringFormat=', B={0:X2}'}" />
-                            </StackLayout>
-                        </StackLayout>
-                    </StackLayout>
+                            </HorizontalStackLayout>
+                        </VerticalStackLayout>
+                    </HorizontalStackLayout>
                 </ViewCell>
             </DataTemplate>
         </ListView.ItemTemplate>
diff --git a/8.0/XAML/Fundamentals/XamlSamples/Views/OneShotDateTimePage.xaml b/8.0/XAML/Fundamentals/XamlSamples/Views/OneShotDateTimePage.xaml
index 1d3791eb3..c648bd062 100644
--- a/8.0/XAML/Fundamentals/XamlSamples/Views/OneShotDateTimePage.xaml
+++ b/8.0/XAML/Fundamentals/XamlSamples/Views/OneShotDateTimePage.xaml
@@ -3,12 +3,12 @@
              xmlns:sys="clr-namespace:System;assembly=netstandard"
              x:Class="XamlSamples.OneShotDateTimePage"
              Title="One-Shot DateTime Page">
-    <StackLayout BindingContext="{x:Static sys:DateTime.Now}"
+    <VerticalStackLayout BindingContext="{x:Static sys:DateTime.Now}"
                  HorizontalOptions="Center"
                  VerticalOptions="Center">
         <Label Text="{Binding Year, StringFormat='The year is {0}'}" />
         <Label Text="{Binding StringFormat='The month is {0:MMMM}'}" />
         <Label Text="{Binding Day, StringFormat='The day is {0}'}" />
         <Label Text="{Binding StringFormat='The time is {0:T}'}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/XAML/Fundamentals/XamlSamples/Views/SharedResourcesPage.xaml b/8.0/XAML/Fundamentals/XamlSamples/Views/SharedResourcesPage.xaml
index a7918d13c..8ffdaf27e 100644
--- a/8.0/XAML/Fundamentals/XamlSamples/Views/SharedResourcesPage.xaml
+++ b/8.0/XAML/Fundamentals/XamlSamples/Views/SharedResourcesPage.xaml
@@ -18,7 +18,7 @@
         </OnPlatform>
     </ContentPage.Resources>
 
-    <StackLayout>
+    <VerticalStackLayout>
         <Button Text="Do this!"
                 HorizontalOptions="{StaticResource horzOptions}"
                 VerticalOptions="{StaticResource vertOptions}"
@@ -40,5 +40,5 @@
                 Rotation="{StaticResource rotationAngle}"
                 TextColor="{StaticResource textColor}"
                 FontSize="{StaticResource fontSize}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/XAML/Fundamentals/XamlSamples/Views/SliderBindingsPage.xaml b/8.0/XAML/Fundamentals/XamlSamples/Views/SliderBindingsPage.xaml
index 961493e1f..9e9d07ef0 100644
--- a/8.0/XAML/Fundamentals/XamlSamples/Views/SliderBindingsPage.xaml
+++ b/8.0/XAML/Fundamentals/XamlSamples/Views/SliderBindingsPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="XamlSamples.SliderBindingsPage"
              Title="Slider Bindings Page">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="ROTATION"
                BindingContext="{x:Reference slider}"
                Rotation="{Binding Path=Value}"
@@ -19,5 +19,5 @@
                Text="{Binding Value, StringFormat='The angle is {0:F0} degrees'}"
                HorizontalOptions="Center"
                VerticalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/XAML/Fundamentals/XamlSamples/Views/StaticConstantsPage.xaml b/8.0/XAML/Fundamentals/XamlSamples/Views/StaticConstantsPage.xaml
index 9bf95f931..f6fcb4693 100644
--- a/8.0/XAML/Fundamentals/XamlSamples/Views/StaticConstantsPage.xaml
+++ b/8.0/XAML/Fundamentals/XamlSamples/Views/StaticConstantsPage.xaml
@@ -5,7 +5,7 @@
              x:Class="XamlSamples.StaticConstantsPage"
              Title="Static Constants Page"
              Padding="5,25,5,0">
-    <StackLayout>
+    <VerticalStackLayout>
         <Label Text="Hello, XAML!"
                TextColor="Aqua"
                BackgroundColor="Brown"
@@ -18,5 +18,5 @@
                  HorizontalOptions="Center"
                  VerticalOptions="Center"
                  Scale="100" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/XAML/Fundamentals/XamlSamples/Views/XamlPlusCodePage.xaml b/8.0/XAML/Fundamentals/XamlSamples/Views/XamlPlusCodePage.xaml
index a48a6f14e..b9fd50e8f 100644
--- a/8.0/XAML/Fundamentals/XamlSamples/Views/XamlPlusCodePage.xaml
+++ b/8.0/XAML/Fundamentals/XamlSamples/Views/XamlPlusCodePage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="XamlSamples.XamlPlusCodePage"
              Title="XAML + Code Page">
-    <StackLayout>
+    <VerticalStackLayout>
         <Slider VerticalOptions="Center"
                 ValueChanged="OnSliderValueChanged" 
                 Margin="20,0,20,0" />
@@ -16,5 +16,5 @@
                 HorizontalOptions="Center"
                 VerticalOptions="Center"
                 Clicked="OnButtonClicked" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/AppThemeBindingDemoPage.xaml b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/AppThemeBindingDemoPage.xaml
index 0d68b6c69..b8f81be50 100644
--- a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/AppThemeBindingDemoPage.xaml
+++ b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/AppThemeBindingDemoPage.xaml
@@ -11,10 +11,10 @@
         </Style>
     </ContentPage.Resources>
     
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <Label Text="This text is green in light mode, and red in dark mode."
                TextColor="{AppThemeBinding Light=Green, Dark=Red}" />
         <Label Text="This text is black by default, blue in light mode, and teal in dark mode."
                Style="{StaticResource labelStyle}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/FontImageDemoPage.xaml b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/FontImageDemoPage.xaml
index b828349f3..975509b1e 100644
--- a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/FontImageDemoPage.xaml
+++ b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/FontImageDemoPage.xaml
@@ -3,8 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="MarkupExtensions.FontImageDemoPage"
              Title="FontImage Demo">
-    <StackLayout Margin="20,35,20,20">
+    <VerticalStackLayout Margin="20,35,20,20">
         <Image BackgroundColor="#D1D1D1"
                Source="{FontImage &#xf30c;, FontFamily=Ionicons, Size=44}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/HslColorDemoPage.xaml b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/HslColorDemoPage.xaml
index 6c1767933..612105369 100644
--- a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/HslColorDemoPage.xaml
+++ b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/HslColorDemoPage.xaml
@@ -13,7 +13,7 @@
         </Style>
     </ContentPage.Resources>
     
-    <StackLayout>
+    <VerticalStackLayout>
         <BoxView>
             <BoxView.Color>
                 <local:HslColorExtension H="0" S="1" L="0.5" A="1" />
@@ -27,5 +27,5 @@
         <BoxView Color="{local:HslColorExtension H=0.67, S=1, L=0.5}" />
         <BoxView Color="{local:HslColor H=0, S=0, L=0.5}" />
         <BoxView Color="{local:HslColor A=0.5}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/NullDemoPage.xaml b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/NullDemoPage.xaml
index 3d8b27204..27bbf8551 100644
--- a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/NullDemoPage.xaml
+++ b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/NullDemoPage.xaml
@@ -10,12 +10,12 @@
         </Style>
     </ContentPage.Resources>
 
-    <StackLayout Padding="10, 0">
+    <VerticalStackLayout Padding="10, 0">
         <Label Text="Text 1" />
         <Label Text="Text 2" />
         <Label Text="Text 3"
                    FontFamily="{x:Null}" />
         <Label Text="Text 4" />
         <Label Text="Text 5" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>    
\ No newline at end of file
diff --git a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/OnIdiomDemoPage.xaml b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/OnIdiomDemoPage.xaml
index 4791363b5..5083898d1 100644
--- a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/OnIdiomDemoPage.xaml
+++ b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/OnIdiomDemoPage.xaml
@@ -4,7 +4,7 @@
              xmlns:local="clr-namespace:MarkupExtensions"
              x:Class="MarkupExtensions.OnIdiomDemoPage"
              Title="OnIdiom Demo">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <BoxView x:Name="boxView"
                  Color="{OnIdiom Phone=Red, Tablet=Green, Desktop=Blue}"
                  WidthRequest="{OnIdiom Phone=200, Tablet=300, Desktop=400}"
@@ -27,5 +27,5 @@
                 </FormattedString>
             </Label.FormattedText>
         </Label>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/OnPlatformDemoPage.xaml b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/OnPlatformDemoPage.xaml
index 3230873c9..30d1e9e2f 100644
--- a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/OnPlatformDemoPage.xaml
+++ b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/OnPlatformDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
              x:Class="MarkupExtensions.OnPlatformDemoPage"
              Title="OnPlatform Demo">
-    <StackLayout Margin="20">
+    <VerticalStackLayout Margin="20">
         <BoxView x:Name="boxView"
                  Color="{OnPlatform iOS=Red, Android=Green, WinUI=Blue}" 
                  WidthRequest="{OnPlatform iOS=200, Android=300, WinUI=400}"  
@@ -19,5 +19,5 @@
                 </FormattedString>
             </Label.FormattedText>
         </Label>
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/ReferenceDemoPage.xaml b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/ReferenceDemoPage.xaml
index 73cd5e016..2eb07083a 100644
--- a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/ReferenceDemoPage.xaml
+++ b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/ReferenceDemoPage.xaml
@@ -4,7 +4,7 @@
              x:Class="MarkupExtensions.ReferenceDemoPage"
              x:Name="page"
              Title="x:Reference Demo">    
-    <StackLayout Margin="10, 0">        
+    <VerticalStackLayout Margin="10, 0">        
         <Label Text="{Binding Source={x:Reference page},
                               StringFormat='The type of this page is {0}'}"
                FontSize="18"
@@ -19,5 +19,5 @@
                FontSize="24"
                HorizontalOptions="Center"
                VerticalOptions="Center" />        
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/StaticDemoPage.xaml b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/StaticDemoPage.xaml
index 0810177c5..7828b6552 100644
--- a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/StaticDemoPage.xaml
+++ b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/StaticDemoPage.xaml
@@ -6,7 +6,7 @@
              xmlns:device="clr-namespace:Microsoft.Maui.Devices;assembly=Microsoft.Maui.Essentials"
              x:Class="MarkupExtensions.StaticDemoPage"
              Title="x:Static Demo">
-    <StackLayout Margin="10, 0">
+    <VerticalStackLayout Margin="10, 0">
         <Label Text="Label No. 1">
             <Label.FontSize>
                 <x:StaticExtension Member="local:AppConstants.NormalFontSize" />
@@ -27,5 +27,5 @@
                FontSize="{x:Static sys:Math.PI}"
                Scale="{x:Static sys:Math.E}" 
                HorizontalOptions="Center" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/TypeDemoPage.xaml b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/TypeDemoPage.xaml
index e7c29b580..f844ff2e9 100644
--- a/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/TypeDemoPage.xaml
+++ b/8.0/XAML/MarkupExtensions/MarkupExtensions/Views/TypeDemoPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="MarkupExtensions.TypeDemoPage"
              Title="x:Type Demo">    
-    <StackLayout x:Name="stackLayout"
+    <VerticalStackLayout x:Name="stackLayout"
                  Padding="10, 0">        
         <Button Text="Create a Slider"
                 HorizontalOptions="Center"
@@ -20,5 +20,5 @@
                 VerticalOptions="Center"
                 Command="{Binding CreateCommand}"
                 CommandParameter="{x:Type Switch}" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Upgrading/CustomRenderer/MultiProject/Entry/CustomRenderer/MainPageXaml.xaml b/Upgrading/CustomRenderer/MultiProject/Entry/CustomRenderer/MainPageXaml.xaml
index 8d621c115..452da2771 100755
--- a/Upgrading/CustomRenderer/MultiProject/Entry/CustomRenderer/MainPageXaml.xaml
+++ b/Upgrading/CustomRenderer/MultiProject/Entry/CustomRenderer/MainPageXaml.xaml
@@ -4,8 +4,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:CustomRenderer;assembly=CustomRenderer"
     x:Class="CustomRenderer.MainPageXaml">
-    <StackLayout VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand">
+    <VerticalStackLayout VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand">
 	    <Label Text="Hello, Custom Renderer!" />
         <local:MyEntry Text="In Shared Code" />
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>

From 6107884fe9ce63e2f3de3aefa2be33a055a1c97d Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Sat, 4 May 2024 19:43:45 +0200
Subject: [PATCH 3/6] Fix build errors

---
 8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml               | 2 +-
 8.0/Apps/WordPuzzle/WordPuzzle/MainPage.xaml               | 4 ++--
 8.0/Fundamentals/Shell/Xaminals/Views/AboutPage.xaml       | 2 +-
 .../PhotoPuzzle/PhotoPuzzle/Pages/PhotoPuzzlePage.xaml     | 4 ++--
 .../Views/UserProfileEmptyViewLoadSimulationPage.xaml      | 2 +-
 .../Views/XAML/CombinedStackLayoutPage.xaml                | 2 +-
 8.0/UserInterface/Views/TwoPaneView/MainPage.xaml          | 7 ++-----
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml b/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml
index 6de6e9235..0f1efd53d 100644
--- a/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml
+++ b/8.0/Apps/BugSweeper/BugSweeper/MainPage.xaml
@@ -72,7 +72,7 @@
                        TextColor="Red" />
                 <Label Text="!"
                        TextColor="Red" />
-            </VerticalStackLayout>
+            </HorizontalStackLayout>
             <HorizontalStackLayout x:Name="consolationText"
                                    HorizontalOptions="Center">
                 <Label Text="T"
diff --git a/8.0/Apps/WordPuzzle/WordPuzzle/MainPage.xaml b/8.0/Apps/WordPuzzle/WordPuzzle/MainPage.xaml
index 2ea14f64a..01c06aa83 100644
--- a/8.0/Apps/WordPuzzle/WordPuzzle/MainPage.xaml
+++ b/8.0/Apps/WordPuzzle/WordPuzzle/MainPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="WordPuzzle.MainPage"
              Title="Solve the puzzle to win!">
-    <VerticalStackLayout x:Name="stackLayout"
+    <StackLayout x:Name="stackLayout"
                  Spacing="6"
                  Margin="5"
                  SizeChanged="OnStackSizeChanged">
@@ -21,5 +21,5 @@
                    VerticalOptions="Center" />
         </VerticalStackLayout>
         <AbsoluteLayout x:Name="absoluteLayout" />
-    </VerticalStackLayout>
+    </StackLayout>
 </ContentPage>
diff --git a/8.0/Fundamentals/Shell/Xaminals/Views/AboutPage.xaml b/8.0/Fundamentals/Shell/Xaminals/Views/AboutPage.xaml
index 16896dd71..2ca2eb492 100644
--- a/8.0/Fundamentals/Shell/Xaminals/Views/AboutPage.xaml
+++ b/8.0/Fundamentals/Shell/Xaminals/Views/AboutPage.xaml
@@ -14,7 +14,7 @@
                    HorizontalOptions="Center"
                    Aspect="AspectFit" />
             <ScrollView Grid.Row="1">
-                <VerticalStackLayout Orientation="Vertical" 
+                <VerticalStackLayout
                              Padding="16,40,16,40"
                              Spacing="10">
                     <Label FontSize="22">
diff --git a/8.0/SkiaSharp/PhotoPuzzle/PhotoPuzzle/Pages/PhotoPuzzlePage.xaml b/8.0/SkiaSharp/PhotoPuzzle/PhotoPuzzle/Pages/PhotoPuzzlePage.xaml
index 4d9f7d7a1..6539602f5 100644
--- a/8.0/SkiaSharp/PhotoPuzzle/PhotoPuzzle/Pages/PhotoPuzzlePage.xaml
+++ b/8.0/SkiaSharp/PhotoPuzzle/PhotoPuzzle/Pages/PhotoPuzzlePage.xaml
@@ -4,7 +4,7 @@
              x:Class="PhotoPuzzle.PhotoPuzzlePage"
              Title="Photo Puzzle">
     <ContentView SizeChanged="OnContentViewSizeChanged">
-        <VerticalStackLayout x:Name="stackLayout">
+        <StackLayout x:Name="stackLayout">
             <Button Margin="0,20,0,20"
                     Text="Randomize"
                     Clicked="OnRandomizeButtonClicked"
@@ -12,6 +12,6 @@
                     VerticalOptions="Center" />
             <AbsoluteLayout x:Name="absoluteLayout"
                             BackgroundColor="Black" />
-        </VerticalStackLayout>
+        </StackLayout>
     </ContentView>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewLoadSimulationPage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewLoadSimulationPage.xaml
index d81aba965..27e2dd237 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewLoadSimulationPage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewLoadSimulationPage.xaml
@@ -156,6 +156,6 @@
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
             </HorizontalStackLayout>
-        </HorizontalStackLayout>
+        </VerticalStackLayout>
     </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml
index 24133e056..7d1276aba 100644
--- a/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml
+++ b/8.0/UserInterface/Layouts/StackLayoutDemos/StackLayoutDemos/Views/XAML/CombinedStackLayoutPage.xaml
@@ -34,7 +34,7 @@
                 <Label Text="Blue"
                        FontSize="20"
                        VerticalOptions="Center" />
-            </VerticalStackLayout>
+            </HorizontalStackLayout>
         </Frame>
         <Label Text="Secondary colors" />
         <Frame BorderColor="Black"
diff --git a/8.0/UserInterface/Views/TwoPaneView/MainPage.xaml b/8.0/UserInterface/Views/TwoPaneView/MainPage.xaml
index f3f641b9a..d663bc434 100644
--- a/8.0/UserInterface/Views/TwoPaneView/MainPage.xaml
+++ b/8.0/UserInterface/Views/TwoPaneView/MainPage.xaml
@@ -9,16 +9,13 @@
                         MinWideModeWidth="{Binding Source={x:Reference MinWideModeWidth}, Path=Value}"
                         TallModeConfiguration="{Binding Source={x:Reference TallModeConfiguration}, Path=SelectedItem}"
                         WideModeConfiguration="{Binding Source={x:Reference WideModeConfiguration}, Path=SelectedItem}"
-                        PanePriority="{Binding Source={x:Reference PanePriority}, Path=SelectedItem, Mode=TwoWay}"
-        >
+                        PanePriority="{Binding Source={x:Reference PanePriority}, Path=SelectedItem, Mode=TwoWay}">
         <foldable:TwoPaneView.Pane1
             BackgroundColor="#dddddd">
             <Frame BorderColor="Red">
                 <VerticalStackLayout BackgroundColor="Blue"
-                                 Orientation="Vertical"
                                  VerticalOptions="StartAndExpand"
-                                 Padding="5"
-                                 >
+                                 Padding="5">
 
                     <Label Text="ScreenSize" x:Name="sizeLabel"/>
                     <Label Text="SinglePane" x:Name="spanLabel"/>

From 123551d1173f7c48065084c958a7ed0bfd13520a Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Sun, 5 May 2024 11:41:23 +0200
Subject: [PATCH 4/6] Fix build more

---
 .../BindableLayoutDemos/Views/UserProfileEmptyViewNullPage.xaml | 2 +-
 .../Views/UserProfileEmptyViewTemplatePage.xaml                 | 2 +-
 .../Views/UserProfileEmptyViewTemplateSelectorPage.xaml         | 2 +-
 .../BindableLayoutDemos/Views/UserProfilePage.xaml              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewNullPage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewNullPage.xaml
index 389c98cfc..5600b3e1f 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewNullPage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewNullPage.xaml
@@ -156,6 +156,6 @@
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
             </HorizontalStackLayout>
-        </HorizontalStackLayout>
+        </VerticalStackLayout>
     </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplatePage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplatePage.xaml
index 58c96b9ba..d82741179 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplatePage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplatePage.xaml
@@ -161,6 +161,6 @@
                     </DataTemplate>
                 </BindableLayout.EmptyViewTemplate>
             </HorizontalStackLayout>
-        </HorizontalStackLayout>
+        </VerticalStackLayout>
     </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplateSelectorPage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplateSelectorPage.xaml
index fa5074cf4..09544ae60 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplateSelectorPage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewTemplateSelectorPage.xaml
@@ -180,6 +180,6 @@
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
             </HorizontalStackLayout>
-        </HorizontalStackLayout>
+        </VerticalStackLayout>
     </VerticalStackLayout>
 </ContentPage>
diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfilePage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfilePage.xaml
index 86729b00f..8b9170157 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfilePage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfilePage.xaml
@@ -154,6 +154,6 @@
                     </DataTemplate>
                 </BindableLayout.ItemTemplate>
             </HorizontalStackLayout>
-        </HorizontalStackLayout>
+        </VerticalStackLayout>
     </VerticalStackLayout>
 </ContentPage>

From 5b3b9ecd5f888b702d0a5ca899d65045ba680ea7 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Sun, 5 May 2024 13:34:20 +0200
Subject: [PATCH 5/6] Fix build even more

---
 .../Views/UserProfileEmptyViewWithMultipleViewsPage.xaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewWithMultipleViewsPage.xaml b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewWithMultipleViewsPage.xaml
index 8b2e68500..fa33240aa 100644
--- a/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewWithMultipleViewsPage.xaml
+++ b/8.0/UserInterface/Layouts/BindableLayoutDemos/BindableLayoutDemos/Views/UserProfileEmptyViewWithMultipleViewsPage.xaml
@@ -165,6 +165,6 @@
                     </VerticalStackLayout>
                 </BindableLayout.EmptyView>
             </HorizontalStackLayout>
-        </HorizontalStackLayout>
+        </VerticalStackLayout>
     </VerticalStackLayout>
 </ContentPage>

From d8438277bcb9e26370ba3f261af842b481df3ec3 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Mon, 6 May 2024 09:33:26 +0200
Subject: [PATCH 6/6] Fix Entitlements for build

---
 8.0/Apps/PointOfSale/README.md                              | 2 +-
 .../iOS/{Entitlements.plist => EntitlementsSample.plist}    | 1 +
 8.0/PlatformIntegration/PlatformIntegrationDemos/README.md  | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 rename 8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Platforms/iOS/{Entitlements.plist => EntitlementsSample.plist} (61%)

diff --git a/8.0/Apps/PointOfSale/README.md b/8.0/Apps/PointOfSale/README.md
index 6daeb7706..659fb0ae9 100644
--- a/8.0/Apps/PointOfSale/README.md
+++ b/8.0/Apps/PointOfSale/README.md
@@ -23,7 +23,7 @@ This app demonstrates various techniques for building a desktop and mobile appli
 
 ## Local Testing
 
-If you want to test the full functionality of this app locally for iOS, make sure to rename the `Platforms/iOS/EntitlementsSample.plist` file to ``Platforms/iOS/Entitlements.plist`.
+If you want to test the full functionality of this app locally for iOS, make sure to rename the `Platforms/iOS/EntitlementsSample.plist` file to `Platforms/iOS/Entitlements.plist`.
 
 By doing so, you will need a matching provisioning profile in your Apple Developer accound in order for everything to work correctly.
 
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Platforms/iOS/Entitlements.plist b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Platforms/iOS/EntitlementsSample.plist
similarity index 61%
rename from 8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Platforms/iOS/Entitlements.plist
rename to 8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Platforms/iOS/EntitlementsSample.plist
index 44c362266..d2e0f9400 100644
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Platforms/iOS/Entitlements.plist
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/PlatformIntegrationDemo/Platforms/iOS/EntitlementsSample.plist
@@ -1,3 +1,4 @@
+<!-- Rename this file to Entitlements.plist for the full functionality to work. However, this will require you to have a matching provisioning profile in your Apple Developer Account. -->
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
diff --git a/8.0/PlatformIntegration/PlatformIntegrationDemos/README.md b/8.0/PlatformIntegration/PlatformIntegrationDemos/README.md
index 10742a5b9..ffbcfe4c3 100755
--- a/8.0/PlatformIntegration/PlatformIntegrationDemos/README.md
+++ b/8.0/PlatformIntegration/PlatformIntegrationDemos/README.md
@@ -57,3 +57,9 @@ This sample demonstrates the following functionality:
   - Secure storage
 
 For more information about the sample see [Platform integration](https://learn.microsoft.com/dotnet/maui/platform-integration/).
+
+## Local Testing
+
+If you want to test the full functionality of this app locally for iOS, make sure to rename the `Platforms/iOS/EntitlementsSample.plist` file to `Platforms/iOS/Entitlements.plist`.
+
+By doing so, you will need a matching provisioning profile in your Apple Developer accound in order for everything to work correctly.