diff --git a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml
index 87dbcbd81..bfe6ed82f 100644
--- a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml
+++ b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/BasicIndicatorViewPage.xaml
@@ -7,9 +7,9 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <StackLayout Margin="10">
-        <CarouselView HeightRequest="400"
-                      ItemsSource="{Binding Monkeys}"
+    <Grid Margin="10"
+          RowDefinitions="*,Auto">
+        <CarouselView ItemsSource="{Binding Monkeys}"
                       IndicatorView="indicatorView">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
@@ -46,10 +46,11 @@
             </CarouselView.ItemTemplate>
         </CarouselView>
         <IndicatorView x:Name="indicatorView"
+                       Grid.Row="1"
                        MaximumVisible="6"
                        Margin="0,0,0,40"
                        IndicatorColor="LightGray"
                        SelectedIndicatorColor="DarkGray"
                        HorizontalOptions="Center" />
-    </StackLayout>
+    </Grid>
 </ContentPage>
diff --git a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml
index ea8b6dc46..b91edb61c 100644
--- a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml
+++ b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/ConfigurableIndicatorViewPage.xaml
@@ -8,20 +8,9 @@
     <ContentPage.BindingContext>
         <viewmodels:MonkeysViewModel />
     </ContentPage.BindingContext>
-    <Grid Margin="10">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.5*" />
-            <ColumnDefinition Width="0.5*" />
-        </Grid.ColumnDefinitions>
+    <Grid Margin="10"
+          RowDefinitions="Auto,Auto,Auto,Auto,Auto,*,Auto"
+          ColumnDefinitions="0.5*,0.5*">
         <Label Text="IndicatorColor:"
                HorizontalOptions="End"
                VerticalTextAlignment="Center" />
diff --git a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml
index cf2da579b..71c9420f1 100644
--- a/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml
+++ b/8.0/UserInterface/Views/IndicatorViewDemos/IndicatorViewDemos/Views/TemplatedIndicatorViewPage.xaml
@@ -32,9 +32,9 @@
         </Style>
     </ContentPage.Resources>
 
-    <StackLayout Margin="10">
-        <CarouselView HeightRequest="400"
-                      ItemsSource="{Binding Monkeys}"
+    <Grid Margin="10"
+          RowDefinitions="*,Auto">
+        <CarouselView ItemsSource="{Binding Monkeys}"
                       IndicatorView="indicatorView">
             <CarouselView.ItemTemplate>
                 <DataTemplate>
@@ -72,7 +72,9 @@
         </CarouselView>
 
         <IndicatorView x:Name="indicatorView"
+                       Grid.Row="1"
                        Margin="0,0,0,40"
+                       MaximumVisible="12"
                        IndicatorColor="Transparent"
                        SelectedIndicatorColor="Transparent"
                        HorizontalOptions="Center">
@@ -85,5 +87,5 @@
                 </DataTemplate>
             </IndicatorView.IndicatorTemplate>
         </IndicatorView>
-    </StackLayout>
+    </Grid>
 </ContentPage>