diff --git a/samples/ControlGallery/AppShell.razor b/samples/ControlGallery/AppShell.razor
index e6cc6cde..7510840c 100644
--- a/samples/ControlGallery/AppShell.razor
+++ b/samples/ControlGallery/AppShell.razor
@@ -1,66 +1,49 @@
 @using ControlGallery.Views
+@using ControlGallery.Views.Collections
+@using ControlGallery.Views.Collections.CollectionView
+@using ControlGallery.Views.Controls
+@using ControlGallery.Views.EditText
+@using ControlGallery.Views.InitiateCommands
+@using ControlGallery.Views.Layouts
+@using ControlGallery.Views.PresentData
+@using ControlGallery.Views.SetValues
+@using ControlGallery.Views.Shell
 
 <Shell>
-    <FlyoutItem Title="Main">
-        <Tab Title="Gallery">
-            <ShellContent>
-                <PlaygroundList />
-            </ShellContent>
-        </Tab>
-        <Tab Title="Shell Properties">
-            <ShellPropertiesPlayground />
-        </Tab>
-        <Tab Title="Add/Remove">
-            <ContentPage Title="Adder">
-                <StackLayout Spacing="12">
-                    <Button OnClick="AddTab">Add Tab</Button>
-                    <Button IsEnabled="(tabCount > 1)" OnClick="RemoveTab">Remove tab</Button>
-                    <Button OnClick="AddMenuItem">Add MenuItem</Button>
-                    <Button IsEnabled="(menuItemCount > 0)" OnClick="RemoveMenuItem">Remove MenuItem</Button>
-                </StackLayout>
-            </ContentPage>
-        </Tab>
-
-        @for (int i = 0; i < tabCount; i++)
-        {
-            var currentIndex = i;
-            <ShellTab Title="@($"Tab #{currentIndex + 1}")" />
-        }
-    </FlyoutItem>
-
-    @for (int i = 0; i < menuItemCount; i++)
-    {
-        <MenuItem Text="@($"MenuItem #{i + 1}")" />
-    }
-</Shell>
-
-@code {
-    int tabCount = 1;
-    int menuItemCount = 2;
-
-    void AddTab()
-    {
-        tabCount++;
-    }
-
-    void RemoveTab()
-    {
-        if (tabCount > 1)
-        {
-            tabCount--;
-        }
-    }
-
-    void AddMenuItem()
-    {
-        menuItemCount++;
-    }
-
-    void RemoveMenuItem()
-    {
-        if (menuItemCount > 0)
-        {
-            menuItemCount--;
-        }
-    }
-}
+    @*Present data*@
+    <BoxViewPage />
+    <LabelPage />
+
+    @*Initiate commands*@
+    <ButtonPage />
+    <RefreshViewPage />
+
+    @*Set values*@
+    <SliderPage />
+    <CheckboxPage />
+    <RadioButtonPage />
+
+    @*Edit text*@
+    <EntryPage />
+    <EditorPage />
+
+    @*Display collections*@
+    <CarouselViewPage />
+    <ShellSection Title="CollectionView">
+        <AddRemovePage />
+        <GridLayoutPage />
+        <SelectionPage />
+        <InfiniteScrollPage />
+    </ShellSection>
+
+    @*Layouts*@
+    <AbsoluteLayoutPage />
+    <GridPage />
+    <FlexLayoutPage />
+
+    @*Shell*@
+    <ShellNavigationPage />
+    <ShellPropertiesPage />
+    <ShellItemsPage />
+
+</Shell>
\ No newline at end of file
diff --git a/samples/ControlGallery/Views/CollectionViewPlayground.razor b/samples/ControlGallery/Views/CollectionViewPlayground.razor
deleted file mode 100644
index 1475b8fa..00000000
--- a/samples/ControlGallery/Views/CollectionViewPlayground.razor
+++ /dev/null
@@ -1,18 +0,0 @@
-@using ControlGallery.Views.CollectionView
-
-@inject ShellNavigationManager NavigationManager
-
-@page "/collectionviewplayground"
-
-<ContentPage>
-	<ScrollView>
-		<StackLayout Padding="10" Spacing="12">
-			<Label Text="Select a playground..." FontSize="30" FontAttributes="FontAttributes.Bold" />
-			<BoxView Margin="10" HeightRequest="2" Color="Colors.DarkGray" HorizontalOptions="LayoutOptions.Fill" />
-			<Button Text="Add / Remove" OnClick="@(() => NavigationManager.NavigateToAsync("/collectionviewplayground/add-remove"))" />
-			<Button Text="Grid Layout" OnClick="@(() => NavigationManager.NavigateToAsync("/collectionviewplayground/grid"))" />
-			<Button Text="Infinite scroll" OnClick="@(() => NavigationManager.NavigateToAsync("/collectionviewplayground/infinite-scroll"))" />
-			<Button Text="Selection" OnClick="@(() => NavigationManager.NavigateToAsync("/collectionviewplayground/selection"))" />
-		</StackLayout>
-	</ScrollView>
-</ContentPage>
diff --git a/samples/ControlGallery/Views/Collections/CarouselViews.razor b/samples/ControlGallery/Views/Collections/CarouselViewPage.razor
similarity index 98%
rename from samples/ControlGallery/Views/Collections/CarouselViews.razor
rename to samples/ControlGallery/Views/Collections/CarouselViewPage.razor
index 254c3a2b..a5c6c90a 100644
--- a/samples/ControlGallery/Views/Collections/CarouselViews.razor
+++ b/samples/ControlGallery/Views/Collections/CarouselViewPage.razor
@@ -1,6 +1,6 @@
 @page "/carouselviewplayground"
 
-<ContentPage>
+<ContentPage Title="CarouselView">
     <Grid RowDefinitions="*,Auto">
 
         <CarouselView Grid.Row="0"
diff --git a/samples/ControlGallery/Views/CollectionView/AddRemovePlayground.razor b/samples/ControlGallery/Views/Collections/CollectionView/AddRemovePage.razor
similarity index 100%
rename from samples/ControlGallery/Views/CollectionView/AddRemovePlayground.razor
rename to samples/ControlGallery/Views/Collections/CollectionView/AddRemovePage.razor
diff --git a/samples/ControlGallery/Views/CollectionView/GridLayoutPlayground.razor b/samples/ControlGallery/Views/Collections/CollectionView/GridLayoutPage.razor
similarity index 100%
rename from samples/ControlGallery/Views/CollectionView/GridLayoutPlayground.razor
rename to samples/ControlGallery/Views/Collections/CollectionView/GridLayoutPage.razor
diff --git a/samples/ControlGallery/Views/CollectionView/InfiniteScrollPlayground.razor b/samples/ControlGallery/Views/Collections/CollectionView/InfiniteScrollPage.razor
similarity index 100%
rename from samples/ControlGallery/Views/CollectionView/InfiniteScrollPlayground.razor
rename to samples/ControlGallery/Views/Collections/CollectionView/InfiniteScrollPage.razor
diff --git a/samples/ControlGallery/Views/CollectionView/Item.razor b/samples/ControlGallery/Views/Collections/CollectionView/Item.razor
similarity index 100%
rename from samples/ControlGallery/Views/CollectionView/Item.razor
rename to samples/ControlGallery/Views/Collections/CollectionView/Item.razor
diff --git a/samples/ControlGallery/Views/CollectionView/SelectionPlayground.razor b/samples/ControlGallery/Views/Collections/CollectionView/SelectionPage.razor
similarity index 100%
rename from samples/ControlGallery/Views/CollectionView/SelectionPlayground.razor
rename to samples/ControlGallery/Views/Collections/CollectionView/SelectionPage.razor
diff --git a/samples/ControlGallery/Views/PickerPlayground.razor b/samples/ControlGallery/Views/Collections/PickerPage.razor
similarity index 99%
rename from samples/ControlGallery/Views/PickerPlayground.razor
rename to samples/ControlGallery/Views/Collections/PickerPage.razor
index c72af0c2..94a4d968 100644
--- a/samples/ControlGallery/Views/PickerPlayground.razor
+++ b/samples/ControlGallery/Views/Collections/PickerPage.razor
@@ -3,7 +3,7 @@
 
 @page "/pickerplayground"
 
-<ContentPage>
+<ContentPage Title="Pickers">
     <ScrollView>
         <StackLayout Padding="10">
             <Label Text="Picker Playground" FontSize="30">
diff --git a/samples/ControlGallery/Views/CommonControls.razor b/samples/ControlGallery/Views/CommonControls.razor
deleted file mode 100644
index 3ec8d461..00000000
--- a/samples/ControlGallery/Views/CommonControls.razor
+++ /dev/null
@@ -1,31 +0,0 @@
-@page "/commoncontrols"
-
-<ContentPage>
-    <VerticalStackLayout Margin="20">
-
-        <Slider Minimum="0" Maximum="20" @bind-Value="_sliderValue" />
-        <Label>
-            <Span>Slider is @_sliderValue</Span>
-        </Label>
-
-        <HorizontalStackLayout>
-            <Button Text="Favorite?" OnClick="ToggleFavorite" />
-
-            <Image Source="@(isFavorite ? _favorite : _nonFavorite)" />
-        </HorizontalStackLayout>
-    </VerticalStackLayout>
-</ContentPage>
-
-@code
-{
-    ImageSource _favorite = new FileImageSource { File = "favorite.png" };
-    ImageSource _nonFavorite = new FileImageSource { File = "not_favorite.png" };
-
-    private double _sliderValue;
-    bool isFavorite;
-
-    void ToggleFavorite()
-    {
-        isFavorite = !isFavorite;
-    }
-}
diff --git a/samples/ControlGallery/Views/Controls/RadioButtons.razor b/samples/ControlGallery/Views/Controls/RadioButtonPage.razor
similarity index 100%
rename from samples/ControlGallery/Views/Controls/RadioButtons.razor
rename to samples/ControlGallery/Views/Controls/RadioButtonPage.razor
diff --git a/samples/ControlGallery/Views/EditorPlayground.razor b/samples/ControlGallery/Views/EditText/EditorPage.razor
similarity index 85%
rename from samples/ControlGallery/Views/EditorPlayground.razor
rename to samples/ControlGallery/Views/EditText/EditorPage.razor
index 8cddd8ee..ad0f003b 100644
--- a/samples/ControlGallery/Views/EditorPlayground.razor
+++ b/samples/ControlGallery/Views/EditText/EditorPage.razor
@@ -1,6 +1,6 @@
-@page "/editorplayground"
+@page "/edit-text/editors"
 
-<ContentPage>
+<ContentPage Title="Editor">
     <StackLayout Margin="20">
         <Editor @bind-Text="_text" OnCompleted="OnCompleted" AutoSize="EditorAutoSizeOption.TextChanges" />
         <Label Text=@($"Edits count: {_editsNumber}. Text entered: {_text}")/>
diff --git a/samples/ControlGallery/Views/EditText/EntryPage.razor b/samples/ControlGallery/Views/EditText/EntryPage.razor
new file mode 100644
index 00000000..0c886550
--- /dev/null
+++ b/samples/ControlGallery/Views/EditText/EntryPage.razor
@@ -0,0 +1,31 @@
+@page "/edit-text/editor"
+
+@{
+    RenderFragment Separator = @<BoxView Color="Colors.LightGray" HeightRequest="1" />;
+}
+
+<ContentPage Title="Entry">
+    <StackLayout Margin="20">
+        <Entry @bind-Text="_text" OnCompleted="OnCompleted" />
+        <Label Text=@($"Edits count: {_editsNumber}. Text entered: {_text}") />
+
+        @Separator
+
+        <Label>Email entry: @_email</Label>
+        <Entry @bind-Text="_email" Keyboard="Keyboard.Email" />
+        
+        @Separator
+
+
+
+    </StackLayout>
+</ContentPage>
+
+@code
+{
+    string _text;
+    string _email;
+    int _editsNumber;
+
+    void OnCompleted() => _editsNumber++;
+}
\ No newline at end of file
diff --git a/samples/ControlGallery/Views/GesturePlayground.razor b/samples/ControlGallery/Views/GesturesPage.razor
similarity index 97%
rename from samples/ControlGallery/Views/GesturePlayground.razor
rename to samples/ControlGallery/Views/GesturesPage.razor
index f6db539a..3482e76e 100644
--- a/samples/ControlGallery/Views/GesturePlayground.razor
+++ b/samples/ControlGallery/Views/GesturesPage.razor
@@ -1,6 +1,6 @@
 @page "/gestureplayground"
 
-<ContentPage>
+<ContentPage Title="Gestures">
     <StackLayout Margin="new Thickness(20)">
 
         <Label Text="Tap me or pan me"
diff --git a/samples/ControlGallery/Views/InitiateCommands/ButtonPage.razor b/samples/ControlGallery/Views/InitiateCommands/ButtonPage.razor
new file mode 100644
index 00000000..6405bc54
--- /dev/null
+++ b/samples/ControlGallery/Views/InitiateCommands/ButtonPage.razor
@@ -0,0 +1,23 @@
+<ContentPage Title="Buttons">
+    <VerticalStackLayout Margin="20">
+
+        <HorizontalStackLayout>
+            <Button Text="Favorite?" OnClick="ToggleFavorite" />
+
+            <Image Source="@(isFavorite ? _favorite : _nonFavorite)" />
+        </HorizontalStackLayout>
+
+    </VerticalStackLayout>
+</ContentPage>
+
+@code {
+    ImageSource _favorite = ImageSource.FromFile("favorite.png");
+    ImageSource _nonFavorite = ImageSource.FromFile("not_favorite.png");
+
+    bool isFavorite;
+
+    void ToggleFavorite()
+    {
+        isFavorite = !isFavorite;
+    }
+}
diff --git a/samples/ControlGallery/Views/Controls/RefreshViews.razor b/samples/ControlGallery/Views/InitiateCommands/RefreshViewPage.razor
similarity index 100%
rename from samples/ControlGallery/Views/Controls/RefreshViews.razor
rename to samples/ControlGallery/Views/InitiateCommands/RefreshViewPage.razor
diff --git a/samples/ControlGallery/Views/Layouts/AbsoluteLayouts.razor b/samples/ControlGallery/Views/Layouts/AbsoluteLayoutPage.razor
similarity index 100%
rename from samples/ControlGallery/Views/Layouts/AbsoluteLayouts.razor
rename to samples/ControlGallery/Views/Layouts/AbsoluteLayoutPage.razor
diff --git a/samples/ControlGallery/Views/Layouts/FlexLayouts.razor b/samples/ControlGallery/Views/Layouts/FlexLayoutPage.razor
similarity index 98%
rename from samples/ControlGallery/Views/Layouts/FlexLayouts.razor
rename to samples/ControlGallery/Views/Layouts/FlexLayoutPage.razor
index e9373a34..0bc1151b 100644
--- a/samples/ControlGallery/Views/Layouts/FlexLayouts.razor
+++ b/samples/ControlGallery/Views/Layouts/FlexLayoutPage.razor
@@ -2,7 +2,7 @@
 
 @using Microsoft.Maui.Layouts
 
-<ContentPage>
+<ContentPage Title="FlexLayouts">
     <ScrollView>
         <VerticalStackLayout Padding="10" Spacing="10">
 
diff --git a/samples/ControlGallery/Views/Layouts/Grids.razor b/samples/ControlGallery/Views/Layouts/GridPage.razor
similarity index 100%
rename from samples/ControlGallery/Views/Layouts/Grids.razor
rename to samples/ControlGallery/Views/Layouts/GridPage.razor
diff --git a/samples/ControlGallery/Views/PlaygroundList.razor b/samples/ControlGallery/Views/PlaygroundList.razor
deleted file mode 100644
index de63fbad..00000000
--- a/samples/ControlGallery/Views/PlaygroundList.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@inject ShellNavigationManager NavigationManager
-
-<ContentPage>
-    <ScrollView>
-        <StackLayout Padding="10" Spacing="12">
-            <Label Text="Select a playground..." FontSize="30" FontAttributes="FontAttributes.Bold" />
-            <BoxView Margin="10" HeightRequest="2" Color="Colors.DarkGray" HorizontalOptions="LayoutOptions.Fill" />
-            <Button Text="Common controls" OnClick="@(async () => await NavigationManager.NavigateToAsync("/commoncontrols"))" />
-            <Button Text="Labels" OnClick="@(async () => await NavigationManager.NavigateToAsync("/controls/labels"))" />
-            <Button Text="RadioButtons" OnClick="@(async () => await NavigationManager.NavigateToAsync("/controls/radiobuttons"))" />
-            <Button Text="Navigation playground" OnClick="@(async () => await NavigationManager.NavigateToAsync("/navigation"))" />
-            <Button Text="Gesture playground" OnClick="@(async () => await NavigationManager.NavigateToAsync("/gestureplayground"))" />
-            <Button Text="Skia Playground" OnClick="@(async () => await NavigationManager.NavigateToAsync("/skia"))" />
-            <Button Text="Picker Playground" OnClick="@(async () => await NavigationManager.NavigateToAsync("/pickerplayground"))" />
-            <Button Text="Editor Playground" OnClick="@(async () => await NavigationManager.NavigateToAsync("/editorplayground"))" />
-            <Button Text="CollectionView Playground" OnClick="@(async () => await NavigationManager.NavigateToAsync("/collectionviewplayground"))" />
-            <Button Text="Grids" OnClick="@(async () => await NavigationManager.NavigateToAsync("/layouts/grids"))" />
-            <Button Text="AbsoluteLayouts" OnClick="@(async () => await NavigationManager.NavigateToAsync("/layouts/absolute"))" />
-            <Button Text="FlexLayouts" OnClick="@(async () => await NavigationManager.NavigateToAsync("/layouts/flex"))" />
-            <Button Text="CarouselView" OnClick="@(async () => await NavigationManager.NavigateToAsync("/carouselviewplayground"))" />
-            <Button Text="RefreshView" OnClick="@(async () => await NavigationManager.NavigateToAsync("/controls/refreshviews"))" />
-        </StackLayout>
-    </ScrollView>
-</ContentPage>
diff --git a/samples/ControlGallery/Views/PresentData/BoxViewPage.razor b/samples/ControlGallery/Views/PresentData/BoxViewPage.razor
new file mode 100644
index 00000000..2cd364ff
--- /dev/null
+++ b/samples/ControlGallery/Views/PresentData/BoxViewPage.razor
@@ -0,0 +1,21 @@
+<ContentPage Title="BoxViews">
+    <VerticalStackLayout Spacing="8">
+        <BoxView HeightRequest="30"
+                 WidthRequest="30"
+                 Color="Colors.OrangeRed"
+                 CornerRadius="8" />
+
+        <BoxView HeightRequest="1"
+                 Color="Colors.LightGray" />
+
+        <BoxView HeightRequest="30">
+            <Background>
+                <LinearGradientBrush EndPoint="new(1,0)">
+                    <GradientStop Offset="0" Color="Colors.Red" />
+                    <GradientStop Offset="1" Color="Colors.Green" />
+                </LinearGradientBrush>
+            </Background>
+        </BoxView>
+
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/samples/ControlGallery/Views/Controls/Labels.razor b/samples/ControlGallery/Views/PresentData/LabelPage.razor
similarity index 97%
rename from samples/ControlGallery/Views/Controls/Labels.razor
rename to samples/ControlGallery/Views/PresentData/LabelPage.razor
index 2253bf57..9ab4ab63 100644
--- a/samples/ControlGallery/Views/Controls/Labels.razor
+++ b/samples/ControlGallery/Views/PresentData/LabelPage.razor
@@ -1,6 +1,6 @@
 @page "/controls/labels"
 
-<ContentPage>
+<ContentPage Title="Labels">
     <ScrollView>
         <VerticalStackLayout Padding="10" Spacing="20">
 
diff --git a/samples/ControlGallery/Views/SetValues/CheckboxPage.razor b/samples/ControlGallery/Views/SetValues/CheckboxPage.razor
new file mode 100644
index 00000000..fa99d1b1
--- /dev/null
+++ b/samples/ControlGallery/Views/SetValues/CheckboxPage.razor
@@ -0,0 +1,16 @@
+<ContentPage Title="Checkboxes">
+    <VerticalStackLayout Margin="20">
+
+        <HorizontalStackLayout>
+            <CheckBox @bind-IsChecked="_isChecked" />
+            <Label>Checkbox Title</Label>
+        </HorizontalStackLayout>
+
+        <Label>Checkbox is @(_isChecked ? "checked" : "unchecked")!</Label>
+    </VerticalStackLayout>
+</ContentPage>
+
+@code
+{
+    private bool _isChecked;
+}
diff --git a/samples/ControlGallery/Views/SetValues/SliderPage.razor b/samples/ControlGallery/Views/SetValues/SliderPage.razor
new file mode 100644
index 00000000..a667f88b
--- /dev/null
+++ b/samples/ControlGallery/Views/SetValues/SliderPage.razor
@@ -0,0 +1,11 @@
+<ContentPage Title="Sliders">
+    <VerticalStackLayout Margin="20">
+        <Slider Minimum="0" Maximum="20" @bind-Value="_sliderValue" />
+        <Label>Slider is @_sliderValue</Label>
+    </VerticalStackLayout>
+</ContentPage>
+
+@code
+{
+    private double _sliderValue;
+}
diff --git a/samples/ControlGallery/Views/Index.razor b/samples/ControlGallery/Views/Shell/Index.razor
similarity index 100%
rename from samples/ControlGallery/Views/Index.razor
rename to samples/ControlGallery/Views/Shell/Index.razor
diff --git a/samples/ControlGallery/Views/NavigationTarget.razor b/samples/ControlGallery/Views/Shell/NavigationTargetPage.razor
similarity index 100%
rename from samples/ControlGallery/Views/NavigationTarget.razor
rename to samples/ControlGallery/Views/Shell/NavigationTargetPage.razor
diff --git a/samples/ControlGallery/Views/Shell/ShellItemsPage.razor b/samples/ControlGallery/Views/Shell/ShellItemsPage.razor
new file mode 100644
index 00000000..b69e6f8f
--- /dev/null
+++ b/samples/ControlGallery/Views/Shell/ShellItemsPage.razor
@@ -0,0 +1,54 @@
+<FlyoutItem Title="Shell Items">
+    <Tab Title="Add/Remove">
+        <ContentPage>
+            <StackLayout Spacing="12">
+                <Button OnClick="AddTab">Add Tab</Button>
+                <Button IsEnabled="(tabCount > 1)" OnClick="RemoveTab">Remove tab</Button>
+                <Button OnClick="AddMenuItem">Add MenuItem</Button>
+                <Button IsEnabled="(menuItemCount > 0)" OnClick="RemoveMenuItem">Remove MenuItem</Button>
+            </StackLayout>
+        </ContentPage>
+    </Tab>
+
+    @for (int i = 0; i < tabCount; i++)
+    {
+        var currentIndex = i;
+        <ShellTab Title="@($"Tab #{currentIndex + 1}")" />
+    }
+</FlyoutItem>
+
+@for (int i = 0; i < menuItemCount; i++)
+{
+    <MenuItem Text="@($"MenuItem #{i + 1}")" />
+}
+
+@code {
+    int tabCount = 1;
+    int menuItemCount = 0;
+
+    void AddTab()
+    {
+        tabCount++;
+    }
+
+    void RemoveTab()
+    {
+        if (tabCount > 1)
+        {
+            tabCount--;
+        }
+    }
+
+    void AddMenuItem()
+    {
+        menuItemCount++;
+    }
+
+    void RemoveMenuItem()
+    {
+        if (menuItemCount > 0)
+        {
+            menuItemCount--;
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/ControlGallery/Views/NavigationSource.razor b/samples/ControlGallery/Views/Shell/ShellNavigationPage.razor
similarity index 98%
rename from samples/ControlGallery/Views/NavigationSource.razor
rename to samples/ControlGallery/Views/Shell/ShellNavigationPage.razor
index b5e67477..7fd3b6fa 100644
--- a/samples/ControlGallery/Views/NavigationSource.razor
+++ b/samples/ControlGallery/Views/Shell/ShellNavigationPage.razor
@@ -2,7 +2,7 @@
 @using ControlGallery.Models
 @inject ShellNavigationManager NavigationManager
 
-<ContentPage>
+<ContentPage Title="Shell navigation">
     <ScrollView>
         <StackLayout>
             <Button Text="Navigate with no parameters" OnClick="NavigateNoParameter"></Button>
diff --git a/samples/ControlGallery/Views/ShellPropertiesPlayground.razor b/samples/ControlGallery/Views/Shell/ShellPropertiesPage.razor
similarity index 85%
rename from samples/ControlGallery/Views/ShellPropertiesPlayground.razor
rename to samples/ControlGallery/Views/Shell/ShellPropertiesPage.razor
index 66e9c28c..79a6a67e 100644
--- a/samples/ControlGallery/Views/ShellPropertiesPlayground.razor
+++ b/samples/ControlGallery/Views/Shell/ShellPropertiesPage.razor
@@ -8,13 +8,6 @@
         <ToolbarItem Text="Help" OnClick="ShowHelp" />
     </ToolbarItems>
 
-    <Background>
-        <LinearGradientBrush EndPoint="new Point(0,1)">
-            <GradientStop Color="Colors.LightSkyBlue" Offset="0" />
-            <GradientStop Color="Colors.White" Offset="1" />
-        </LinearGradientBrush>
-    </Background>
-
     <ChildContent>
         <StackLayout>
             <StackLayout Orientation="StackOrientation.Horizontal">
diff --git a/samples/ControlGallery/ShellTab.razor b/samples/ControlGallery/Views/Shell/ShellTab.razor
similarity index 100%
rename from samples/ControlGallery/ShellTab.razor
rename to samples/ControlGallery/Views/Shell/ShellTab.razor
diff --git a/samples/ControlGallery/Views/SkiaCanvasDemo.razor b/samples/ControlGallery/Views/SkiaCanvasPage.razor
similarity index 100%
rename from samples/ControlGallery/Views/SkiaCanvasDemo.razor
rename to samples/ControlGallery/Views/SkiaCanvasPage.razor
diff --git a/samples/ControlGallery/Views/SkiaCanvasDemo.razor.cs b/samples/ControlGallery/Views/SkiaCanvasPage.razor.cs
similarity index 98%
rename from samples/ControlGallery/Views/SkiaCanvasDemo.razor.cs
rename to samples/ControlGallery/Views/SkiaCanvasPage.razor.cs
index f98e6284..bc3e5240 100644
--- a/samples/ControlGallery/Views/SkiaCanvasDemo.razor.cs
+++ b/samples/ControlGallery/Views/SkiaCanvasPage.razor.cs
@@ -4,11 +4,10 @@
 using BlazorBindings.Maui.SkiaSharp;
 using SkiaSharp;
 using SkiaSharp.Views.Maui;
-using System;
 
 namespace ControlGallery.Views
 {
-    public partial class SkiaCanvasDemo
+    public partial class SkiaCanvasPage
     {
         public SKCanvasView CanvasView { get; set; }
         public SKCanvasView CanvasView2 { get; set; }
diff --git a/samples/ControlGallery/Views/SkiaPlayground.razor b/samples/ControlGallery/Views/SkiaPlayground.razor
deleted file mode 100644
index cb4cb572..00000000
--- a/samples/ControlGallery/Views/SkiaPlayground.razor
+++ /dev/null
@@ -1,13 +0,0 @@
-@page "/skia"
-@inject ShellNavigationManager NavigationManager
-
-<ContentPage>
-    <StackLayout>
-        <Button Text="Skia Canvas Paths" OnClick="NavigateToSkiaCanvas"></Button>
-    </StackLayout>
-</ContentPage>
-
-@code
-{
-    async Task NavigateToSkiaCanvas() => await NavigationManager.NavigateToAsync("/skia/canvas");
-}