diff --git a/source/Eppie.App/Eppie.App.Shared/Styles/NavigationViewStyle.xaml b/source/Eppie.App/Eppie.App.Shared/Styles/NavigationViewStyle.xaml
index e3069389..825d815d 100644
--- a/source/Eppie.App/Eppie.App.Shared/Styles/NavigationViewStyle.xaml
+++ b/source/Eppie.App/Eppie.App.Shared/Styles/NavigationViewStyle.xaml
@@ -1,55 +1,527 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:contract4Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,4)"
+                    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
+                    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
+                    xmlns:controls="using:Microsoft.UI.Xaml.Controls"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:local="using:Tuvi.App.Shared.Styles"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:xamarin="http://uno.ui/xamarin"
                     mc:Ignorable="d xamarin">
 
-    <!--  ToDo: use Microsoft.UI.Xaml.Controls.NavigationView  -->
-    <Style x:Key="MainPageNavigationViewStyle" TargetType="NavigationView">
+    <!--  Original style from https://github.com/microsoft/microsoft-ui-xaml/blob/v2.8.6/dev/NavigationView/NavigationView.xaml  -->
+
+    <Style x:Key="MainPageNavigationViewStyle" TargetType="controls:NavigationView">
         <Setter Property="PaneToggleButtonStyle" Value="{StaticResource PaneToggleButtonStyle}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="CompactPaneLength" Value="{ThemeResource NavigationViewCompactPaneLength}" />
-        <!--
+        <!--  Setter with condition does not work (look at: https://github.com/microsoft/microsoft-ui-xaml/issues/2556#issuecomment-1593879984)  -->
+        <!--  <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />  -->
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="NavigationView">
+                <ControlTemplate TargetType="controls:NavigationView">
                     <Grid x:Name="RootGrid">
+                        <!--  Button grid  -->
+                        <Grid x:Name="PaneToggleButtonGrid"
+                              HorizontalAlignment="Left"
+                              VerticalAlignment="Top"
+                              Canvas.ZIndex="100">
+
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+
+                            <Grid x:Name="TogglePaneTopPadding" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" />
+
+                            <Grid x:Name="ButtonHolderGrid"
+                                  Grid.Row="1"
+                                  Margin="{ThemeResource NavigationViewButtonHolderGridMargin}">
+                                <Button x:Name="NavigationViewBackButton"
+                                        Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.SmallerPaneToggleButtonWidth}"
+                                        VerticalAlignment="Top"
+                                        IsEnabled="{TemplateBinding IsBackEnabled}"
+                                        Style="{StaticResource NavigationBackButtonNormalStyle}"
+                                        Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.BackButtonVisibility}">
+                                    <ToolTipService.ToolTip>
+                                        <ToolTip x:Name="NavigationViewBackButtonToolTip" />
+                                    </ToolTipService.ToolTip>
+                                </Button>
+                                <Button x:Name="NavigationViewCloseButton"
+                                        VerticalAlignment="Top"
+                                        Style="{StaticResource NavigationBackButtonNormalStyle}">
+                                    <ToolTipService.ToolTip>
+                                        <ToolTip x:Name="NavigationViewCloseButtonToolTip" />
+                                    </ToolTipService.ToolTip>
+                                </Button>
+                                <Button x:Name="TogglePaneButton"
+                                        MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.SmallerPaneToggleButtonWidth}"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Top"
+                                        AutomationProperties.LandmarkType="Navigation"
+                                        FocusVisualMargin="0"
+                                        Style="{TemplateBinding PaneToggleButtonStyle}"
+                                        Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneToggleButtonVisibility}">
+                                    <TextBlock x:Name="PaneTitleTextBlock"
+                                               Grid.Column="0"
+                                               Margin="0,-2,0,0"
+                                               HorizontalAlignment="Left"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource NavigationViewItemHeaderTextStyle}"
+                                               Text="{TemplateBinding PaneTitle}" />
+                                </Button>
+
+                                <Grid x:Name="PaneTitleHolder"
+                                      Height="40"
+                                      Visibility="Collapsed">
+                                    <ContentControl x:Name="PaneTitlePresenter"
+                                                    Margin="{ThemeResource NavigationViewPaneTitlePresenterMargin}"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    VerticalContentAlignment="Stretch"
+                                                    IsTabStop="False" />
+                                </Grid>
+                            </Grid>
+                        </Grid>
+
+                        <!--  Content layouts  -->
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+
+                            <!--  DisplayMode top  -->
+                            <StackPanel x:Name="TopNavArea"
+                                        Grid.Row="0"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Top"
+                                        contract4Present:XYFocusKeyboardNavigation="Enabled"
+                                        Background="{ThemeResource NavigationViewTopPaneBackground}"
+                                        Canvas.ZIndex="1">
+
+                                <Grid x:Name="TopNavTopPadding"
+                                      Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}"
+                                      Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}" />
 
+                                <Grid x:Name="TopNavGrid"
+                                      Height="{ThemeResource NavigationViewTopPaneHeight}"
+                                      Margin="{ThemeResource TopNavigationViewTopNavGridMargin}"
+                                      BorderBrush="{ThemeResource NavigationViewItemSeparatorForeground}"
+                                      Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition x:Name="BackButtonPlaceholderOnTopNav" Width="{ThemeResource NavigationBackButtonWidth}" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" MinWidth="{ThemeResource TopNavigationViewPaneCustomContentMinWidth}" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+
+                                    <Grid x:Name="TopNavLeftPadding"
+                                          Grid.Column="1"
+                                          Width="0" />
+
+                                    <ContentControl x:Name="PaneHeaderOnTopPane"
+                                                    Grid.Column="2"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    VerticalContentAlignment="Stretch"
+                                                    IsTabStop="False" />
+
+                                    <ContentControl x:Name="PaneTitleOnTopPane"
+                                                    Grid.Column="2"
+                                                    Margin="{ThemeResource NavigationViewItemInnerHeaderMargin}"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    VerticalContentAlignment="Stretch"
+                                                    IsTabStop="False" />
+
+                                    <!--  Top nav ItemsRepeater  -->
+                                    <controls:ItemsRepeaterScrollHost Grid.Column="3">
+                                        <ScrollViewer HorizontalScrollBarVisibility="Hidden"
+                                                      HorizontalScrollMode="Disabled"
+                                                      VerticalScrollBarVisibility="Hidden"
+                                                      VerticalScrollMode="Disabled">
+                                            <controls:ItemsRepeater x:Name="TopNavMenuItemsHost"
+                                                                    AutomationProperties.AccessibilityView="Content"
+                                                                    AutomationProperties.LandmarkType="Navigation"
+                                                                    AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}">
+                                                <controls:ItemsRepeater.Layout>
+                                                    <controls:StackLayout Orientation="Horizontal" />
+                                                </controls:ItemsRepeater.Layout>
+                                            </controls:ItemsRepeater>
+                                        </ScrollViewer>
+                                    </controls:ItemsRepeaterScrollHost>
+
+                                    <Button x:Name="TopNavOverflowButton"
+                                            Grid.Column="4"
+                                            Margin="{ThemeResource TopNavigationViewOverflowButtonMargin}"
+                                            Content="More"
+                                            Style="{StaticResource NavigationViewOverflowButtonStyleWhenPaneOnTop}"
+                                            Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OverflowButtonVisibility}">
+
+                                        <Button.Flyout>
+                                            <Flyout contract7NotPresent:Placement="Bottom"
+                                                    contract7Present:Placement="BottomEdgeAlignedRight"
+                                                    ElementSoundMode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ElementSoundMode}">
+                                                <Flyout.FlyoutPresenterStyle>
+                                                    <Style TargetType="FlyoutPresenter">
+                                                        <Setter Property="Padding" Value="{ThemeResource TopNavigationViewOverflowMenuPadding}" />
+                                                        <!--  Set negative top margin to make the flyout align exactly with the button  -->
+                                                        <Setter Property="Margin" Value="0,-4,0,0" />
+                                                        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto" />
+                                                        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+                                                        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
+                                                        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+                                                        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+                                                        <!--  Setter with condition does not work (look at: https://github.com/microsoft/microsoft-ui-xaml/issues/2556#issuecomment-1593879984)  -->
+                                                        <!--  Note: it can be ignored. We don't use the NavigatioView control in Top DisplayMode  -->
+                                                        <!--  <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />  -->
+                                                        <Setter Property="Template">
+                                                            <Setter.Value>
+                                                                <ControlTemplate TargetType="FlyoutPresenter">
+                                                                    <ScrollViewer x:Name="ScrollViewer"
+                                                                                  AutomationProperties.AccessibilityView="Raw"
+                                                                                  HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                                                  HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                                                                                  VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                                                  VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                                                                                  ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
+                                                                        <ContentPresenter x:Name="ContentPresenter"
+                                                                                          Padding="{TemplateBinding Padding}"
+                                                                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                                                          contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}"
+                                                                                          contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
+                                                                                          Background="{TemplateBinding Background}"
+                                                                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                                                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                                                                          Content="{TemplateBinding Content}"
+                                                                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                                                          ContentTransitions="{TemplateBinding ContentTransitions}" />
+                                                                    </ScrollViewer>
+                                                                </ControlTemplate>
+                                                            </Setter.Value>
+                                                        </Setter>
+                                                    </Style>
+                                                </Flyout.FlyoutPresenterStyle>
+                                                <controls:ItemsRepeaterScrollHost>
+                                                    <ScrollViewer VerticalScrollBarVisibility="Auto">
+                                                        <controls:ItemsRepeater x:Name="TopNavMenuItemsOverflowHost" AutomationProperties.AccessibilityView="Content">
+                                                            <controls:ItemsRepeater.Layout>
+                                                                <controls:StackLayout />
+                                                            </controls:ItemsRepeater.Layout>
+                                                        </controls:ItemsRepeater>
+                                                    </ScrollViewer>
+                                                </controls:ItemsRepeaterScrollHost>
+                                            </Flyout>
+                                        </Button.Flyout>
+                                    </Button>
+
+                                    <ContentControl x:Name="PaneCustomContentOnTopPane"
+                                                    Grid.Column="5"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    VerticalContentAlignment="Stretch"
+                                                    IsTabStop="False" />
+
+                                    <Grid x:Name="TopPaneAutoSuggestArea"
+                                          Grid.Column="6"
+                                          Height="{ThemeResource NavigationViewTopPaneHeight}">
+
+                                        <ContentControl x:Name="TopPaneAutoSuggestBoxPresenter"
+                                                        MinWidth="216"
+                                                        Margin="{ThemeResource TopNavigationViewAutoSuggestBoxMargin}"
+                                                        HorizontalContentAlignment="Stretch"
+                                                        VerticalContentAlignment="Center"
+                                                        IsTabStop="False" />
+                                    </Grid>
+
+                                    <ContentControl x:Name="PaneFooterOnTopPane"
+                                                    Grid.Column="7"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    VerticalContentAlignment="Stretch"
+                                                    IsTabStop="False" />
+                                    <!--  Top footer menu ItemsRepeater  -->
+                                    <controls:ItemsRepeater x:Name="TopFooterMenuItemsHost"
+                                                            Grid.Column="8"
+                                                            AutomationProperties.AccessibilityView="Content"
+                                                            AutomationProperties.LandmarkType="Navigation">
+                                        <controls:ItemsRepeater.Layout>
+                                            <controls:StackLayout Orientation="Horizontal" />
+                                        </controls:ItemsRepeater.Layout>
+                                    </controls:ItemsRepeater>
+
+                                </Grid>
+                                <Border x:Name="TopNavContentOverlayAreaGrid" Child="{TemplateBinding ContentOverlay}" />
+                            </StackPanel>
+
+                            <!--  Displaymode (compact/minimal/normal) left  -->
+                            <SplitView x:Name="RootSplitView"
+                                       Grid.Row="1"
+                                       contract7Present:CornerRadius="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                                       Background="{TemplateBinding Background}"
+                                       BorderBrush="{ThemeResource NavigationViewItemSeparatorForeground}"
+                                       BorderThickness="{ThemeResource NavigationViewBorderThickness}"
+                                       CompactPaneLength="{TemplateBinding CompactPaneLength}"
+                                       DisplayMode="Inline"
+                                       IsPaneOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPaneOpen, Mode=TwoWay}"
+                                       IsTabStop="False"
+                                       OpenPaneLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneLength}"
+                                       PaneBackground="{ThemeResource NavigationViewDefaultPaneBackground}">
+
+                                <SplitView.Pane>
+                                    <Grid x:Name="PaneContentGrid"
+                                          Margin="{ThemeResource NavigationViewPaneContentGridMargin}"
+                                          HorizontalAlignment="Left"
+                                          BorderBrush="{ThemeResource NavigationViewItemSeparatorForeground}"
+                                          Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.LeftPaneVisibility}">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="0" />
+                                            <!--  above button margin + back button space  -->
+                                            <RowDefinition x:Name="PaneContentGridToggleButtonRow" Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="0" />
+                                            <!--  above list margin  -->
+                                            <RowDefinition x:Name="ItemsContainerRow" Height="*" />
+                                        </Grid.RowDefinitions>
+
+                                        <Grid x:Name="ContentPaneTopPadding" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" />
+
+                                        <Grid Grid.Row="2">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition x:Name="PaneHeaderContentBorderRow" />
+                                            </Grid.RowDefinitions>
+
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition x:Name="PaneHeaderCloseButtonColumn" />
+                                                <ColumnDefinition x:Name="PaneHeaderToggleButtonColumn" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+
+                                            <ContentControl x:Name="PaneHeaderContentBorder"
+                                                            Grid.Column="2"
+                                                            HorizontalContentAlignment="Stretch"
+                                                            VerticalContentAlignment="Stretch"
+                                                            IsTabStop="False" />
+                                        </Grid>
+
+                                        <Grid x:Name="AutoSuggestArea"
+                                              Grid.Row="3"
+                                              Height="{ThemeResource NavigationViewAutoSuggestAreaHeight}"
+                                              Margin="0,0,0,8"
+                                              VerticalAlignment="Center">
+
+                                            <ContentControl x:Name="PaneAutoSuggestBoxPresenter"
+                                                            Margin="{ThemeResource NavigationViewAutoSuggestBoxMargin}"
+                                                            HorizontalContentAlignment="Stretch"
+                                                            VerticalContentAlignment="Center"
+                                                            IsTabStop="False" />
+
+                                            <Button x:Name="PaneAutoSuggestButton"
+                                                    Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.SmallerPaneToggleButtonWidth}"
+                                                    Style="{ThemeResource NavigationViewPaneSearchButtonStyle}"
+                                                    Visibility="Collapsed">
+                                                <Button.Resources>
+                                                    <ResourceDictionary>
+                                                        <ResourceDictionary.ThemeDictionaries>
+                                                            <ResourceDictionary x:Key="Default">
+                                                                <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="NavigationViewItemBackgroundPointerOver" />
+                                                                <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="NavigationViewItemBackgroundPressed" />
+                                                                <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="NavigationViewItemBackgroundDisabled" />
+                                                                <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="NavigationViewItemForegroundPointerOver" />
+                                                                <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="NavigationViewItemForegroundPressed" />
+                                                                <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="NavigationViewItemForegroundDisabled" />
+                                                                <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="NavigationViewItemBorderBrushPointerOver" />
+                                                                <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="NavigationViewItemBorderBrushPressed" />
+                                                                <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="NavigationViewItemBorderBrushDisabled" />
+                                                            </ResourceDictionary>
+                                                            <ResourceDictionary x:Key="Light">
+                                                                <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="NavigationViewItemBackgroundPointerOver" />
+                                                                <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="NavigationViewItemBackgroundPressed" />
+                                                                <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="NavigationViewItemBackgroundDisabled" />
+                                                                <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="NavigationViewItemForegroundPointerOver" />
+                                                                <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="NavigationViewItemForegroundPressed" />
+                                                                <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="NavigationViewItemForegroundDisabled" />
+                                                                <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="NavigationViewItemBorderBrushPointerOver" />
+                                                                <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="NavigationViewItemBorderBrushPressed" />
+                                                                <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="NavigationViewItemBorderBrushDisabled" />
+                                                            </ResourceDictionary>
+                                                        </ResourceDictionary.ThemeDictionaries>
+                                                    </ResourceDictionary>
+                                                </Button.Resources>
+                                            </Button>
+                                        </Grid>
+
+                                        <ContentControl x:Name="PaneCustomContentBorder"
+                                                        Grid.Row="4"
+                                                        HorizontalContentAlignment="Stretch"
+                                                        VerticalContentAlignment="Stretch"
+                                                        IsTabStop="False" />
+
+                                        <!--  "Non header" content  -->
+                                        <Grid x:Name="ItemsContainerGrid" Grid.Row="6">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="*" />
+                                                <!--  MenuItems  -->
+                                                <RowDefinition Height="Auto" />
+                                                <!--  Separator if overflow  -->
+                                                <RowDefinition Height="Auto" />
+                                                <!--  PaneFooter  -->
+                                                <RowDefinition Height="Auto" />
+                                                <!--  FooterItems  -->
+                                            </Grid.RowDefinitions>
+
+                                            <!--  MenuItems  -->
+                                            <controls:ItemsRepeaterScrollHost HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                                                <ScrollViewer x:Name="MenuItemsScrollViewer"
+                                                              TabNavigation="Local"
+                                                              VerticalScrollBarVisibility="Auto">
+                                                    <!--  Left nav ItemsRepeater  -->
+                                                    <controls:ItemsRepeater x:Name="MenuItemsHost"
+                                                                            AutomationProperties.AccessibilityView="Content"
+                                                                            AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}">
+                                                        <controls:ItemsRepeater.Layout>
+                                                            <controls:StackLayout />
+                                                        </controls:ItemsRepeater.Layout>
+                                                    </controls:ItemsRepeater>
+                                                </ScrollViewer>
+                                            </controls:ItemsRepeaterScrollHost>
+
+                                            <controls:NavigationViewItemSeparator x:Name="VisualItemsSeparator"
+                                                                                  Grid.Row="1"
+                                                                                  Margin="0,0,0,2"
+                                                                                  HorizontalAlignment="Stretch"
+                                                                                  VerticalAlignment="Center"
+                                                                                  Visibility="Collapsed" />
+
+                                            <!--  PaneFooter  -->
+                                            <ContentControl x:Name="FooterContentBorder"
+                                                            Grid.Row="2"
+                                                            Margin="0,0,0,4"
+                                                            HorizontalContentAlignment="Stretch"
+                                                            VerticalContentAlignment="Stretch"
+                                                            IsTabStop="False" />
+
+                                            <!--  FooterItems  -->
+                                            <controls:ItemsRepeaterScrollHost Grid.Row="3">
+                                                <ScrollViewer x:Name="FooterItemsScrollViewer"
+                                                              contract7Present:VerticalAnchorRatio="1"
+                                                              VerticalScrollBarVisibility="Auto">
+                                                    <controls:ItemsRepeater x:Name="FooterMenuItemsHost" AutomationProperties.AccessibilityView="Content">
+                                                        <controls:ItemsRepeater.Layout>
+                                                            <controls:StackLayout />
+                                                        </controls:ItemsRepeater.Layout>
+                                                    </controls:ItemsRepeater>
+                                                </ScrollViewer>
+                                            </controls:ItemsRepeaterScrollHost>
+                                        </Grid>
+                                    </Grid>
+                                </SplitView.Pane>
+
+                                <SplitView.Content>
+                                    <Grid x:Name="ContentGrid"
+                                          Margin="{ThemeResource NavigationViewContentMargin}"
+                                          contract7Present:CornerRadius="{ThemeResource NavigationViewContentGridCornerRadius}"
+                                          Background="{ThemeResource NavigationViewContentBackground}"
+                                          BorderBrush="{ThemeResource NavigationViewContentGridBorderBrush}"
+                                          BorderThickness="{ThemeResource NavigationViewContentGridBorderThickness}">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="*" />
+                                        </Grid.RowDefinitions>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <Grid x:Name="ContentTopPadding"
+                                              Grid.ColumnSpan="2"
+                                              Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}"
+                                              Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.LeftPaneVisibility}" />
+
+                                        <Grid x:Name="ContentLeftPadding" Grid.Row="1" />
+
+                                        <ContentControl x:Name="HeaderContent"
+                                                        Grid.Row="1"
+                                                        Grid.Column="1"
+                                                        MinHeight="{StaticResource PaneToggleButtonHeight}"
+                                                        HorizontalContentAlignment="Stretch"
+                                                        VerticalContentAlignment="Stretch"
+                                                        Content="{TemplateBinding Header}"
+                                                        ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                        IsTabStop="False"
+                                                        Style="{StaticResource NavigationViewTitleHeaderContentControlTextStyle}" />
+
+                                        <ContentPresenter x:Name="ContentPresenter"
+                                                          Grid.Row="2"
+                                                          Grid.ColumnSpan="2"
+                                                          Margin="{ThemeResource NavigationViewContentPresenterMargin}"
+                                                          AutomationProperties.LandmarkType="Main"
+                                                          Content="{TemplateBinding Content}" />
+                                    </Grid>
+                                </SplitView.Content>
+                            </SplitView>
+
+                            <Grid x:Name="ShadowCaster"
+                                  Grid.RowSpan="2"
+                                  Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneLength}"
+                                  HorizontalAlignment="Left">
+                                <Grid.RenderTransform>
+                                    <CompositeTransform x:Name="ShadowCasterTransform" />
+                                </Grid.RenderTransform>
+                            </Grid>
+
+                        </Grid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="DisplayModeGroup">
                                 <VisualState x:Name="Compact" />
 
-                                <VisualState x:Name="Expanded">
+                                <VisualState x:Name="Expanded" />
+
+                                <VisualState x:Name="Minimal">
                                     <VisualState.Setters>
-                                        <Setter Target="RootSplitView.PaneBackground" Value="{ThemeResource NavigationViewExpandedPaneBackground}" />
+                                        <Setter Target="HeaderContent.Margin" Value="{ThemeResource NavigationViewMinimalHeaderMargin}" />
+                                        <Setter Target="NavigationViewBackButton.Style" Value="{ThemeResource NavigationBackButtonSmallStyle}" />
+                                        <Setter Target="ContentGrid.BorderThickness" Value="{ThemeResource NavigationViewMinimalContentGridBorderThickness}" />
+                                        <Setter Target="ContentGrid.CornerRadius" Value="{ThemeResource NavigationViewMinimalContentGridCornerRadius}" />
+                                        <Setter Target="ContentGrid.Margin" Value="{ThemeResource NavigationViewMinimalContentMargin}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                                <VisualState x:Name="Minimal">
+                                <VisualState x:Name="TopNavigationMinimal">
                                     <VisualState.Setters>
-                                        <Setter Target="HeaderContent.Margin" Value="48,5,0,0" />
+                                        <Setter Target="ContentGrid.BorderThickness" Value="{ThemeResource TopNavigationViewContentGridBorderThickness}" />
+                                        <Setter Target="ContentGrid.CornerRadius" Value="{ThemeResource TopNavigationViewContentGridCornerRadius}" />
+                                        <Setter Target="ContentGrid.Margin" Value="{ThemeResource TopNavigationViewContentMargin}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
                                 <VisualState x:Name="MinimalWithBackButton">
                                     <VisualState.Setters>
-                                        <Setter Target="HeaderContent.Margin" Value="104,5,0,0" />
+                                        <Setter Target="HeaderContent.Margin" Value="{ThemeResource NavigationViewMinimalHeaderMargin}" />
+                                        <Setter Target="NavigationViewBackButton.Style" Value="{ThemeResource NavigationBackButtonSmallStyle}" />
+                                        <Setter Target="ContentGrid.BorderThickness" Value="{ThemeResource NavigationViewMinimalContentGridBorderThickness}" />
+                                        <Setter Target="ContentGrid.CornerRadius" Value="{ThemeResource NavigationViewMinimalContentGridCornerRadius}" />
+                                        <Setter Target="ContentGrid.Margin" Value="{ThemeResource NavigationViewMinimalContentMargin}" />
                                     </VisualState.Setters>
                                 </VisualState>
-
                             </VisualStateGroup>
 
                             <VisualStateGroup x:Name="TogglePaneGroup">
-                                <VisualState x:Name="TogglePaneButtonVisible" />
-                                <VisualState x:Name="TogglePaneButtonCollapsed">
+                                <VisualState x:Name="TogglePaneButtonCollapsed" />
+                                <VisualState x:Name="TogglePaneButtonVisible">
                                     <VisualState.Setters>
-                                        <Setter Target="PaneContentGridToggleButtonRow.Height" Value="4" />
+                                        <!--  Might not need this setter when all the margins/paddings will be adequately set.  -->
+                                        <!--  This MinHeight setter is only here to ensure that AutoSuggestBox doesn't draw over ToggleButton.  -->
+                                        <Setter Target="PaneContentGridToggleButtonRow.MinHeight" Value="{StaticResource NavigationViewPaneHeaderRowMinHeight}" />
+                                        <Setter Target="PaneTitlePresenter.Margin" Value="{ThemeResource NavigationViewItemInnerHeaderMargin}" />
                                     </VisualState.Setters>
                                 </VisualState>
-
                             </VisualStateGroup>
 
                             <VisualStateGroup x:Name="HeaderGroup">
@@ -59,18 +531,6 @@
                                         <Setter Target="HeaderContent.Visibility" Value="Collapsed" />
                                     </VisualState.Setters>
                                 </VisualState>
-
-                            </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="SettingsGroup">
-                                <VisualState x:Name="SettingsVisible" />
-                                <VisualState x:Name="SettingsCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="SettingsNavPaneItem.Visibility" Value="Collapsed" />
-                                        <Setter Target="SettingsTopNavPaneItem.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
                             </VisualStateGroup>
 
                             <VisualStateGroup x:Name="AutoSuggestGroup">
@@ -81,7 +541,6 @@
                                         <Setter Target="TopPaneAutoSuggestArea.Visibility" Value="Collapsed" />
                                     </VisualState.Setters>
                                 </VisualState>
-
                             </VisualStateGroup>
 
                             <VisualStateGroup x:Name="PaneStateGroup">
@@ -92,45 +551,74 @@
                                         <Setter Target="PaneAutoSuggestButton.Visibility" Value="Visible" />
                                     </VisualState.Setters>
                                 </VisualState>
-
                             </VisualStateGroup>
 
                             <VisualStateGroup x:Name="PaneStateListSizeGroup">
                                 <VisualState x:Name="ListSizeFull" />
                                 <VisualState x:Name="ListSizeCompact">
                                     <VisualState.Setters>
-                                        <Setter Target="MenuItemsHost.HorizontalAlignment" Value="Left" />-->
-        <!--  This is essentially a TemplateBinding:  -->
-        <!--
-                                        <win:Setter Target="MenuItemsHost.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
-                                        <xamarin:Setter Target="MenuItemsHost.Width" Value="40" />
-                                        <Setter Target="SettingsNavPaneItem.HorizontalAlignment" Value="Left" />
-                                        <win:Setter Target="SettingsNavPaneItem.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
-                                        <xamarin:Setter Target="SettingsNavPaneItem.Width" Value="40" />
+                                        <Setter Target="PaneContentGrid.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
+                                        <Setter Target="ShadowCaster.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
                                         <Setter Target="PaneTitleTextBlock.Visibility" Value="Collapsed" />
                                         <Setter Target="PaneHeaderContentBorder.Visibility" Value="Collapsed" />
                                         <Setter Target="PaneCustomContentBorder.HorizontalAlignment" Value="Left" />
-                                        <win:Setter Target="PaneCustomContentBorder.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
-                                        <xamarin:Setter Target="PaneCustomContentBorder.Width" Value="40" />
                                         <Setter Target="FooterContentBorder.HorizontalAlignment" Value="Left" />
-                                        <win:Setter Target="FooterContentBorder.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
-                                        <xamarin:Setter Target="FooterContentBorder.Width" Value="40" />
                                     </VisualState.Setters>
                                 </VisualState>
+                            </VisualStateGroup>
 
+                            <VisualStateGroup x:Name="PaneOverlayGroup">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition From="PaneNotOverlaying" To="PaneOverlaying">
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ShadowCasterTransform" Storyboard.TargetProperty="TranslateX">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="{Binding ElementName=RootSplitView, Path=TemplateSettings.NegativeOpenPaneLengthMinusCompactLength}" />
+                                                <SplineDoubleKeyFrame KeySpline="0.1,0.9 0.2,1.0"
+                                                                      KeyTime="0:0:0.35"
+                                                                      Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ShadowCaster" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.35" Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ShadowCaster" Storyboard.TargetProperty="HorizontalAlignment">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Left" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                    <VisualTransition From="PaneOverlaying" To="PaneNotOverlaying">
+                                        <Storyboard x:Name="ShadowCasterEaseOutStoryboard">
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ShadowCasterTransform" Storyboard.TargetProperty="TranslateX">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                                <SplineDoubleKeyFrame KeySpline="0.1,0.9 0.2,1.0"
+                                                                      KeyTime="0:0:0.12"
+                                                                      Value="{Binding ElementName=RootSplitView, Path=TemplateSettings.NegativeOpenPaneLengthMinusCompactLength}" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ShadowCaster" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.12" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ShadowCaster" Storyboard.TargetProperty="HorizontalAlignment">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Left" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                </VisualStateGroup.Transitions>
+                                <VisualState x:Name="PaneOverlaying" />
+                                <VisualState x:Name="PaneNotOverlaying">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootSplitView.BorderBrush" Value="Transparent" />
+                                        <Setter Target="ShadowCaster.Opacity" Value="0" />
+                                        <Setter Target="RootSplitView.PaneBackground" Value="{ThemeResource NavigationViewExpandedPaneBackground}" />
+                                    </VisualState.Setters>
+                                </VisualState>
                             </VisualStateGroup>
 
                             <VisualStateGroup x:Name="TitleBarVisibilityGroup">
                                 <VisualState x:Name="TitleBarVisible" />
                                 <VisualState x:Name="TitleBarCollapsed">
-                                    <VisualState.Setters>-->
-        <!--  This element does not exist  -->
-        <!--<Setter Target="PaneButtonGrid.Margin" Value="0,32,0,0" />-->
-        <!--
+                                    <VisualState.Setters>
                                         <Setter Target="PaneContentGrid.Margin" Value="0,32,0,0" />
                                     </VisualState.Setters>
                                 </VisualState>
-
                             </VisualStateGroup>
 
                             <VisualStateGroup x:Name="OverflowLabelGroup">
@@ -140,7 +628,6 @@
                                         <Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource NavigationViewOverflowButtonNoLabelStyleWhenPaneOnTop}" />
                                     </VisualState.Setters>
                                 </VisualState>
-
                             </VisualStateGroup>
 
                             <VisualStateGroup x:Name="BackButtonGroup">
@@ -150,385 +637,35 @@
                                         <Setter Target="BackButtonPlaceholderOnTopNav.Width" Value="0" />
                                     </VisualState.Setters>
                                 </VisualState>
+                            </VisualStateGroup>
 
+                            <VisualStateGroup x:Name="PaneVisibilityGroup">
+                                <VisualState x:Name="PaneVisible" />
+                                <VisualState x:Name="PaneCollapsed">
+                                    <VisualState.Setters>
+                                        <!--  Note that RootSplitView.DisplayMode is set in code so we don't want to  -->
+                                        <!--  write it here and interfere. But these values work together to hide  -->
+                                        <!--  the left pane.  -->
+                                        <Setter Target="RootSplitView.CompactPaneLength" Value="0" />
+                                        <Setter Target="ShadowCaster.Width" Value="0" />
+                                        <Setter Target="PaneToggleButtonGrid.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
                             </VisualStateGroup>
 
+                            <VisualStateGroup x:Name="PaneSeparatorStates">
+                                <VisualState x:Name="SeparatorCollapsed" />
+                                <VisualState x:Name="SeparatorVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="VisualItemsSeparator.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-
-                        <Grid>
-
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-
-                            <StackPanel
-                                x:Name="TopNavArea"
-                                Background="{ThemeResource NavigationViewTopPaneBackground}"
-                                Grid.Row="0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Top"
-                                Canvas.ZIndex="1">
-
-                                <Grid x:Name="TopNavTopPadding"
-                                      Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}"
-                                      Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}"/>
-
-                                <Grid x:Name="TopNavGrid"
-                                      Height="{ThemeResource NavigationViewTopPaneHeight}"
-                                      Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition x:Name="BackButtonPlaceholderOnTopNav" Width="{ThemeResource NavigationBackButtonWidth}" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" MinWidth="48" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-
-                                    <Grid
-                                        x:Name="TopNavLeftPadding"
-                                        Grid.Column="1"
-                                        Width="0"/>
-
-                                    <ContentControl
-                                        x:Name="PaneHeaderOnTopPane"
-                                        IsTabStop="False"
-                                        VerticalContentAlignment="Stretch"
-                                        HorizontalContentAlignment="Stretch"
-                                        Grid.Column="2"/>-->
-        <!--  Top nav list  -->
-        <!--
-                                    <NavigationViewList AutomationProperties.LandmarkType="Navigation"
-														x:Name="TopNavMenuItemsHost"
-														Grid.Column="3"
-														SelectionMode="Single"
-														IsItemClickEnabled="True"
-														ItemTemplate="{TemplateBinding MenuItemTemplate}"
-														ItemTemplateSelector="{TemplateBinding MenuItemTemplateSelector}"
-														ItemContainerStyle="{TemplateBinding MenuItemContainerStyle}"
-														ItemContainerStyleSelector="{TemplateBinding MenuItemContainerStyleSelector}"
-														ScrollViewer.HorizontalScrollMode="Disabled"
-														ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-														ScrollViewer.VerticalScrollMode="Disabled"
-														ScrollViewer.VerticalScrollBarVisibility="Hidden"
-														SingleSelectionFollowsFocus="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.SingleSelectionFollowsFocus}">
-                                        <ListView.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <ItemsStackPanel Orientation="Horizontal" />
-                                            </ItemsPanelTemplate>
-                                        </ListView.ItemsPanel>
-                                        <ListView.ItemContainerTransitions>
-                                            <TransitionCollection />
-                                        </ListView.ItemContainerTransitions>
-                                    </NavigationViewList>
-
-                                    <Button
-                                        x:Name="TopNavOverflowButton"
-                                        Grid.Column="4"
-
-                                        Content="More"
-                                        Style="{StaticResource NavigationViewOverflowButtonStyleWhenPaneOnTop}"
-                                        Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OverflowButtonVisibility}">
-
-                                        <Button.Flyout>
-                                            <Flyout Placement="Bottom">
-                                                <Flyout.FlyoutPresenterStyle>
-                                                    <Style TargetType="FlyoutPresenter">-->
-        <!--  DefaultFlyoutPresenter style  -->
-        <!--  Is required until https://github.com/unoplatform/uno/issues/119 is fixed  -->
-        <!--
-                                                        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                                                        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-                                                        <Setter Property="IsTabStop" Value="False" />
-                                                        <Setter Property="Background" Value="{ThemeResource FlyoutPresenterBackground}" />
-                                                        <Setter Property="BorderBrush" Value="{ThemeResource FlyoutBorderThemeBrush}" />
-                                                        <Setter Property="BorderThickness" Value="{ThemeResource FlyoutBorderThemeThickness}" />
-                                                        <Setter Property="Padding" Value="{ThemeResource FlyoutContentThemePadding}" />
-                                                        <Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
-                                                        <Setter Property="MaxWidth" Value="{ThemeResource FlyoutThemeMaxWidth}" />
-                                                        <Setter Property="MinHeight" Value="{ThemeResource FlyoutThemeMinHeight}" />
-                                                        <Setter Property="MaxHeight" Value="{ThemeResource FlyoutThemeMaxHeight}" />
-                                                        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto" />
-                                                        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-                                                        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
-                                                        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-                                                        <win:Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
-                                                        <Setter Property="Template">
-                                                            <Setter.Value>
-                                                                <ControlTemplate TargetType="FlyoutPresenter">
-                                                                    <Border Background="{TemplateBinding Background}"
-                                                                            BackgroundSizing="OuterBorderEdge"
-                                                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                                                            CornerRadius="{TemplateBinding CornerRadius}"
-                                                                            Padding="{ThemeResource FlyoutBorderThemePadding}">
-                                                                        <ScrollViewer x:Name="ScrollViewer"
-                                                                                      xamarin:ZoomMode="Disabled"
-                                                                                      win:ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}"
-                                                                                      HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
-                                                                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                                                                      VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
-                                                                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                                                                                      AutomationProperties.AccessibilityView="Raw">
-                                                                            <ContentPresenter Content="{TemplateBinding Content}"
-                                                                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                                                              ContentTransitions="{TemplateBinding ContentTransitions}"
-                                                                                              Margin="{TemplateBinding Padding}"
-                                                                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                                                                        </ScrollViewer>
-                                                                    </Border>
-                                                                </ControlTemplate>
-                                                            </Setter.Value>
-                                                        </Setter>-->
-        <!--  End of DefaultFlyoutPresenter style  -->
-        <!--
-                                                        <Setter Property="Padding" Value="0,8" />-->
-        <!--  Set negative top margin to make the flyout align exactly with the button  -->
-        <!--
-                                                        <Setter Property="Margin" Value="0,-4,0,0" />
-                                                    </Style>
-                                                </Flyout.FlyoutPresenterStyle>
-                                                <NavigationViewList x:Name="TopNavMenuItemsOverflowHost" ItemTemplate="{TemplateBinding MenuItemTemplate}" ItemTemplateSelector="{TemplateBinding MenuItemTemplateSelector}" ItemContainerStyle="{TemplateBinding MenuItemContainerStyle}" ItemContainerStyleSelector="{TemplateBinding MenuItemContainerStyleSelector}" SingleSelectionFollowsFocus="False" IsItemClickEnabled="True">
-                                                    <ListView.ItemContainerTransitions>
-                                                        <TransitionCollection />
-                                                    </ListView.ItemContainerTransitions>
-                                                </NavigationViewList>
-                                            </Flyout>
-                                        </Button.Flyout>
-                                    </Button>
-
-                                    <ContentControl
-                                        x:Name="PaneCustomContentOnTopPane"
-                                        IsTabStop="False"
-                                        VerticalContentAlignment="Stretch"
-                                        HorizontalContentAlignment="Stretch"
-                                        Grid.Column="5"/>
-
-                                    <Grid
-                                        x:Name="TopPaneAutoSuggestArea"
-                                        Height="{ThemeResource NavigationViewTopPaneHeight}"
-                                        Grid.Column="6">
-
-                                        <ContentControl
-                                            x:Name="TopPaneAutoSuggestBoxPresenter"
-                                            Margin="12,0,12,0"
-                                            MinWidth="48"
-                                            IsTabStop="False"
-                                            HorizontalContentAlignment="Stretch"
-                                            VerticalContentAlignment="Center"/>
-                                    </Grid>
-
-                                    <ContentControl
-                                        x:Name="PaneFooterOnTopPane"
-                                        IsTabStop="False"
-                                        VerticalContentAlignment="Stretch"
-                                        HorizontalContentAlignment="Stretch"
-                                        Grid.Column="7" />
-                                    <NavigationViewItem x:Name="SettingsTopNavPaneItem" Style="{ThemeResource NavigationViewSettingsItemStyleWhenOnTopPane}" Grid.Column="8" Icon="Setting" />
-
-                                </Grid>
-                                <Border
-                                    x:Name="TopNavContentOverlayAreaGrid"
-                                    Child="{TemplateBinding ContentOverlay}" />
-                            </StackPanel>
-
-                            <SplitView
-                                x:Name="RootSplitView"
-                                Background="{TemplateBinding Background}"
-                                CompactPaneLength="{TemplateBinding CompactPaneLength}"
-                                DisplayMode="Inline"
-                                IsPaneOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPaneOpen, Mode=TwoWay}"
-                                IsTabStop="False"
-                                OpenPaneLength="{TemplateBinding OpenPaneLength}"
-                                PaneBackground="{ThemeResource NavigationViewDefaultPaneBackground}"
-
-                                Grid.Row="1">
-
-                                <SplitView.Pane>-->
-        <!--
-            InternalVisibleBoundsPadding is added to this control to make this template compatible
-            with notched devices by default. This behavior is not present in Microsoft's default UWP default.
-        -->
-        <!--
-            Deleted from tags
-            uBehaviors:InternalVisibleBoundsPadding.PaddingMask="All"
-        -->
-        <!--
-                                    <Grid
-                                        x:Name="PaneContentGrid"
-                                        Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.LeftPaneVisibility}">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="0" />-->
-        <!--  above button margin + back button space  -->
-        <!--
-                                            <RowDefinition x:Name="PaneContentGridToggleButtonRow" Height="Auto" />
-                                            <RowDefinition Height="Auto" />-->
-        <!--  changed  -->
-        <!--
-                                            <RowDefinition Height="*" />-->
-        <!--was: <RowDefinition Height="Auto" />-->
-        <!--  changed  -->
-        <!--
-                                            <RowDefinition Height="0" />-->
-        <!--was: <RowDefinition Height="8" />-->
-        <!--  above list margin  -->
-        <!--  changed  -->
-        <!--
-                                            <RowDefinition Height="Auto" />-->
-        <!--was: <RowDefinition Height="*" />-->
-        <!--
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="8" />
-                                        </Grid.RowDefinitions>
-
-                                        <Grid x:Name="ContentPaneTopPadding"
-                                              Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}"/>
-
-                                        <Grid Grid.Row="2" Height="{StaticResource PaneToggleButtonHeight}">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="*" />
-                                            </Grid.ColumnDefinitions>
-
-                                            <TextBlock
-                                                x:Name="PaneTitleTextBlock"
-                                                Grid.Column="0"
-                                                Text="{TemplateBinding PaneTitle}"
-                                                HorizontalAlignment="Left"
-                                                VerticalAlignment="Center"
-                                                Style="{StaticResource NavigationViewItemHeaderTextStyle}"/>
-
-                                            <ContentControl
-                                                x:Name="PaneHeaderContentBorder"
-                                                IsTabStop="False"
-                                                VerticalContentAlignment="Stretch"
-                                                HorizontalContentAlignment="Stretch"
-                                                Grid.Column="1" />
-                                        </Grid>
-
-                                        <Grid
-                                            x:Name="AutoSuggestArea"
-                                            Grid.Row="3"
-                                            Height="{ThemeResource NavigationViewTopPaneHeight}"
-                                            VerticalAlignment="Center">
-
-                                            <ContentControl
-                                                x:Name="PaneAutoSuggestBoxPresenter"
-                                                Margin="{ThemeResource NavigationViewAutoSuggestBoxMargin}"
-                                                IsTabStop="False"
-                                                HorizontalContentAlignment="Stretch"
-                                                VerticalContentAlignment="Center"/>
-
-                                            <Button
-                                                x:Name="PaneAutoSuggestButton"
-                                                Visibility="Collapsed"
-                                                Style="{ThemeResource NavigationViewPaneSearchButtonStyle}"
-                                                Width="{TemplateBinding CompactPaneLength}"/>
-                                        </Grid>
-
-                                        <ContentControl
-                                            x:Name="PaneCustomContentBorder"
-                                            IsTabStop="False"
-                                            VerticalContentAlignment="Stretch"
-                                            HorizontalContentAlignment="Stretch"
-                                            Grid.Row="4" />-->
-        <!--  Left nav list  -->
-        <!--  changed Margin="0,0,0,20" to Margin="0,0,0,0"  -->
-        <!--
-                                        <NavigationViewList x:Name="MenuItemsHost" Grid.Row="6" Margin="0,0,0,0" SelectionMode="Single" IsItemClickEnabled="True" HorizontalAlignment="Stretch" SelectedItem="{TemplateBinding SelectedItem}" ItemTemplate="{TemplateBinding MenuItemTemplate}" ItemTemplateSelector="{TemplateBinding MenuItemTemplateSelector}" ItemContainerStyle="{TemplateBinding MenuItemContainerStyle}" ItemContainerStyleSelector="{TemplateBinding MenuItemContainerStyleSelector}" SingleSelectionFollowsFocus="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.SingleSelectionFollowsFocus}" />
-
-                                        <ContentControl
-                                            x:Name="FooterContentBorder"
-                                            IsTabStop="False"
-                                            VerticalContentAlignment="Stretch"
-                                            HorizontalContentAlignment="Stretch"
-                                            Grid.Row="7" />
-                                        <NavigationViewItem x:Name="SettingsNavPaneItem" Grid.Row="8" Icon="Setting" />
-                                    </Grid>
-                                </SplitView.Pane>
-
-                                <SplitView.Content>
-                                    <Grid x:Name="ContentGrid">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="*" />
-                                        </Grid.RowDefinitions>
-
-                                        <ContentControl
-                                            x:Name="HeaderContent"
-                                            MinHeight="{StaticResource PaneToggleButtonHeight}"
-                                            IsTabStop="False"
-                                            Content="{TemplateBinding Header}"
-                                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                            VerticalContentAlignment="Stretch"
-                                            HorizontalContentAlignment="Stretch"
-                                            Style="{StaticResource NavigationViewTitleHeaderContentControlTextStyle}"/>
-
-                                        <ContentPresenter
-                                            AutomationProperties.LandmarkType="Main"
-                                            Grid.Row="1"
-                                            Content="{TemplateBinding Content}"/>
-                                    </Grid>
-                                </SplitView.Content>
-                            </SplitView>
-
-                        </Grid>-->
-        <!--
-            Notes:
-            - InternalVisibleBoundsPadding is added to this control to make this template compatible
-            with notched devices by default. This behavior is not present in Microsoft's default UWP default.
-            
-            - Canvas.ZIndex is not supported in Uno Grid yet, see https://github.com/unoplatform/uno/issues/325
-        -->
-        <!--
-            Deleted from tags
-            xmlns:uBehaviors="using:Uno.UI.Behaviors"
-            uBehaviors:InternalVisibleBoundsPadding.PaddingMask="Top,Left"
-        -->
-        <!--
-                        <Grid x:Name="PaneToggleButtonGrid"
-							  Margin="0,0,0,8"
-							  HorizontalAlignment="Left"
-							  VerticalAlignment="Top"
-							  Canvas.ZIndex="100">
-
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-
-                            <Grid x:Name="TogglePaneTopPadding"
-                                  Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}"/>
-
-                            <Grid x:Name="ButtonHolderGrid" Grid.Row="1">
-                                <Button
-                                    x:Name="NavigationViewBackButton"
-                                    Style="{StaticResource NavigationBackButtonNormalStyle}"
-                                    VerticalAlignment="Top"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.BackButtonVisibility}"
-                                    IsEnabled="{TemplateBinding IsBackEnabled}"/>
-
-                                <Button
-                                    x:Name="TogglePaneButton"
-                                    Style="{TemplateBinding PaneToggleButtonStyle}"
-                                    AutomationProperties.LandmarkType="Navigation"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneToggleButtonVisibility}"
-                                    VerticalAlignment="Top"/>
-                            </Grid>
-
-                        </Grid>
-
                     </Grid>
-
                 </ControlTemplate>
             </Setter.Value>
-        </Setter>-->
+        </Setter>
     </Style>
+
 </ResourceDictionary>