diff --git a/src/Wpf.Ui.Gallery/App.xaml b/src/Wpf.Ui.Gallery/App.xaml
index 568d2f0a6..02ca8200f 100644
--- a/src/Wpf.Ui.Gallery/App.xaml
+++ b/src/Wpf.Ui.Gallery/App.xaml
@@ -15,6 +15,8 @@
                 <ResourceDictionary Source="Controls/ControlDocumentationSummary.xaml" />
                 <ResourceDictionary Source="Controls/GalleryControlPresenter.xaml" />
                 <ResourceDictionary Source="Controls/GalleryNavigationPresenter.xaml" />
+                <ResourceDictionary Source="Controls/ControlExample.xaml" />
+                <ResourceDictionary Source="Controls/TypographyControl.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/src/Wpf.Ui.Gallery/App.xaml.cs b/src/Wpf.Ui.Gallery/App.xaml.cs
index 95212d006..4845954fd 100644
--- a/src/Wpf.Ui.Gallery/App.xaml.cs
+++ b/src/Wpf.Ui.Gallery/App.xaml.cs
@@ -24,6 +24,7 @@
 using Wpf.Ui.Gallery.Views.Pages.BasicInput;
 using Wpf.Ui.Gallery.Views.Pages.Collections;
 using Wpf.Ui.Gallery.Views.Pages.DateAndTime;
+using Wpf.Ui.Gallery.Views.Pages.DesignGuidance;
 using Wpf.Ui.Gallery.Views.Pages.DialogsAndFlyouts;
 using Wpf.Ui.Gallery.Views.Pages.Icons;
 using Wpf.Ui.Gallery.Views.Pages.Layout;
@@ -72,6 +73,9 @@ public partial class App : Application
             services.AddTransient<SettingsPage>();
             services.AddTransient<SettingsViewModel>();
 
+            //Design guidance
+            services.AddTransient<TypographyPage>();
+
             // Basic Input
             services.AddTransient<BasicInputPage>();
             services.AddTransient<BasicInputViewModel>();
diff --git a/src/Wpf.Ui.Gallery/CodeSamples/Typography/TypographySample_xaml.txt b/src/Wpf.Ui.Gallery/CodeSamples/Typography/TypographySample_xaml.txt
new file mode 100644
index 000000000..ac9be9b15
--- /dev/null
+++ b/src/Wpf.Ui.Gallery/CodeSamples/Typography/TypographySample_xaml.txt
@@ -0,0 +1,7 @@
+<ui:TextBlock FontTypography="Caption" Text="Caption" />
+<ui:TextBlock FontTypography="Body" Text="Body" />
+<ui:TextBlock FontTypography="BodyStrong" Text="Body Strong" />
+<ui:TextBlock FontTypography="Subtitle" Text="Subtitle" />
+<ui:TextBlock FontTypography="Title" Text="Title" />
+<ui:TextBlock FontTypography="TitleLarge" Text="Title Large" />
+<ui:TextBlock FontTypography="Display" Text="Display" />
diff --git a/src/Wpf.Ui.Gallery/Controls/ControlExample.cs b/src/Wpf.Ui.Gallery/Controls/ControlExample.cs
new file mode 100644
index 000000000..702f2c2b7
--- /dev/null
+++ b/src/Wpf.Ui.Gallery/Controls/ControlExample.cs
@@ -0,0 +1,94 @@
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Markup;
+
+namespace Wpf.Ui.Gallery.Controls;
+
+[ContentProperty(nameof(ExampleContent))]
+public class ControlExample : Control
+{
+    public static readonly DependencyProperty ExampleContentProperty =
+        DependencyProperty.Register(nameof(ExampleContent),
+            typeof(object), typeof(ControlExample), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty XamlCodeProperty =
+        DependencyProperty.Register(nameof(XamlCode),
+            typeof(string), typeof(ControlExample), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty XamlCodeSourceProperty =
+        DependencyProperty.Register(nameof(XamlCodeSource),
+            typeof(Uri), typeof(ControlExample),
+            new PropertyMetadata(null,
+                static (o, args) => ((ControlExample)o).OnXamlCodeSourceChanged((Uri)args.NewValue)));
+
+    public static readonly DependencyProperty CsharpCodeProperty =
+        DependencyProperty.Register(nameof(CsharpCode),
+            typeof(string), typeof(ControlExample), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty CsharpCodeSourceProperty =
+        DependencyProperty.Register(nameof(CsharpCodeSource),
+            typeof(Uri), typeof(ControlExample),
+            new PropertyMetadata(null,
+                static (o, args) => ((ControlExample)o).OnCsharpCodeSourceChanged((Uri)args.NewValue)));
+
+    public object? ExampleContent
+    {
+        get => GetValue(ExampleContentProperty);
+        set => SetValue(ExampleContentProperty, value);
+    }
+
+    public string? XamlCode
+    {
+        get => (string)GetValue(XamlCodeProperty);
+        set => SetValue(XamlCodeProperty, value);
+    }
+
+    public Uri? XamlCodeSource
+    {
+        get => (Uri)GetValue(XamlCodeSourceProperty);
+        set => SetValue(XamlCodeSourceProperty, value);
+    }
+
+    public string? CsharpCode
+    {
+        get => (string)GetValue(CsharpCodeProperty);
+        set => SetValue(CsharpCodeProperty, value);
+    }
+
+    public Uri? CsharpCodeSource
+    {
+        get => (Uri)GetValue(CsharpCodeSourceProperty);
+        set => SetValue(CsharpCodeSourceProperty, value);
+    }
+
+    private void OnXamlCodeSourceChanged(Uri uri)
+    {
+        XamlCode = LoadResource(uri);
+    }
+
+    private void OnCsharpCodeSourceChanged(Uri uri)
+    {
+        CsharpCode = LoadResource(uri);
+    }
+
+    private static string LoadResource(Uri uri)
+    {
+        try
+        {
+            if (Application.GetResourceStream(uri) is not { } steamInfo)
+                return string.Empty;
+
+            using StreamReader streamReader = new(steamInfo.Stream, Encoding.UTF8);
+            return streamReader.ReadToEnd();
+
+        }
+        catch (Exception e)
+        {
+            Debug.WriteLine(e);
+            return e.ToString();
+        }
+    }
+}
diff --git a/src/Wpf.Ui.Gallery/Controls/ControlExample.xaml b/src/Wpf.Ui.Gallery/Controls/ControlExample.xaml
new file mode 100644
index 000000000..eaa409154
--- /dev/null
+++ b/src/Wpf.Ui.Gallery/Controls/ControlExample.xaml
@@ -0,0 +1,89 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Wpf.Ui.Gallery.Controls"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml">
+
+    <Style TargetType="{x:Type controls:ControlExample}">
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:ControlExample}">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <Border
+                            Grid.Row="0"
+                            Padding="10"
+                            Background="{ui:ThemeResource CardStrokeColorDefaultBrush}"
+                            BorderBrush="{ui:ThemeResource CardStrokeColorDefaultBrush}"
+                            BorderThickness="1"
+                            CornerRadius="8,8,0,0">
+                            <ContentPresenter Content="{TemplateBinding ExampleContent}" />
+                        </Border>
+
+                        <ui:CardExpander
+                            Grid.Row="1"
+                            Background="{ui:ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                            Header="Source code">
+                            <StackPanel>
+                                <StackPanel x:Name="XamlCodeBlock">
+                                    <ui:TextBlock
+                                        Margin="0,0,0,5"
+                                        FontTypography="BodyStrong"
+                                        Text="XAML" />
+
+                                    <ui:CodeBlock
+                                        Padding="0"
+                                        Background="Transparent"
+                                        BorderBrush="Transparent"
+                                        BorderThickness="0"
+                                        Content="{TemplateBinding XamlCode}" />
+                                </StackPanel>
+
+                                <Border
+                                    x:Name="Border"
+                                    Margin="0,20"
+                                    BorderBrush="{ui:ThemeResource CardBackgroundFillColorDefaultBrush}"
+                                    BorderThickness="1"
+                                    Visibility="Visible" />
+
+                                <StackPanel x:Name="CsharpCodeBlock">
+                                    <ui:TextBlock
+                                        Margin="0,0,0,5"
+                                        FontTypography="BodyStrong"
+                                        Text="CSharp" />
+
+                                    <ui:CodeBlock
+                                        Padding="0"
+                                        Background="Transparent"
+                                        BorderBrush="Transparent"
+                                        BorderThickness="0"
+                                        Content="{TemplateBinding CsharpCode}" />
+                                </StackPanel>
+                            </StackPanel>
+                        </ui:CardExpander>
+                    </Grid>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="XamlCode" Value="{x:Null}">
+                            <Setter TargetName="XamlCodeBlock" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Border" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+
+                        <Trigger Property="CsharpCode" Value="{x:Null}">
+                            <Setter TargetName="CsharpCodeBlock" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Border" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/Wpf.Ui.Gallery/Controls/GalleryNavigationPresenter.xaml b/src/Wpf.Ui.Gallery/Controls/GalleryNavigationPresenter.xaml
index 0c29a6fd1..3ecae5e4d 100644
--- a/src/Wpf.Ui.Gallery/Controls/GalleryNavigationPresenter.xaml
+++ b/src/Wpf.Ui.Gallery/Controls/GalleryNavigationPresenter.xaml
@@ -25,15 +25,13 @@
                                     Icon="{Binding Icon, Mode=OneTime}"
                                     IsChevronVisible="True">
                                     <StackPanel>
-                                        <TextBlock
+                                        <ui:TextBlock
                                             Margin="0"
-                                            FontSize="13"
-                                            FontWeight="Medium"
+                                            FontTypography="BodyStrong"
                                             Text="{Binding Name, Mode=OneTime}"
                                             TextWrapping="WrapWithOverflow" />
-                                        <TextBlock
-                                            FontSize="10"
-                                            Foreground="{DynamicResource TextFillColorTertiaryBrush}"
+                                        <ui:TextBlock
+                                            Appearance="Tertiary"
                                             Text="{Binding Description, Mode=OneTime}"
                                             TextWrapping="WrapWithOverflow" />
                                     </StackPanel>
@@ -56,4 +54,4 @@
         </Setter>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/Wpf.Ui.Gallery/Controls/TypographyControl.cs b/src/Wpf.Ui.Gallery/Controls/TypographyControl.cs
new file mode 100644
index 000000000..6bee55e95
--- /dev/null
+++ b/src/Wpf.Ui.Gallery/Controls/TypographyControl.cs
@@ -0,0 +1,65 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Wpf.Ui.Gallery.Controls;
+
+public class TypographyControl : Control
+{
+    public static readonly DependencyProperty ExampleProperty =
+        DependencyProperty.Register(nameof(Example),
+            typeof(string), typeof(TypographyControl), new PropertyMetadata(string.Empty));
+
+    public static readonly DependencyProperty ExampleFontTypographyProperty =
+        DependencyProperty.Register(nameof(ExampleFontTypography),
+            typeof(FontTypography), typeof(TypographyControl),
+            new PropertyMetadata(FontTypography.Body,
+                static (o, args) =>
+                    ((TypographyControl)o).OnExampleFontTypographyChanged((FontTypography)args.NewValue)));
+
+    public static readonly DependencyProperty VariableFontProperty =
+        DependencyProperty.Register(nameof(VariableFont),
+            typeof(string), typeof(TypographyControl), new PropertyMetadata(string.Empty));
+
+    public static readonly DependencyProperty SizeLinHeightProperty =
+        DependencyProperty.Register(nameof(SizeLinHeight),
+            typeof(string), typeof(TypographyControl), new PropertyMetadata(string.Empty));
+
+    public static readonly DependencyProperty FontTypographyStyleProperty =
+        DependencyProperty.Register(nameof(FontTypographyStyle),
+            typeof(string), typeof(TypographyControl), new PropertyMetadata(FontTypography.Body.ToString()));
+
+    public string Example
+    {
+        get => (string)GetValue(ExampleProperty);
+        set => SetValue(ExampleProperty, value);
+    }
+
+    public FontTypography ExampleFontTypography
+    {
+        get => (FontTypography)GetValue(ExampleFontTypographyProperty);
+        set => SetValue(ExampleFontTypographyProperty, value);
+    }
+
+    public string VariableFont
+    {
+        get => (string)GetValue(VariableFontProperty);
+        set => SetValue(VariableFontProperty, value);
+    }
+
+    public string SizeLinHeight
+    {
+        get => (string)GetValue(VariableFontProperty);
+        set => SetValue(SizeLinHeightProperty, value);
+    }
+
+    public string FontTypographyStyle
+    {
+        get => (string)GetValue(FontTypographyStyleProperty);
+        set => SetValue(FontTypographyStyleProperty, value);
+    }
+
+    private void OnExampleFontTypographyChanged(FontTypography fontTypography)
+    {
+        FontTypographyStyle = fontTypography.ToString();
+    }
+}
diff --git a/src/Wpf.Ui.Gallery/Controls/TypographyControl.xaml b/src/Wpf.Ui.Gallery/Controls/TypographyControl.xaml
new file mode 100644
index 000000000..a398bd240
--- /dev/null
+++ b/src/Wpf.Ui.Gallery/Controls/TypographyControl.xaml
@@ -0,0 +1,57 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Wpf.Ui.Gallery.Controls"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml">
+
+    <Style TargetType="{x:Type controls:TypographyControl}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Padding" Value="0,15,10,15" />
+        <Setter Property="Margin" Value="0,10,0,0" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:TypographyControl}">
+                    <Border
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="4">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="286" />
+                                <ColumnDefinition Width="156" />
+                                <ColumnDefinition Width="140" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <ui:TextBlock
+                                Grid.Column="0"
+                                Margin="24,0,0,0"
+                                VerticalAlignment="Center"
+                                FontTypography="{TemplateBinding ExampleFontTypography}"
+                                Text="{TemplateBinding Example}" />
+
+                            <TextBlock
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                Text="{TemplateBinding VariableFont}" />
+
+                            <TextBlock
+                                Grid.Column="2"
+                                VerticalAlignment="Center"
+                                Text="{TemplateBinding SizeLinHeight}" />
+
+                            <TextBlock
+                                Grid.Column="3"
+                                VerticalAlignment="Center"
+                                Text="{TemplateBinding FontTypographyStyle}" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
index 9329b1732..1b18e32ab 100644
--- a/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
+++ b/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
@@ -11,6 +11,7 @@
 using Wpf.Ui.Gallery.Views.Pages.BasicInput;
 using Wpf.Ui.Gallery.Views.Pages.Collections;
 using Wpf.Ui.Gallery.Views.Pages.DateAndTime;
+using Wpf.Ui.Gallery.Views.Pages.DesignGuidance;
 using Wpf.Ui.Gallery.Views.Pages.DialogsAndFlyouts;
 using Wpf.Ui.Gallery.Views.Pages.Icons;
 using Wpf.Ui.Gallery.Views.Pages.Layout;
@@ -43,9 +44,18 @@ public MainWindowViewModel(IServiceProvider serviceProvider)
         _menuItems = new ObservableCollection<object>
         {
             new NavigationViewItem("Home", SymbolRegular.Home24, typeof(DashboardPage)),
+            new NavigationViewItem()
+            {
+                Content = "Design guidance",
+                Icon = new SymbolIcon { Symbol = SymbolRegular.DesignIdeas24 },
+                MenuItems = new object[]
+                {
+                    new NavigationViewItem("Typography", SymbolRegular.TextFont24, typeof(TypographyPage)),
+                }
+            },
             new NavigationViewItem("All Controls", SymbolRegular.List24, typeof(AllControlsPage)),
             new NavigationViewItemSeparator(),
-            new NavigationViewItem {Content = "Basic input", Icon = new SymbolIcon { Symbol = SymbolRegular.CheckboxChecked24  }, TargetPageType = typeof(BasicInputPage), MenuItems = new ObservableCollection<object>
+            new NavigationViewItem {Content = "Basic input", Icon = new SymbolIcon { Symbol = SymbolRegular.CheckboxChecked24  }, TargetPageType = typeof(BasicInputPage), MenuItems = new object[]
             {
                 new NavigationViewItem { Content = "Anchor", TargetPageType = typeof(AnchorPage) },
                 new NavigationViewItem { Content = "Button", TargetPageType = typeof(ButtonPage) },
@@ -59,7 +69,7 @@ public MainWindowViewModel(IServiceProvider serviceProvider)
                 new NavigationViewItem { Content = "ThumbRate", TargetPageType = typeof(ThumbRatePage) },
                 new NavigationViewItem { Content = "Slider", TargetPageType = typeof(SliderPage) },
             }},
-            new NavigationViewItem {Content = "Collections", Icon = new SymbolIcon { Symbol = SymbolRegular.Table24  }, TargetPageType = typeof(CollectionsPage), MenuItems = new ObservableCollection<object>
+            new NavigationViewItem {Content = "Collections", Icon = new SymbolIcon { Symbol = SymbolRegular.Table24  }, TargetPageType = typeof(CollectionsPage), MenuItems = new object[]
             {
                 new NavigationViewItem { Content = "DataGrid", TargetPageType = typeof(DataGridPage) },
                 new NavigationViewItem { Content = "ListBox", TargetPageType = typeof(ListBoxPage) },
@@ -69,12 +79,12 @@ public MainWindowViewModel(IServiceProvider serviceProvider)
                 new NavigationViewItem { Content = "TreeList", TargetPageType = typeof(TreeListPage) },
 #endif
             }},
-            new NavigationViewItem {Content = "Date and Time", Icon = new SymbolIcon { Symbol = SymbolRegular.CalendarClock24  }, TargetPageType = typeof(DateAndTimePage), MenuItems = new ObservableCollection<object>
+            new NavigationViewItem {Content = "Date and Time", Icon = new SymbolIcon { Symbol = SymbolRegular.CalendarClock24  }, TargetPageType = typeof(DateAndTimePage), MenuItems = new object[]
             {
                 new NavigationViewItem { Content = "Calendar", TargetPageType = typeof(CalendarPage) },
                 new NavigationViewItem { Content = "DatePicker", TargetPageType = typeof(DatePickerPage) },
             }},
-            new NavigationViewItem {Content = "Dialogs and Flyouts", Icon = new SymbolIcon { Symbol = SymbolRegular.Chat24  }, TargetPageType = typeof(DialogsAndFlyoutsPage), MenuItems = new ObservableCollection<object>
+            new NavigationViewItem {Content = "Dialogs and Flyouts", Icon = new SymbolIcon { Symbol = SymbolRegular.Chat24  }, TargetPageType = typeof(DialogsAndFlyoutsPage), MenuItems = new object[]
             {
                 new NavigationViewItem { Content = "Snackbar", TargetPageType = typeof(SnackbarPage) },
                 new NavigationViewItem { Content = "ContentDialog", TargetPageType = typeof(ContentDialogPage) },
@@ -82,19 +92,19 @@ public MainWindowViewModel(IServiceProvider serviceProvider)
                 new NavigationViewItem { Content = "MessageBox", TargetPageType = typeof(MessageBoxPage) },
             }},
 #if DEBUG
-            new NavigationViewItem { Content = "Layout", Icon = new SymbolIcon { Symbol = SymbolRegular.News24}, TargetPageType = typeof(LayoutPage), MenuItems = new ObservableCollection<object>()
+            new NavigationViewItem { Content = "Layout", Icon = new SymbolIcon { Symbol = SymbolRegular.News24}, TargetPageType = typeof(LayoutPage), MenuItems = new object[]
             {
                 new NavigationViewItem { Content = "Expander", TargetPageType = typeof(ExpanderPage) },
             }},
 #endif
-            new NavigationViewItem {Content = "Media", Icon = new SymbolIcon { Symbol = SymbolRegular.PlayCircle24  }, TargetPageType = typeof(MediaPage), MenuItems = new ObservableCollection<object>
+            new NavigationViewItem {Content = "Media", Icon = new SymbolIcon { Symbol = SymbolRegular.PlayCircle24  }, TargetPageType = typeof(MediaPage), MenuItems = new object[]
             {
                 new NavigationViewItem { Content = "Image", TargetPageType = typeof(ImagePage) },
                 new NavigationViewItem { Content = "Canvas", TargetPageType = typeof(CanvasPage) },
                 new NavigationViewItem { Content = "WebView", TargetPageType = typeof(WebViewPage) },
                 new NavigationViewItem { Content = "WebBrowser", TargetPageType = typeof(WebBrowserPage) },
             }},
-            new NavigationViewItem {Content = "Navigation", Icon = new SymbolIcon { Symbol = SymbolRegular.Navigation24  }, TargetPageType = typeof(NavigationPage), MenuItems = new ObservableCollection<object>
+            new NavigationViewItem {Content = "Navigation", Icon = new SymbolIcon { Symbol = SymbolRegular.Navigation24  }, TargetPageType = typeof(NavigationPage), MenuItems = new object[]
             {
                 new NavigationViewItem { Content = "BreadcrumbBar", TargetPageType = typeof(BreadcrumbBarPage) },
                 new NavigationViewItem { Content = "NavigationView", TargetPageType = typeof(NavigationViewPage) },
@@ -102,14 +112,14 @@ public MainWindowViewModel(IServiceProvider serviceProvider)
                 new NavigationViewItem { Content = "Multilevel navigation", TargetPageType = typeof(MultilevelNavigationPage) },
                 new NavigationViewItem { Content = "TabControl", TargetPageType = typeof(TabControlPage) },
             }},
-            new NavigationViewItem {Content = "Status and Info", Icon = new SymbolIcon { Symbol = SymbolRegular.ChatBubblesQuestion24  }, TargetPageType = typeof(StatusAndInfoPage), MenuItems = new ObservableCollection<object>
+            new NavigationViewItem {Content = "Status and Info", Icon = new SymbolIcon { Symbol = SymbolRegular.ChatBubblesQuestion24  }, TargetPageType = typeof(StatusAndInfoPage), MenuItems = new object[]
             {
                 new NavigationViewItem { Content = "InfoBar", TargetPageType = typeof(InfoBarPage) },
                 new NavigationViewItem { Content = "ProgressBar", TargetPageType = typeof(ProgressBarPage) },
                 new NavigationViewItem { Content = "ProgressRing", TargetPageType = typeof(ProgressRingPage) },
                 new NavigationViewItem { Content = "ToolTip", TargetPageType = typeof(ToolTipPage) },
             }},
-            new NavigationViewItem {Content = "Text", Icon = new SymbolIcon { Symbol = SymbolRegular.DrawText24  }, TargetPageType = typeof(TextPage), MenuItems = new ObservableCollection<object>
+            new NavigationViewItem {Content = "Text", Icon = new SymbolIcon { Symbol = SymbolRegular.DrawText24  }, TargetPageType = typeof(TextPage), MenuItems = new object[]
             {
                 new NavigationViewItem { Content = "AutoSuggestBox", TargetPageType = typeof(AutoSuggestBoxPage) },
                 new NavigationViewItem { Content = "NumberBox", TargetPageType = typeof(NumberBoxPage) },
@@ -119,7 +129,7 @@ public MainWindowViewModel(IServiceProvider serviceProvider)
                 new NavigationViewItem { Content = "TextBlock", TargetPageType = typeof(TextBlockPage) },
                 new NavigationViewItem { Content = "TextBox", TargetPageType = typeof(TextBoxPage) },
             }},
-            new NavigationViewItem("Icons", SymbolRegular.Fluent24, typeof(IconsPage), new ObservableCollection<object>
+            new NavigationViewItem("Icons", SymbolRegular.Fluent24, typeof(IconsPage), new object[]
             {
                 new NavigationViewItem("SymbolIcon", typeof(SymbolIconPage)),
                 new NavigationViewItem("SymbolIcon", typeof(FontIconPage))
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/AllControlsPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/AllControlsPage.xaml
index 6890fddd0..92eda7bd3 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/AllControlsPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/AllControlsPage.xaml
@@ -17,11 +17,5 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-    <ui:DynamicScrollViewer>
-        <g:GalleryNavigationPresenter
-            Margin="38"
-            Padding="0"
-            Background="Red"
-            ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
-    </ui:DynamicScrollViewer>
+    <g:GalleryNavigationPresenter Background="Red" ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/AnchorPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/AnchorPage.xaml
index 66057fc10..f88db88c7 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/AnchorPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/AnchorPage.xaml
@@ -23,43 +23,40 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ui:Anchor NavigateUri=&quot;https://&quot; /&gt;"
-                        HeaderText="WPF UI anchor.">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <ui:Anchor
-                                Grid.Column="0"
-                                Content="WPF UI anchor"
-                                Icon="{ui:SymbolIcon Link24}"
-                                IsEnabled="{Binding ViewModel.IsAnchorEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:AnchorPage}, Mode=OneWay}"
-                                NavigateUri="https://dev.lepo.co/" />
-                            <CheckBox
-                                Grid.Column="1"
-                                Command="{Binding ViewModel.AnchorCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:AnchorPage}, Mode=OneWay}"
-                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                Content="Disable anchor" />
-                        </Grid>
-                    </controls:GalleryControlPresenter>
+        <Grid Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ui:Anchor NavigateUri=&quot;https://&quot; /&gt;"
+                HeaderText="WPF UI anchor.">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <ui:Anchor
+                        Grid.Column="0"
+                        Content="WPF UI anchor"
+                        Icon="{ui:SymbolIcon Link24}"
+                        IsEnabled="{Binding ViewModel.IsAnchorEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:AnchorPage}, Mode=OneWay}"
+                        NavigateUri="https://dev.lepo.co/" />
+                    <CheckBox
+                        Grid.Column="1"
+                        Command="{Binding ViewModel.AnchorCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:AnchorPage}, Mode=OneWay}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                        Content="Disable anchor" />
                 </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/BasicInputPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/BasicInputPage.xaml
index 3c17cdffd..5ad5c6d8c 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/BasicInputPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/BasicInputPage.xaml
@@ -18,10 +18,8 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-    <Grid Margin="38">
-        <controls:GalleryNavigationPresenter
-            Margin="0"
-            Padding="0"
-            ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
-    </Grid>
+    <controls:GalleryNavigationPresenter
+        Margin="0"
+        Padding="0"
+        ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ButtonPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ButtonPage.xaml
index 7c8813f7b..4495b6332 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ButtonPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ButtonPage.xaml
@@ -23,81 +23,80 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;Button Content=&quot;Standard WPF button&quot; /&gt;"
-                        HeaderText="Standard button.">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Button
-                                Grid.Column="0"
-                                Content="Standard WPF button"
-                                IsEnabled="{Binding ViewModel.IsSimpleButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ButtonPage}, Mode=OneWay}" />
-                            <CheckBox
-                                Grid.Column="1"
-                                Command="{Binding ViewModel.SimpleButtonCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ButtonPage}, Mode=OneWay}"
-                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                Content="Disable button" />
-                        </Grid>
-                    </controls:GalleryControlPresenter>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,32,0,0"
-                        CodeText="&lt;ui:Button Content=&quot;WPF UI button&quot; Icon=&quot;Fluent24&quot; /&gt;"
-                        HeaderText="WPF UI button.">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <ui:Button
-                                Grid.Column="0"
-                                Content="WPF UI button"
-                                Icon="{ui:SymbolIcon Fluent24}"
-                                IsEnabled="{Binding ViewModel.IsUiButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ButtonPage}, Mode=OneWay}" />
-                            <CheckBox
-                                Grid.Column="1"
-                                Command="{Binding ViewModel.UiButtonCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ButtonPage}, Mode=OneWay}"
-                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                Content="Disable button" />
-                        </Grid>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;Button Content=&quot;Standard WPF button&quot; /&gt;"
+                HeaderText="Standard button.">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button
+                        Grid.Column="0"
+                        Content="Standard WPF button"
+                        IsEnabled="{Binding ViewModel.IsSimpleButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ButtonPage}, Mode=OneWay}" />
+                    <CheckBox
+                        Grid.Column="1"
+                        Command="{Binding ViewModel.SimpleButtonCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ButtonPage}, Mode=OneWay}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                        Content="Disable button" />
+                </Grid>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="2"
-                        Margin="0,32,0,0"
-                        CodeText="&lt;ui:Button Appearance=&quot;Primary&quot; /&gt;"
-                        HeaderText="WPF UI Accent button.">
-                        <ui:Button
-                            Grid.Column="0"
-                            Appearance="Primary"
-                            Content="WPF UI button"
-                            Icon="{ui:SymbolIcon Fluent24}" />
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,32,0,0"
+                CodeText="&lt;ui:Button Content=&quot;WPF UI button&quot; Icon=&quot;Fluent24&quot; /&gt;"
+                HeaderText="WPF UI button.">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <ui:Button
+                        Grid.Column="0"
+                        Content="WPF UI button"
+                        Icon="{ui:SymbolIcon Fluent24}"
+                        IsEnabled="{Binding ViewModel.IsUiButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ButtonPage}, Mode=OneWay}" />
+                    <CheckBox
+                        Grid.Column="1"
+                        Command="{Binding ViewModel.UiButtonCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ButtonPage}, Mode=OneWay}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                        Content="Disable button" />
                 </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            </controls:GalleryControlPresenter>
+
+            <controls:GalleryControlPresenter
+                Grid.Row="2"
+                Margin="0,32,0,0"
+                CodeText="&lt;ui:Button Appearance=&quot;Primary&quot; /&gt;"
+                HeaderText="WPF UI Accent button.">
+                <ui:Button
+                    Grid.Column="0"
+                    Appearance="Primary"
+                    Content="WPF UI button"
+                    Icon="{ui:SymbolIcon Fluent24}" />
+            </controls:GalleryControlPresenter>
+        </Grid>
+
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/CheckBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/CheckBoxPage.xaml
index c6a46f135..93b6a014c 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/CheckBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/CheckBoxPage.xaml
@@ -23,82 +23,81 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="280" />
+            </Grid.ColumnDefinitions>
 
-                <VirtualizingStackPanel Margin="42" IsVirtualizing="True">
-                    <TextBlock
-                        FontSize="18"
-                        FontWeight="DemiBold"
-                        Text="A 2-state CheckBox." />
-                    <ui:Card Margin="0,8,0,0">
-                        <CheckBox Grid.Column="0" Content="Two-state CheckBox" />
-                    </ui:Card>
-                    <ui:CodeBlock Margin="0,4,0,0">
-                        &lt;CheckBox Content=&quot;Standard WPF checkbox&quot; /&gt;
-                    </ui:CodeBlock>
+            <VirtualizingStackPanel IsVirtualizing="True">
+                <TextBlock
+                    FontSize="18"
+                    FontWeight="DemiBold"
+                    Text="A 2-state CheckBox." />
+                <ui:Card Margin="0,8,0,0">
+                    <CheckBox Grid.Column="0" Content="Two-state CheckBox" />
+                </ui:Card>
+                <ui:CodeBlock Margin="0,4,0,0">
+                    &lt;CheckBox Content=&quot;Standard WPF checkbox&quot; /&gt;
+                </ui:CodeBlock>
 
-                    <TextBlock
-                        Margin="0,32,0,0"
-                        FontSize="18"
-                        FontWeight="DemiBold"
-                        Text="A 3-state CheckBox." />
-                    <ui:Card Margin="0,8,0,0">
+                <TextBlock
+                    Margin="0,32,0,0"
+                    FontSize="18"
+                    FontWeight="DemiBold"
+                    Text="A 3-state CheckBox." />
+                <ui:Card Margin="0,8,0,0">
+                    <CheckBox
+                        Content="Three-state CheckBox"
+                        IsChecked="{x:Null}"
+                        IsThreeState="True" />
+                </ui:Card>
+                <ui:CodeBlock Margin="0,4,0,0">
+                    &lt;CheckBox IsThreeState=&quot;True&quot; /&gt;
+                </ui:CodeBlock>
+
+                <TextBlock
+                    Margin="0,32,0,0"
+                    FontSize="18"
+                    FontWeight="DemiBold"
+                    Text="Using a 3-state CheckBox." />
+                <ui:Card Margin="0,8,0,0">
+                    <StackPanel>
                         <CheckBox
-                            Content="Three-state CheckBox"
-                            IsChecked="{x:Null}"
+                            Command="{Binding ViewModel.SelectAllCheckedCommand, Mode=OneWay}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                            Content="Select all"
+                            IsChecked="{Binding ViewModel.SelectAllCheckBoxChecked, Mode=TwoWay}"
                             IsThreeState="True" />
-                    </ui:Card>
-                    <ui:CodeBlock Margin="0,4,0,0">
-                        &lt;CheckBox IsThreeState=&quot;True&quot; /&gt;
-                    </ui:CodeBlock>
-
-                    <TextBlock
-                        Margin="0,32,0,0"
-                        FontSize="18"
-                        FontWeight="DemiBold"
-                        Text="Using a 3-state CheckBox." />
-                    <ui:Card Margin="0,8,0,0">
-                        <StackPanel>
-                            <CheckBox
-                                Command="{Binding ViewModel.SelectAllCheckedCommand, Mode=OneWay}"
-                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                Content="Select all"
-                                IsChecked="{Binding ViewModel.SelectAllCheckBoxChecked, Mode=TwoWay}"
-                                IsThreeState="True" />
-                            <CheckBox
-                                Margin="24,0,0,0"
-                                Command="{Binding ViewModel.SingleCheckedCommand, Mode=OneWay}"
-                                CommandParameter="1"
-                                Content="Option 1"
-                                IsChecked="{Binding ViewModel.OptionOneCheckBoxChecked, Mode=TwoWay}" />
-                            <CheckBox
-                                Margin="24,0,0,0"
-                                Command="{Binding ViewModel.SingleCheckedCommand, Mode=OneWay}"
-                                CommandParameter="2"
-                                Content="Option 2"
-                                IsChecked="{Binding ViewModel.OptionTwoCheckBoxChecked, Mode=TwoWay}" />
-                            <CheckBox
-                                Margin="24,0,0,0"
-                                Command="{Binding ViewModel.SingleCheckedCommand, Mode=OneWay}"
-                                CommandParameter="3"
-                                Content="Option 3"
-                                IsChecked="{Binding ViewModel.OptionThreeCheckBoxChecked, Mode=TwoWay}" />
-                        </StackPanel>
-                    </ui:Card>
-                    <ui:CodeBlock Margin="0,4,0,0">
-                        &lt;CheckBox IsThreeState=&quot;True&quot; /&gt;
-                    </ui:CodeBlock>
-                </VirtualizingStackPanel>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+                        <CheckBox
+                            Margin="24,0,0,0"
+                            Command="{Binding ViewModel.SingleCheckedCommand, Mode=OneWay}"
+                            CommandParameter="1"
+                            Content="Option 1"
+                            IsChecked="{Binding ViewModel.OptionOneCheckBoxChecked, Mode=TwoWay}" />
+                        <CheckBox
+                            Margin="24,0,0,0"
+                            Command="{Binding ViewModel.SingleCheckedCommand, Mode=OneWay}"
+                            CommandParameter="2"
+                            Content="Option 2"
+                            IsChecked="{Binding ViewModel.OptionTwoCheckBoxChecked, Mode=TwoWay}" />
+                        <CheckBox
+                            Margin="24,0,0,0"
+                            Command="{Binding ViewModel.SingleCheckedCommand, Mode=OneWay}"
+                            CommandParameter="3"
+                            Content="Option 3"
+                            IsChecked="{Binding ViewModel.OptionThreeCheckBoxChecked, Mode=TwoWay}" />
+                    </StackPanel>
+                </ui:Card>
+                <ui:CodeBlock Margin="0,4,0,0">
+                    &lt;CheckBox IsThreeState=&quot;True&quot; /&gt;
+                </ui:CodeBlock>
+            </VirtualizingStackPanel>
+            <controls:ControlDocumentationSummary
+                Grid.Column="1"
+                Margin="42,0,0,0"
+                CsharpUrl="{StaticResource PageCsharpUrl}"
+                XamlUrl="{StaticResource PageXamlUrl}" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ComboBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ComboBoxPage.xaml
index 0d1fb6c48..33aef5df5 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ComboBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ComboBoxPage.xaml
@@ -24,71 +24,68 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ComboBox /&gt;"
-                        HeaderText="A ComboBox with items defined inline.">
-                        <ComboBox
-                            MinWidth="200"
-                            HorizontalAlignment="Left"
-                            SelectedIndex="0">
-                            <ComboBoxItem Content="Blue" />
-                            <ComboBoxItem Content="Green" />
-                            <ComboBoxItem Content="Red" />
-                            <ComboBoxItem Content="Yellow" />
-                        </ComboBox>
-                    </controls:GalleryControlPresenter>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,32,0,0"
-                        CodeText="&lt;ComboBox ItemsSource=&quot;{Binding FontFamilies}&quot; /&gt;"
-                        HeaderText="A ComboBox with ItemsSource set.">
-                        <ComboBox
-                            MinWidth="200"
-                            HorizontalAlignment="Left"
-                            ItemsSource="{Binding ViewModel.ComboBoxFontFamilies, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ComboBoxPage}, Mode=OneWay}"
-                            SelectedIndex="0">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate>
-                                    <TextBlock FontFamily="{Binding}" Text="{Binding}" />
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                    </controls:GalleryControlPresenter>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="2"
-                        Margin="0,32,0,0"
-                        CodeText="&lt;ComboBox IsEditable=&quot;True&quot; /&gt;"
-                        HeaderText="An editable ComboBox.">
-                        <ComboBox
-                            MinWidth="200"
-                            HorizontalAlignment="Left"
-                            IsEditable="True"
-                            ItemsSource="{Binding ViewModel.ComboBoxFontSizes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ComboBoxPage}, Mode=OneWay}"
-                            SelectedIndex="0" />
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ComboBox /&gt;"
+                HeaderText="A ComboBox with items defined inline.">
+                <ComboBox
+                    MinWidth="200"
+                    HorizontalAlignment="Left"
+                    SelectedIndex="0">
+                    <ComboBoxItem Content="Blue" />
+                    <ComboBoxItem Content="Green" />
+                    <ComboBoxItem Content="Red" />
+                    <ComboBoxItem Content="Yellow" />
+                </ComboBox>
+            </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,32,0,0"
+                CodeText="&lt;ComboBox ItemsSource=&quot;{Binding FontFamilies}&quot; /&gt;"
+                HeaderText="A ComboBox with ItemsSource set.">
+                <ComboBox
+                    MinWidth="200"
+                    HorizontalAlignment="Left"
+                    ItemsSource="{Binding ViewModel.ComboBoxFontFamilies, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ComboBoxPage}, Mode=OneWay}"
+                    SelectedIndex="0">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock FontFamily="{Binding}" Text="{Binding}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="2"
+                Margin="0,32,0,0"
+                CodeText="&lt;ComboBox IsEditable=&quot;True&quot; /&gt;"
+                HeaderText="An editable ComboBox.">
+                <ComboBox
+                    MinWidth="200"
+                    HorizontalAlignment="Left"
+                    IsEditable="True"
+                    ItemsSource="{Binding ViewModel.ComboBoxFontSizes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ComboBoxPage}, Mode=OneWay}"
+                    SelectedIndex="0" />
+            </controls:GalleryControlPresenter>
 
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/HyperlinkPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/HyperlinkPage.xaml
index 782fe08f0..6abef01d6 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/HyperlinkPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/HyperlinkPage.xaml
@@ -23,43 +23,42 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="280" />
+            </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ui:Hyperlink NavigateUri=&quot;https://&quot; /&gt;"
-                        HeaderText="WPF UI hyperlink.">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <ui:Hyperlink
-                                Grid.Column="0"
-                                Content="WPF UI hyperlink"
-                                Icon="{ui:SymbolIcon Link24}"
-                                IsEnabled="{Binding ViewModel.IsHyperlinkEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:HyperlinkPage}, Mode=OneWay}"
-                                NavigateUri="https://dev.lepo.co/" />
-                            <CheckBox
-                                Grid.Column="1"
-                                Command="{Binding ViewModel.HyperlinkCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:HyperlinkPage}, Mode=OneWay}"
-                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                Content="Disable hyperlink" />
-                        </Grid>
-                    </controls:GalleryControlPresenter>
-                </Grid>
+            <Grid Grid.Column="0">
+                <controls:GalleryControlPresenter
+                    Grid.Row="0"
+                    Margin="0"
+                    CodeText="&lt;ui:Hyperlink NavigateUri=&quot;https://&quot; /&gt;"
+                    HeaderText="WPF UI hyperlink.">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ui:Hyperlink
+                            Grid.Column="0"
+                            Content="WPF UI hyperlink"
+                            Icon="{ui:SymbolIcon Link24}"
+                            IsEnabled="{Binding ViewModel.IsHyperlinkEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:HyperlinkPage}, Mode=OneWay}"
+                            NavigateUri="https://dev.lepo.co/" />
+                        <CheckBox
+                            Grid.Column="1"
+                            Command="{Binding ViewModel.HyperlinkCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:HyperlinkPage}, Mode=OneWay}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                            Content="Disable hyperlink" />
+                    </Grid>
+                </controls:GalleryControlPresenter>
             </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:ControlDocumentationSummary
+                Grid.Column="1"
+                Margin="42,0,0,0"
+                CsharpUrl="{StaticResource PageCsharpUrl}"
+                XamlUrl="{StaticResource PageXamlUrl}" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/RadioButtonPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/RadioButtonPage.xaml
index f4f452c05..1f128ebe9 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/RadioButtonPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/RadioButtonPage.xaml
@@ -23,79 +23,78 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="280" />
+            </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+            <Grid Grid.Column="0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;RadioButton Content=&quot;Option 1&quot; /&gt;"
-                        HeaderText="Standard RadioButton.">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <StackPanel Grid.Column="0">
-                                <RadioButton
-                                    Content="Option 1"
-                                    GroupName="radio_group_one"
-                                    IsChecked="True"
-                                    IsEnabled="{Binding ViewModel.IsRadioButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RadioButtonPage}, Mode=OneWay}" />
-                                <RadioButton
-                                    Content="Option 2"
-                                    GroupName="radio_group_one"
-                                    IsEnabled="{Binding ViewModel.IsRadioButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RadioButtonPage}, Mode=OneWay}" />
-                                <RadioButton
-                                    Content="Option 3"
-                                    GroupName="radio_group_one"
-                                    IsEnabled="{Binding ViewModel.IsRadioButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RadioButtonPage}, Mode=OneWay}" />
-                            </StackPanel>
-                            <CheckBox
-                                Grid.Column="1"
-                                Command="{Binding ViewModel.RadioButtonCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RadioButtonPage}, Mode=OneWay}"
-                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                Content="Disable RadioButton's" />
-                        </Grid>
-                    </controls:GalleryControlPresenter>
-
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,36,0,0"
-                        CodeText="&lt;RadioButton FlowDirection=&quot;RightToLeft&quot; /&gt;"
-                        HeaderText="RadioButton with right to left flow direction.">
+                <controls:GalleryControlPresenter
+                    Grid.Row="0"
+                    Margin="0"
+                    CodeText="&lt;RadioButton Content=&quot;Option 1&quot; /&gt;"
+                    HeaderText="Standard RadioButton.">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
                         <StackPanel Grid.Column="0">
                             <RadioButton
                                 Content="Option 1"
-                                FlowDirection="RightToLeft"
-                                GroupName="radio_group_two"
-                                IsChecked="True" />
+                                GroupName="radio_group_one"
+                                IsChecked="True"
+                                IsEnabled="{Binding ViewModel.IsRadioButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RadioButtonPage}, Mode=OneWay}" />
                             <RadioButton
                                 Content="Option 2"
-                                FlowDirection="RightToLeft"
-                                GroupName="radio_group_two" />
+                                GroupName="radio_group_one"
+                                IsEnabled="{Binding ViewModel.IsRadioButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RadioButtonPage}, Mode=OneWay}" />
                             <RadioButton
                                 Content="Option 3"
-                                FlowDirection="RightToLeft"
-                                GroupName="radio_group_two" />
+                                GroupName="radio_group_one"
+                                IsEnabled="{Binding ViewModel.IsRadioButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RadioButtonPage}, Mode=OneWay}" />
                         </StackPanel>
-                    </controls:GalleryControlPresenter>
-                </Grid>
+                        <CheckBox
+                            Grid.Column="1"
+                            Command="{Binding ViewModel.RadioButtonCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RadioButtonPage}, Mode=OneWay}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                            Content="Disable RadioButton's" />
+                    </Grid>
+                </controls:GalleryControlPresenter>
+
+                <controls:GalleryControlPresenter
+                    Grid.Row="1"
+                    Margin="0,36,0,0"
+                    CodeText="&lt;RadioButton FlowDirection=&quot;RightToLeft&quot; /&gt;"
+                    HeaderText="RadioButton with right to left flow direction.">
+                    <StackPanel Grid.Column="0">
+                        <RadioButton
+                            Content="Option 1"
+                            FlowDirection="RightToLeft"
+                            GroupName="radio_group_two"
+                            IsChecked="True" />
+                        <RadioButton
+                            Content="Option 2"
+                            FlowDirection="RightToLeft"
+                            GroupName="radio_group_two" />
+                        <RadioButton
+                            Content="Option 3"
+                            FlowDirection="RightToLeft"
+                            GroupName="radio_group_two" />
+                    </StackPanel>
+                </controls:GalleryControlPresenter>
             </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:ControlDocumentationSummary
+                Grid.Column="1"
+                Margin="42,0,0,0"
+                CsharpUrl="{StaticResource PageCsharpUrl}"
+                XamlUrl="{StaticResource PageXamlUrl}" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/RatingPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/RatingPage.xaml
index 0a2ca0d66..b3d825c92 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/RatingPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/RatingPage.xaml
@@ -23,89 +23,86 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ui:RatingControl /&gt;"
-                        HeaderText="WPF UI rating.">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <ui:RatingControl
-                                HorizontalAlignment="Left"
-                                IsEnabled="{Binding ViewModel.IsFirstRatingEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RatingPage}, Mode=OneWay}"
-                                Value="{Binding ViewModel.FirstRatingValue, Mode=TwoWay}" />
-                            <StackPanel
-                                Grid.Column="1"
-                                MinWidth="60"
-                                Margin="0,4,0,0"
-                                VerticalAlignment="Center">
-                                <Label Margin="0,0,0,-4" Content="Value:" />
-                                <TextBlock Margin="0" Text="{Binding ViewModel.FirstRatingValue, Mode=TwoWay}" />
-                            </StackPanel>
-                            <CheckBox
-                                Grid.Column="2"
-                                VerticalAlignment="Center"
-                                Command="{Binding ViewModel.FirstRatingCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RatingPage}, Mode=OneWay}"
-                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                Content="Disable rating" />
-                        </Grid>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ui:RatingControl /&gt;"
+                HeaderText="WPF UI rating.">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <ui:RatingControl
+                        HorizontalAlignment="Left"
+                        IsEnabled="{Binding ViewModel.IsFirstRatingEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RatingPage}, Mode=OneWay}"
+                        Value="{Binding ViewModel.FirstRatingValue, Mode=TwoWay}" />
+                    <StackPanel
+                        Grid.Column="1"
+                        MinWidth="60"
+                        Margin="0,4,0,0"
+                        VerticalAlignment="Center">
+                        <Label Margin="0,0,0,-4" Content="Value:" />
+                        <TextBlock Margin="0" Text="{Binding ViewModel.FirstRatingValue, Mode=TwoWay}" />
+                    </StackPanel>
+                    <CheckBox
+                        Grid.Column="2"
+                        VerticalAlignment="Center"
+                        Command="{Binding ViewModel.FirstRatingCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RatingPage}, Mode=OneWay}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                        Content="Disable rating" />
+                </Grid>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,36,0,0"
-                        CodeText="&lt;ui:RatingControl HalfStarEnabled=&quot;False&quot; /&gt;"
-                        HeaderText="WPF UI rating with full stars only.">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <ui:RatingControl
-                                HorizontalAlignment="Left"
-                                HalfStarEnabled="False"
-                                IsEnabled="{Binding ViewModel.IsSecondRatingEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RatingPage}, Mode=OneWay}"
-                                Value="{Binding ViewModel.SecondRatingValue, Mode=TwoWay}" />
-                            <StackPanel
-                                Grid.Column="1"
-                                MinWidth="60"
-                                Margin="0,4,0,0"
-                                VerticalAlignment="Center">
-                                <Label Margin="0,0,0,-4" Content="Value:" />
-                                <TextBlock Margin="0" Text="{Binding ViewModel.SecondRatingValue, Mode=TwoWay}" />
-                            </StackPanel>
-                            <CheckBox
-                                Grid.Column="2"
-                                VerticalAlignment="Center"
-                                Command="{Binding ViewModel.SecondRatingCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RatingPage}, Mode=OneWay}"
-                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                Content="Disable rating" />
-                        </Grid>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,36,0,0"
+                CodeText="&lt;ui:RatingControl HalfStarEnabled=&quot;False&quot; /&gt;"
+                HeaderText="WPF UI rating with full stars only.">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <ui:RatingControl
+                        HorizontalAlignment="Left"
+                        HalfStarEnabled="False"
+                        IsEnabled="{Binding ViewModel.IsSecondRatingEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RatingPage}, Mode=OneWay}"
+                        Value="{Binding ViewModel.SecondRatingValue, Mode=TwoWay}" />
+                    <StackPanel
+                        Grid.Column="1"
+                        MinWidth="60"
+                        Margin="0,4,0,0"
+                        VerticalAlignment="Center">
+                        <Label Margin="0,0,0,-4" Content="Value:" />
+                        <TextBlock Margin="0" Text="{Binding ViewModel.SecondRatingValue, Mode=TwoWay}" />
+                    </StackPanel>
+                    <CheckBox
+                        Grid.Column="2"
+                        VerticalAlignment="Center"
+                        Command="{Binding ViewModel.SecondRatingCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:RatingPage}, Mode=OneWay}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                        Content="Disable rating" />
                 </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/SliderPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/SliderPage.xaml
index 788bb304d..200cedc2f 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/SliderPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/SliderPage.xaml
@@ -23,151 +23,148 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;Slider Width=&quot;200&quot; /&gt;"
-                        HeaderText="A simple slider.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Slider
-                                    Width="200"
-                                    Margin="0"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    Maximum="100"
-                                    Minimum="0"
-                                    Value="{Binding ViewModel.SimpleSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=TwoWay}" />
-                                <Grid Grid.Column="1">
-                                    <StackPanel VerticalAlignment="Center">
-                                        <TextBlock Text="Output:" />
-                                        <TextBlock Text="{Binding ViewModel.SimpleSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=OneWay}" />
-                                    </StackPanel>
-                                </Grid>
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;Slider Width=&quot;200&quot; /&gt;"
+                HeaderText="A simple slider.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Slider
+                            Width="200"
+                            Margin="0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Maximum="100"
+                            Minimum="0"
+                            Value="{Binding ViewModel.SimpleSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=TwoWay}" />
+                        <Grid Grid.Column="1">
+                            <StackPanel VerticalAlignment="Center">
+                                <TextBlock Text="Output:" />
+                                <TextBlock Text="{Binding ViewModel.SimpleSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=OneWay}" />
+                            </StackPanel>
+                        </Grid>
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,32,0,0"
-                        CodeText="&lt;Slider TickFrequency=&quot;20&quot; IsSnapToTickEnabled=&quot;True&quot; /&gt;"
-                        HeaderText="A slider with steps and range specified.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Slider
-                                    Width="200"
-                                    Margin="0"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    IsSnapToTickEnabled="True"
-                                    Maximum="1000"
-                                    Minimum="500"
-                                    TickFrequency="20"
-                                    Value="{Binding ViewModel.RangeSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=TwoWay}" />
-                                <Grid Grid.Column="1">
-                                    <StackPanel VerticalAlignment="Center">
-                                        <TextBlock Text="Output:" />
-                                        <TextBlock Text="{Binding ViewModel.RangeSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=OneWay}" />
-                                    </StackPanel>
-                                </Grid>
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,32,0,0"
+                CodeText="&lt;Slider TickFrequency=&quot;20&quot; IsSnapToTickEnabled=&quot;True&quot; /&gt;"
+                HeaderText="A slider with steps and range specified.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Slider
+                            Width="200"
+                            Margin="0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            IsSnapToTickEnabled="True"
+                            Maximum="1000"
+                            Minimum="500"
+                            TickFrequency="20"
+                            Value="{Binding ViewModel.RangeSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=TwoWay}" />
+                        <Grid Grid.Column="1">
+                            <StackPanel VerticalAlignment="Center">
+                                <TextBlock Text="Output:" />
+                                <TextBlock Text="{Binding ViewModel.RangeSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=OneWay}" />
+                            </StackPanel>
+                        </Grid>
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="2"
-                        Margin="0,32,0,0"
-                        CodeText="&lt;Slider TickPlacement=&quot;Both&quot; /&gt;"
-                        HeaderText="A slider with tick marks.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Slider
-                                    Width="200"
-                                    Margin="0"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    IsSnapToTickEnabled="True"
-                                    Maximum="100"
-                                    Minimum="0"
-                                    TickFrequency="20"
-                                    TickPlacement="Both"
-                                    Value="{Binding ViewModel.MarksSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=TwoWay}" />
-                                <Grid Grid.Column="1">
-                                    <StackPanel VerticalAlignment="Center">
-                                        <TextBlock Text="Output:" />
-                                        <TextBlock Text="{Binding ViewModel.MarksSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=OneWay}" />
-                                    </StackPanel>
-                                </Grid>
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="2"
+                Margin="0,32,0,0"
+                CodeText="&lt;Slider TickPlacement=&quot;Both&quot; /&gt;"
+                HeaderText="A slider with tick marks.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Slider
+                            Width="200"
+                            Margin="0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            IsSnapToTickEnabled="True"
+                            Maximum="100"
+                            Minimum="0"
+                            TickFrequency="20"
+                            TickPlacement="Both"
+                            Value="{Binding ViewModel.MarksSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=TwoWay}" />
+                        <Grid Grid.Column="1">
+                            <StackPanel VerticalAlignment="Center">
+                                <TextBlock Text="Output:" />
+                                <TextBlock Text="{Binding ViewModel.MarksSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=OneWay}" />
+                            </StackPanel>
+                        </Grid>
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="3"
-                        Margin="0,32,0,0"
-                        CodeText="&lt;Slider Orientation=&quot;Vertical&quot; /&gt;"
-                        HeaderText="A vertical slider with range and tick marks specified.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Slider
-                                    Width="200"
-                                    Margin="0"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    IsSnapToTickEnabled="True"
-                                    Maximum="100"
-                                    Minimum="0"
-                                    Orientation="Vertical"
-                                    TickFrequency="20"
-                                    TickPlacement="Both"
-                                    Value="{Binding ViewModel.VerticalSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=TwoWay}" />
-                                <Grid Grid.Column="1">
-                                    <StackPanel VerticalAlignment="Center">
-                                        <TextBlock Text="Output:" />
-                                        <TextBlock Text="{Binding ViewModel.VerticalSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=OneWay}" />
-                                    </StackPanel>
-                                </Grid>
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:GalleryControlPresenter
+                Grid.Row="3"
+                Margin="0,32,0,0"
+                CodeText="&lt;Slider Orientation=&quot;Vertical&quot; /&gt;"
+                HeaderText="A vertical slider with range and tick marks specified.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Slider
+                            Width="200"
+                            Margin="0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            IsSnapToTickEnabled="True"
+                            Maximum="100"
+                            Minimum="0"
+                            Orientation="Vertical"
+                            TickFrequency="20"
+                            TickPlacement="Both"
+                            Value="{Binding ViewModel.VerticalSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=TwoWay}" />
+                        <Grid Grid.Column="1">
+                            <StackPanel VerticalAlignment="Center">
+                                <TextBlock Text="Output:" />
+                                <TextBlock Text="{Binding ViewModel.VerticalSliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SliderPage}, Mode=OneWay}" />
+                            </StackPanel>
+                        </Grid>
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ThumbRatePage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ThumbRatePage.xaml
index 36a7bfccf..cff57a0d2 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ThumbRatePage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ThumbRatePage.xaml
@@ -23,42 +23,39 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="{Binding ViewModel.ThumRateStateCodeText, Mode=OneWay}"
-                        HeaderText="WPF UI thumb rate.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <ui:ThumbRate HorizontalAlignment="Left" State="{Binding ViewModel.ThumbRateState, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ThumbRatePage}, Mode=TwoWay}" />
-                                <StackPanel
-                                    Grid.Column="1"
-                                    MinWidth="60"
-                                    VerticalAlignment="Center">
-                                    <Label Content="State:" />
-                                    <TextBlock Text="{Binding ViewModel.ThumRateStateText, Mode=OneWay}" />
-                                </StackPanel>
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="{Binding ViewModel.ThumRateStateCodeText, Mode=OneWay}"
+                HeaderText="WPF UI thumb rate.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ui:ThumbRate HorizontalAlignment="Left" State="{Binding ViewModel.ThumbRateState, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ThumbRatePage}, Mode=TwoWay}" />
+                        <StackPanel
+                            Grid.Column="1"
+                            MinWidth="60"
+                            VerticalAlignment="Center">
+                            <Label Content="State:" />
+                            <TextBlock Text="{Binding ViewModel.ThumRateStateText, Mode=OneWay}" />
+                        </StackPanel>
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ToggleButtonPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ToggleButtonPage.xaml
index c3257bb72..1a0593d6e 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ToggleButtonPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ToggleButtonPage.xaml
@@ -22,43 +22,41 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ToggleButton Content=&quot;Standard ToggleButton&quot; /&gt;"
-                        HeaderText="Standard toggle button.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <ToggleButton
-                                    Grid.Column="0"
-                                    Content="Standard ToggleButton"
-                                    IsEnabled="{Binding ViewModel.IsToggleButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ToggleButtonPage}, Mode=OneWay}" />
-                                <CheckBox
-                                    Grid.Column="1"
-                                    Command="{Binding ViewModel.ToggleButtonCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ToggleButtonPage}, Mode=OneWay}"
-                                    CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                    Content="Disable toggle button" />
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ToggleButton Content=&quot;Standard ToggleButton&quot; /&gt;"
+                HeaderText="Standard toggle button.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ToggleButton
+                            Grid.Column="0"
+                            Content="Standard ToggleButton"
+                            IsEnabled="{Binding ViewModel.IsToggleButtonEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ToggleButtonPage}, Mode=OneWay}" />
+                        <CheckBox
+                            Grid.Column="1"
+                            Command="{Binding ViewModel.ToggleButtonCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ToggleButtonPage}, Mode=OneWay}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                            Content="Disable toggle button" />
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ToggleSwitchPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ToggleSwitchPage.xaml
index db9003333..52daf7421 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ToggleSwitchPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/BasicInput/ToggleSwitchPage.xaml
@@ -23,43 +23,40 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ui:ToggleSwitch Content=&quot;WPF UI toggle switch&quot; /&gt;"
-                        HeaderText="WPF UI toggle switch.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <ui:ToggleSwitch
-                                    Grid.Column="0"
-                                    Content="WPF UI toggle switch"
-                                    IsEnabled="{Binding ViewModel.IsToggleSwitchEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ToggleSwitchPage}, Mode=OneWay}" />
-                                <CheckBox
-                                    Grid.Column="1"
-                                    Command="{Binding ViewModel.ToggleSwitchCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ToggleSwitchPage}, Mode=OneWay}"
-                                    CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                    Content="Disable switch" />
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ui:ToggleSwitch Content=&quot;WPF UI toggle switch&quot; /&gt;"
+                HeaderText="WPF UI toggle switch.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ui:ToggleSwitch
+                            Grid.Column="0"
+                            Content="WPF UI toggle switch"
+                            IsEnabled="{Binding ViewModel.IsToggleSwitchEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ToggleSwitchPage}, Mode=OneWay}" />
+                        <CheckBox
+                            Grid.Column="1"
+                            Command="{Binding ViewModel.ToggleSwitchCheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ToggleSwitchPage}, Mode=OneWay}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                            Content="Disable switch" />
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Collections/CollectionsPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Collections/CollectionsPage.xaml
index e0ed26f89..b1dd93812 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Collections/CollectionsPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Collections/CollectionsPage.xaml
@@ -17,10 +17,8 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-    <Grid Margin="38">
-        <controls:GalleryNavigationPresenter
-            Margin="0"
-            Padding="0"
-            ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
-    </Grid>
+    <controls:GalleryNavigationPresenter
+        Margin="0"
+        Padding="0"
+        ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Collections/DataGridPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Collections/DataGridPage.xaml
index c2427392f..e5950c1b4 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Collections/DataGridPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Collections/DataGridPage.xaml
@@ -23,44 +23,41 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;DataGrid ItemsSource=&quot;{Binding ViewModel.ProductsCollection, Mode=TwoWay}&quot; /&gt;"
-                        HeaderText="Default DataGrid with ItemsSource.">
-                        <controls:GalleryControlPresenter.Content>
-                            <DataGrid Height="400" ItemsSource="{Binding ViewModel.ProductsCollection, Mode=TwoWay}" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;DataGrid ItemsSource=&quot;{Binding ViewModel.ProductsCollection, Mode=TwoWay}&quot; /&gt;"
+                HeaderText="Default DataGrid with ItemsSource.">
+                <controls:GalleryControlPresenter.Content>
+                    <DataGrid Height="400" ItemsSource="{Binding ViewModel.ProductsCollection, Mode=TwoWay}" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,36,0,0"
-                        CodeText="&lt;ui:DataGrid ItemsSource=&quot;{Binding ViewModel.ProductsCollection, Mode=TwoWay}&quot; /&gt;"
-                        HeaderText="WPF UI DataGrid with ItemsSource.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ui:DataGrid Height="400" ItemsSource="{Binding ViewModel.ProductsCollection, Mode=TwoWay}" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,36,0,0"
+                CodeText="&lt;ui:DataGrid ItemsSource=&quot;{Binding ViewModel.ProductsCollection, Mode=TwoWay}&quot; /&gt;"
+                HeaderText="WPF UI DataGrid with ItemsSource.">
+                <controls:GalleryControlPresenter.Content>
+                    <ui:DataGrid Height="400" ItemsSource="{Binding ViewModel.ProductsCollection, Mode=TwoWay}" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListBoxPage.xaml
index 798b656ab..c34aa198f 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListBoxPage.xaml
@@ -23,57 +23,54 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        HeaderText="ListBox with items defined inline.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ListBox SelectedIndex="0">
-                                <ListBoxItem>Blue</ListBoxItem>
-                                <ListBoxItem>Green</ListBoxItem>
-                                <ListBoxItem>Red</ListBoxItem>
-                                <ListBoxItem>Yellow</ListBoxItem>
-                            </ListBox>
-                        </controls:GalleryControlPresenter.Content>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;ListBox&gt;\n
-                            \t&lt;ListBoxItem Content=&quot;Blue&quot;/&gt;\n
-                            \t&lt;ListBoxItem Content=&quot;Green&quot;/&gt;\n
-                            &lt;/ListBox&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                HeaderText="ListBox with items defined inline.">
+                <controls:GalleryControlPresenter.Content>
+                    <ListBox SelectedIndex="0">
+                        <ListBoxItem>Blue</ListBoxItem>
+                        <ListBoxItem>Green</ListBoxItem>
+                        <ListBoxItem>Red</ListBoxItem>
+                        <ListBoxItem>Yellow</ListBoxItem>
+                    </ListBox>
+                </controls:GalleryControlPresenter.Content>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;ListBox&gt;\n
+                    \t&lt;ListBoxItem Content=&quot;Blue&quot;/&gt;\n
+                    \t&lt;ListBoxItem Content=&quot;Green&quot;/&gt;\n
+                    &lt;/ListBox&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,36,0,0"
-                        CodeText="&lt;ListBox Height=&quot;100&quot; ItemsSource=&quot;{Binding ViewModel.MyItems}&quot; /&gt;"
-                        HeaderText="A ListBox with its ItemsSource and Height set.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ListBox
-                                Height="164"
-                                ItemsSource="{Binding ViewModel.ListBoxItems, Mode=TwoWay}"
-                                SelectedIndex="2" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,36,0,0"
+                CodeText="&lt;ListBox Height=&quot;100&quot; ItemsSource=&quot;{Binding ViewModel.MyItems}&quot; /&gt;"
+                HeaderText="A ListBox with its ItemsSource and Height set.">
+                <controls:GalleryControlPresenter.Content>
+                    <ListBox
+                        Height="164"
+                        ItemsSource="{Binding ViewModel.ListBoxItems, Mode=TwoWay}"
+                        SelectedIndex="2" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
index 1836c85a9..f5754dc6e 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
@@ -24,128 +24,125 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        HeaderText="Basic ListView with Simple DataTemplate.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ListView
-                                Height="200"
-                                ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}"
-                                SelectedIndex="2"
-                                SelectionMode="Single">
-                                <ListView.ItemTemplate>
-                                    <DataTemplate DataType="{x:Type models:Person}">
-                                        <TextBlock Margin="8,4" Text="{Binding Name, Mode=OneWay}" />
-                                    </DataTemplate>
-                                </ListView.ItemTemplate>
-                            </ListView>
-                        </controls:GalleryControlPresenter.Content>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;ListView ItemsSource=&quot;{Binding ViewModel.MyCollection}&quot;&gt;&lt;&gt;\n
-                            \t&lt;ListView.ItemTemplate&gt;\n
-                            \t\t&lt;DataTemplate DataType=&quot;{x:Type models:Person}&quot; &gt;\n
-                            \t\t\t&lt;TextBlock Margin=&quot;8,4&quot; Text=&quot;{Binding Name}&quot;/&gt;\n
-                            \t\t&lt;/DataTemplate&gt;\n
-                            \t&lt;/ListView.ItemTemplate&gt;\n
-                            &lt;/ListView&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                HeaderText="Basic ListView with Simple DataTemplate.">
+                <controls:GalleryControlPresenter.Content>
+                    <ListView
+                        Height="200"
+                        ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}"
+                        SelectedIndex="2"
+                        SelectionMode="Single">
+                        <ListView.ItemTemplate>
+                            <DataTemplate DataType="{x:Type models:Person}">
+                                <TextBlock Margin="8,4" Text="{Binding Name, Mode=OneWay}" />
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                </controls:GalleryControlPresenter.Content>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;ListView ItemsSource=&quot;{Binding ViewModel.MyCollection}&quot;&gt;&lt;&gt;\n
+                    \t&lt;ListView.ItemTemplate&gt;\n
+                    \t\t&lt;DataTemplate DataType=&quot;{x:Type models:Person}&quot; &gt;\n
+                    \t\t\t&lt;TextBlock Margin=&quot;8,4&quot; Text=&quot;{Binding Name}&quot;/&gt;\n
+                    \t\t&lt;/DataTemplate&gt;\n
+                    \t&lt;/ListView.ItemTemplate&gt;\n
+                    &lt;/ListView&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,36,0,0"
-                        HeaderText="ListView with Selection Support.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <ListView
-                                    Grid.Column="0"
-                                    Height="200"
-                                    ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}"
-                                    SelectedIndex="1"
-                                    SelectionMode="{Binding ViewModel.ListViewSelectionMode, Mode=OneWay}">
-                                    <ListView.ItemTemplate>
-                                        <DataTemplate DataType="{x:Type models:Person}">
-                                            <Grid Margin="8,0">
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="*" />
-                                                    <RowDefinition Height="*" />
-                                                </Grid.RowDefinitions>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto" />
-                                                    <ColumnDefinition Width="*" />
-                                                </Grid.ColumnDefinitions>
-                                                <Ellipse
-                                                    x:Name="Ellipse"
-                                                    Grid.RowSpan="2"
-                                                    Width="32"
-                                                    Height="32"
-                                                    Margin="6"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    Fill="{ui:ThemeResource ControlStrongStrokeColorDefaultBrush}" />
-                                                <TextBlock
-                                                    Grid.Row="0"
-                                                    Grid.Column="1"
-                                                    Margin="12,6,0,0"
-                                                    FontWeight="Bold"
-                                                    Text="{Binding Name, Mode=OneWay}" />
-                                                <TextBlock
-                                                    Grid.Row="1"
-                                                    Grid.Column="1"
-                                                    Margin="12,0,0,6"
-                                                    Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                                    Text="{Binding Company, Mode=OneWay}" />
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ListView.ItemTemplate>
-                                </ListView>
-                                <StackPanel
-                                    Grid.Column="1"
-                                    MinWidth="120"
-                                    Margin="12,0,0,0"
-                                    VerticalAlignment="Top">
-                                    <Label Content="Selection mode" Target="{Binding ElementName=SelectionModeComboBox}" />
-                                    <ComboBox x:Name="SelectionModeComboBox" SelectedIndex="{Binding ViewModel.ListViewSelectionModeComboBoxSelectedIndex, Mode=TwoWay}">
-                                        <ComboBoxItem Content="Single" />
-                                        <ComboBoxItem Content="Multiple" />
-                                        <ComboBoxItem Content="Extended" />
-                                    </ComboBox>
-                                </StackPanel>
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;ListView ItemsSource=&quot;{Binding ViewModel.MyCollection}&quot;&gt;&lt;&gt;\n
-                            \t&lt;ListView.ItemTemplate&gt;\n
-                            \t\t&lt;DataTemplate DataType=&quot;{x:Type models:Person}&quot; &gt;\n
-                            \t\t\t&lt;TextBlock Margin=&quot;0,5,0,5&quot; Text=&quot;{Binding Name}&quot;/&gt;\n
-                            \t\t&lt;/DataTemplate&gt;\n
-                            \t&lt;/ListView.ItemTemplate&gt;\n
-                            &lt;/ListView&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,36,0,0"
+                HeaderText="ListView with Selection Support.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ListView
+                            Grid.Column="0"
+                            Height="200"
+                            ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}"
+                            SelectedIndex="1"
+                            SelectionMode="{Binding ViewModel.ListViewSelectionMode, Mode=OneWay}">
+                            <ListView.ItemTemplate>
+                                <DataTemplate DataType="{x:Type models:Person}">
+                                    <Grid Margin="8,0">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="*" />
+                                        </Grid.RowDefinitions>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <Ellipse
+                                            x:Name="Ellipse"
+                                            Grid.RowSpan="2"
+                                            Width="32"
+                                            Height="32"
+                                            Margin="6"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Fill="{ui:ThemeResource ControlStrongStrokeColorDefaultBrush}" />
+                                        <TextBlock
+                                            Grid.Row="0"
+                                            Grid.Column="1"
+                                            Margin="12,6,0,0"
+                                            FontWeight="Bold"
+                                            Text="{Binding Name, Mode=OneWay}" />
+                                        <TextBlock
+                                            Grid.Row="1"
+                                            Grid.Column="1"
+                                            Margin="12,0,0,6"
+                                            Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                            Text="{Binding Company, Mode=OneWay}" />
+                                    </Grid>
+                                </DataTemplate>
+                            </ListView.ItemTemplate>
+                        </ListView>
+                        <StackPanel
+                            Grid.Column="1"
+                            MinWidth="120"
+                            Margin="12,0,0,0"
+                            VerticalAlignment="Top">
+                            <Label Content="Selection mode" Target="{Binding ElementName=SelectionModeComboBox}" />
+                            <ComboBox x:Name="SelectionModeComboBox" SelectedIndex="{Binding ViewModel.ListViewSelectionModeComboBoxSelectedIndex, Mode=TwoWay}">
+                                <ComboBoxItem Content="Single" />
+                                <ComboBoxItem Content="Multiple" />
+                                <ComboBoxItem Content="Extended" />
+                            </ComboBox>
+                        </StackPanel>
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;ListView ItemsSource=&quot;{Binding ViewModel.MyCollection}&quot;&gt;&lt;&gt;\n
+                    \t&lt;ListView.ItemTemplate&gt;\n
+                    \t\t&lt;DataTemplate DataType=&quot;{x:Type models:Person}&quot; &gt;\n
+                    \t\t\t&lt;TextBlock Margin=&quot;0,5,0,5&quot; Text=&quot;{Binding Name}&quot;/&gt;\n
+                    \t\t&lt;/DataTemplate&gt;\n
+                    \t&lt;/ListView.ItemTemplate&gt;\n
+                    &lt;/ListView&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Collections/TreeListPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Collections/TreeListPage.xaml
index 75d5c36ba..c3299d6c6 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Collections/TreeListPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Collections/TreeListPage.xaml
@@ -23,34 +23,31 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        HeaderText="WPF UI TreeList.">
-                        <controls:GalleryControlPresenter.Content>
-                            <TextBlock Text="To do." />
-                        </controls:GalleryControlPresenter.Content>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                HeaderText="WPF UI TreeList.">
+                <controls:GalleryControlPresenter.Content>
+                    <TextBlock Text="To do." />
+                </controls:GalleryControlPresenter.Content>
 
-                    </controls:GalleryControlPresenter>
+            </controls:GalleryControlPresenter>
+        </Grid>
 
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Collections/TreeViewPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Collections/TreeViewPage.xaml
index 207c34022..13d096b55 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Collections/TreeViewPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Collections/TreeViewPage.xaml
@@ -23,55 +23,52 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        HeaderText="Simple TreeView.">
-                        <controls:GalleryControlPresenter.Content>
-                            <TreeView AllowDrop="True" ScrollViewer.CanContentScroll="False">
-                                <TreeViewItem
-                                    Header="Work Documents"
-                                    IsExpanded="True"
-                                    IsSelected="True">
-                                    <TreeViewItem Header="Feature Schedule" />
-                                    <TreeViewItem Header="Overall Project Plan" />
-                                </TreeViewItem>
-                                <TreeViewItem Header="Personal Documents">
-                                    <TreeViewItem Header="Contractor contact info" />
-                                    <TreeViewItem Header="Home Remodel">
-                                        <TreeViewItem Header="Paint Color Scheme" />
-                                        <TreeViewItem Header="Flooring Woodgrain Type" />
-                                        <TreeViewItem Header="Kitchen Cabinet Style" />
-                                    </TreeViewItem>
-                                </TreeViewItem>
-                            </TreeView>
-                        </controls:GalleryControlPresenter.Content>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;TreeView AllowDrop=&quot;True&quot;&gt;\n
-                            \t&lt;TreeViewItem Header=&quot;Work Documents&quot; IsExpanded=&quot;True&quot;&gt;\n
-                            \t\t&lt;TreeViewItem Header=&quot;Feature Schedule&quot;/&gt;\n
-                            \t&lt;/TreeViewItem&gt;\n
-                            &lt;/TreeView&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                HeaderText="Simple TreeView.">
+                <controls:GalleryControlPresenter.Content>
+                    <TreeView AllowDrop="True" ScrollViewer.CanContentScroll="False">
+                        <TreeViewItem
+                            Header="Work Documents"
+                            IsExpanded="True"
+                            IsSelected="True">
+                            <TreeViewItem Header="Feature Schedule" />
+                            <TreeViewItem Header="Overall Project Plan" />
+                        </TreeViewItem>
+                        <TreeViewItem Header="Personal Documents">
+                            <TreeViewItem Header="Contractor contact info" />
+                            <TreeViewItem Header="Home Remodel">
+                                <TreeViewItem Header="Paint Color Scheme" />
+                                <TreeViewItem Header="Flooring Woodgrain Type" />
+                                <TreeViewItem Header="Kitchen Cabinet Style" />
+                            </TreeViewItem>
+                        </TreeViewItem>
+                    </TreeView>
+                </controls:GalleryControlPresenter.Content>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;TreeView AllowDrop=&quot;True&quot;&gt;\n
+                    \t&lt;TreeViewItem Header=&quot;Work Documents&quot; IsExpanded=&quot;True&quot;&gt;\n
+                    \t\t&lt;TreeViewItem Header=&quot;Feature Schedule&quot;/&gt;\n
+                    \t&lt;/TreeViewItem&gt;\n
+                    &lt;/TreeView&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DashboardPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DashboardPage.xaml
index 039f5b5c3..dc4d4c3d4 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/DashboardPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DashboardPage.xaml
@@ -16,7 +16,7 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-    <Grid Margin="42">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -46,25 +46,24 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Background="Transparent">
-                        <TextBlock
-                            FontSize="18"
-                            Foreground="#B7FFFFFF"
-                            Text="Windows Presentation Foundation" />
-                        <TextBlock
-                            FontSize="28"
-                            FontWeight="Bold"
+                        <ui:TextBlock
+                            FontTypography="Title"
                             Foreground="#FFFFFF"
                             Text="Fluent UI" />
-                        <TextBlock
-                            FontSize="18"
+                        <ui:TextBlock
+                            FontTypography="Subtitle"
+                            Foreground="#B7FFFFFF"
+                            Text="Windows Presentation Foundation" />
+                        <ui:TextBlock
+                            FontTypography="BodyStrong"
                             Foreground="#B7FFFFFF"
                             Text="Build Fluent experiences on Windows using WPF UI." />
                     </StackPanel>
-                    <TextBlock
+                    <ui:TextBlock
                         Margin="12"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Bottom"
-                        FontSize="10"
+                        FontTypography="Caption"
                         Foreground="#57FFFFFF"
                         Text="Created by lepo.co" />
                 </Grid>
@@ -111,15 +110,13 @@
                         Grid.Column="1"
                         Margin="24"
                         VerticalAlignment="Center">
-                        <TextBlock
+                        <ui:TextBlock
                             Margin="0"
-                            FontSize="16"
-                            FontWeight="Medium"
+                            FontTypography="BodyStrong"
                             Text="Basic input"
                             TextWrapping="WrapWithOverflow" />
-                        <TextBlock
-                            FontSize="12"
-                            Foreground="{DynamicResource TextFillColorTertiaryBrush}"
+                        <ui:TextBlock
+                            Appearance="Tertiary"
                             Text="Buttons, CheckBoxes, Sliders..."
                             TextWrapping="WrapWithOverflow" />
                     </StackPanel>
@@ -150,14 +147,13 @@
                         Grid.Column="1"
                         Margin="24"
                         VerticalAlignment="Center">
-                        <TextBlock
+                        <ui:TextBlock
                             Margin="0"
-                            FontSize="16"
-                            FontWeight="Medium"
+                            FontTypography="BodyStrong"
                             Text="Dialogs &amp; Flyouts"
                             TextWrapping="WrapWithOverflow" />
-                        <TextBlock
-                            FontSize="12"
+                        <ui:TextBlock
+                            Appearance="Tertiary"
                             Foreground="{DynamicResource TextFillColorTertiaryBrush}"
                             Text="Contextual notifications."
                             TextWrapping="WrapWithOverflow" />
@@ -189,14 +185,13 @@
                         Grid.Column="1"
                         Margin="24"
                         VerticalAlignment="Center">
-                        <TextBlock
+                        <ui:TextBlock
                             Margin="0"
-                            FontSize="16"
-                            FontWeight="Medium"
+                            FontTypography="BodyStrong"
                             Text="Navigation"
                             TextWrapping="WrapWithOverflow" />
-                        <TextBlock
-                            FontSize="12"
+                        <ui:TextBlock
+                            Appearance="Tertiary"
                             Foreground="{DynamicResource TextFillColorTertiaryBrush}"
                             Text="Managing the displayed pages."
                             TextWrapping="WrapWithOverflow" />
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/CalendarPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/CalendarPage.xaml
index 3f7a26c75..ecae20f51 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/CalendarPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/CalendarPage.xaml
@@ -23,35 +23,33 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        HeaderText="A basic Calendar control.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Calendar HorizontalAlignment="Left" />
-                        </controls:GalleryControlPresenter.Content>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;Calendar/&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                HeaderText="A basic Calendar control.">
+                <controls:GalleryControlPresenter.Content>
+                    <Calendar HorizontalAlignment="Left" />
+                </controls:GalleryControlPresenter.Content>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;Calendar/&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
+
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/DateAndTimePage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/DateAndTimePage.xaml
index 22f028501..510414c02 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/DateAndTimePage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/DateAndTimePage.xaml
@@ -17,10 +17,8 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-    <Grid Margin="38">
-        <controls:GalleryNavigationPresenter
-            Margin="0"
-            Padding="0"
-            ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
-    </Grid>
+    <controls:GalleryNavigationPresenter
+        Margin="0"
+        Padding="0"
+        ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/DatePickerPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/DatePickerPage.xaml
index ffcdaa72b..c8bfa18f7 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/DatePickerPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DateAndTime/DatePickerPage.xaml
@@ -23,35 +23,33 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        HeaderText="A basic DatePicker control.">
-                        <controls:GalleryControlPresenter.Content>
-                            <DatePicker />
-                        </controls:GalleryControlPresenter.Content>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;DatePicker/&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                HeaderText="A basic DatePicker control.">
+                <controls:GalleryControlPresenter.Content>
+                    <DatePicker />
+                </controls:GalleryControlPresenter.Content>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;DatePicker/&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
+
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml
new file mode 100644
index 000000000..5ca506574
--- /dev/null
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml
@@ -0,0 +1,120 @@
+<Page
+    x:Class="Wpf.Ui.Gallery.Views.Pages.DesignGuidance.TypographyPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Wpf.Ui.Gallery.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Wpf.Ui.Gallery.Views.Pages.DesignGuidance"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    Title="TypographyPage"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
+    ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+    mc:Ignorable="d">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <StackPanel Grid.Row="0">
+            <StackPanel Margin="0,0,0,4" Orientation="Horizontal">
+                <TextBlock Text="Type helps provide structure and hierarchy to UI. The default font for Windows is " />
+                <ui:Hyperlink
+                    Padding="0"
+                    Content="Segoe UI Variable."
+                    NavigateUri="https://learn.microsoft.com/windows/apps/design/downloads/#fonts" />
+            </StackPanel>
+            <TextBlock Text="Best practice is to use Regular weight for most text, use Semibold for titles. The minimum values should be 12px Regular, 14px Semibold." TextWrapping="WrapWithOverflow" />
+        </StackPanel>
+
+        <controls:ControlExample
+            Grid.Row="1"
+            Margin="0,25,0,0"
+            XamlCodeSource="/CodeSamples/Typography/TypographySample_xaml.txt">
+            <StackPanel>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="286" />
+                        <ColumnDefinition Width="156" />
+                        <ColumnDefinition Width="140" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
+                    <ui:TextBlock
+                        Margin="24,0,0,0"
+                        Appearance="Secondary"
+                        FontTypography="Caption"
+                        Text="Example" />
+                    <ui:TextBlock
+                        Grid.Column="1"
+                        Appearance="Secondary"
+                        FontTypography="Caption"
+                        Text="Variable Font" />
+                    <ui:TextBlock
+                        Grid.Column="2"
+                        Appearance="Secondary"
+                        FontTypography="Caption"
+                        Text="Size / Line height" />
+                    <ui:TextBlock
+                        Grid.Column="3"
+                        Appearance="Secondary"
+                        FontTypography="Caption"
+                        Text="Style" />
+                </Grid>
+
+                <controls:TypographyControl
+                    Background="{ui:ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    Example="Caption"
+                    ExampleFontTypography="Caption"
+                    SizeLinHeight="12/16"
+                    VariableFont="Regular" />
+
+                <controls:TypographyControl
+                    Example="Body"
+                    ExampleFontTypography="Body"
+                    SizeLinHeight="14/20"
+                    VariableFont="Regular" />
+
+                <controls:TypographyControl
+                    Background="{ui:ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    Example="Body strong"
+                    ExampleFontTypography="BodyStrong"
+                    SizeLinHeight="14/20"
+                    VariableFont="SemiBold" />
+
+                <controls:TypographyControl
+                    Example="Subtitle"
+                    ExampleFontTypography="Subtitle"
+                    SizeLinHeight="20/28"
+                    VariableFont="SemiBold" />
+
+                <controls:TypographyControl
+                    Background="{ui:ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    Example="Title"
+                    ExampleFontTypography="Title"
+                    SizeLinHeight="28/36"
+                    VariableFont="SemiBold" />
+
+                <controls:TypographyControl
+                    Example="Title Large"
+                    ExampleFontTypography="TitleLarge"
+                    SizeLinHeight="40/52"
+                    VariableFont="SemiBold" />
+
+                <controls:TypographyControl
+                    Background="{ui:ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    Example="Display"
+                    ExampleFontTypography="Display"
+                    SizeLinHeight="68/92"
+                    VariableFont="SemiBold" />
+            </StackPanel>
+        </controls:ControlExample>
+    </Grid>
+
+
+</Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml.cs b/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml.cs
new file mode 100644
index 000000000..e8c37c5af
--- /dev/null
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DesignGuidance/TypographyPage.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Wpf.Ui.Gallery.Views.Pages.DesignGuidance;
+
+public partial class TypographyPage : Page
+{
+    public TypographyPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialog.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialog.xaml
index dcdd71276..e05434a60 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialog.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialog.xaml
@@ -18,7 +18,6 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-
     <Page.Resources>
         <ResourceDictionary>
             <system:String x:Key="PageXamlUrl">https://github.com/lepoco/wpfui/blob/development/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialog.xaml</system:String>
@@ -36,39 +35,35 @@
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            Grid.RowSpan="2"
-            Padding="42">
 
-            <StackPanel>
-                <controls:GalleryControlPresenter HeaderText="ContentDialog">
-                    <controls:GalleryControlPresenter.Content>
-                        <StackPanel Orientation="Horizontal">
-                            <Button
-                                Command="{Binding ShowDialogCommand}"
-                                CommandParameter="{StaticResource DialogContent}"
-                                Content="Show" />
+        <StackPanel>
+            <controls:GalleryControlPresenter HeaderText="ContentDialog">
+                <controls:GalleryControlPresenter.Content>
+                    <StackPanel Orientation="Horizontal">
+                        <Button
+                            Command="{Binding ShowDialogCommand}"
+                            CommandParameter="{StaticResource DialogContent}"
+                            Content="Show" />
 
-                            <TextBlock
-                                Margin="15,0,0,0"
-                                VerticalAlignment="Center"
-                                FontSize="14"
-                                Text="{Binding DialogResultText}" />
-                        </StackPanel>
-                    </controls:GalleryControlPresenter.Content>
-                </controls:GalleryControlPresenter>
+                        <TextBlock
+                            Margin="15,0,0,0"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{Binding DialogResultText}" />
+                    </StackPanel>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+
+            <controls:GalleryControlPresenter Margin="0,36,0,0" HeaderText="Terms of Use ContentDialog example">
+                <controls:GalleryControlPresenter.Content>
+                    <Button Command="{Binding ShowSignInContentDialogCommand}" Content="Show" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </StackPanel>
 
-                <controls:GalleryControlPresenter Margin="0,36,0,0" HeaderText="Terms of Use ContentDialog example">
-                    <controls:GalleryControlPresenter.Content>
-                        <Button Command="{Binding ShowSignInContentDialogCommand}" Content="Show" />
-                    </controls:GalleryControlPresenter.Content>
-                </controls:GalleryControlPresenter>
-            </StackPanel>
-        </ui:DynamicScrollViewer>
         <controls:ControlDocumentationSummary
-            Grid.RowSpan="2"
             Grid.Column="1"
+            Margin="42,0,0,0"
             CsharpUrl="{StaticResource PageCsharpUrl}"
             XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogsAndFlyoutsPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogsAndFlyoutsPage.xaml
index 29f20828b..97bc9e0cd 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogsAndFlyoutsPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogsAndFlyoutsPage.xaml
@@ -18,10 +18,8 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-    <Grid Margin="38">
-        <controls:GalleryNavigationPresenter
-            Margin="0"
-            Padding="0"
-            ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
-    </Grid>
+    <controls:GalleryNavigationPresenter
+        Margin="0"
+        Padding="0"
+        ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/FlyoutPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/FlyoutPage.xaml
index 868e976e8..776bd6a73 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/FlyoutPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/FlyoutPage.xaml
@@ -23,56 +23,53 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ui:Flyout Placement=&quot;Top&quot; /&gt;"
-                        HeaderText="WPF UI Flyout control.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <ui:Flyout
-                                    Grid.Row="0"
-                                    IsOpen="{Binding ViewModel.IsFlyoutOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:FlyoutPage}, Mode=TwoWay}"
-                                    Placement="Top">
-                                    <StackPanel>
-                                        <TextBlock
-                                            Width="280"
-                                            HorizontalAlignment="Left"
-                                            Text="Replicants like any other machine are either a benefit or a hazard. If they're a benefit it's not my problem."
-                                            TextWrapping="WrapWithOverflow" />
-                                        <Button Margin="0,8,0,0" Content="The cake is a lie!" />
-                                    </StackPanel>
-                                </ui:Flyout>
-                                <Button
-                                    Grid.Row="1"
-                                    Command="{Binding ViewModel.ButtonClickCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:FlyoutPage}, Mode=OneWay}"
-                                    CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                    Content="Open flyout" />
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ui:Flyout Placement=&quot;Top&quot; /&gt;"
+                HeaderText="WPF UI Flyout control.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <ui:Flyout
+                            Grid.Row="0"
+                            IsOpen="{Binding ViewModel.IsFlyoutOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:FlyoutPage}, Mode=TwoWay}"
+                            Placement="Top">
+                            <StackPanel>
+                                <TextBlock
+                                    Width="280"
+                                    HorizontalAlignment="Left"
+                                    Text="Replicants like any other machine are either a benefit or a hazard. If they're a benefit it's not my problem."
+                                    TextWrapping="WrapWithOverflow" />
+                                <Button Margin="0,8,0,0" Content="The cake is a lie!" />
+                            </StackPanel>
+                        </ui:Flyout>
+                        <Button
+                            Grid.Row="1"
+                            Command="{Binding ViewModel.ButtonClickCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:FlyoutPage}, Mode=OneWay}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                            Content="Open flyout" />
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/MessageBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/MessageBoxPage.xaml
index 2e7a0416b..aabc445bc 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/MessageBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/MessageBoxPage.xaml
@@ -23,50 +23,49 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="280" />
+            </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;MessageBox /&gt;"
-                        HeaderText="Standard MessageBox.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Button
-                                Grid.Row="1"
-                                Command="{Binding ViewModel.OpenStandardMessageBoxCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MessageBoxPage}, Mode=OneWay}"
-                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                Content="Open standard MessageBox" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+            <Grid Grid.Column="0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <controls:GalleryControlPresenter
+                    Grid.Row="0"
+                    Margin="0"
+                    CodeText="&lt;MessageBox /&gt;"
+                    HeaderText="Standard MessageBox.">
+                    <controls:GalleryControlPresenter.Content>
+                        <Button
+                            Grid.Row="1"
+                            Command="{Binding ViewModel.OpenStandardMessageBoxCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MessageBoxPage}, Mode=OneWay}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                            Content="Open standard MessageBox" />
+                    </controls:GalleryControlPresenter.Content>
+                </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,36,0,0"
-                        HeaderText="WPF UI MessageBox.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Button
-                                Grid.Row="1"
-                                Command="{Binding ViewModel.OpenCustomMessageBoxCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MessageBoxPage}, Mode=OneWay}"
-                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                Content="Open custom MessageBox" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
+                <controls:GalleryControlPresenter
+                    Grid.Row="1"
+                    Margin="0,36,0,0"
+                    HeaderText="WPF UI MessageBox.">
+                    <controls:GalleryControlPresenter.Content>
+                        <Button
+                            Grid.Row="1"
+                            Command="{Binding ViewModel.OpenCustomMessageBoxCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MessageBoxPage}, Mode=OneWay}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                            Content="Open custom MessageBox" />
+                    </controls:GalleryControlPresenter.Content>
+                </controls:GalleryControlPresenter>
             </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:ControlDocumentationSummary
+                Grid.Column="1"
+                Margin="42,0,0,0"
+                CsharpUrl="{StaticResource PageCsharpUrl}"
+                XamlUrl="{StaticResource PageXamlUrl}" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/SnackbarPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/SnackbarPage.xaml
index b76cae249..027c82e03 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/SnackbarPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/SnackbarPage.xaml
@@ -23,83 +23,83 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="280" />
+            </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        HeaderText="Global WPF UI Snackbar inside NavigationView content.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Button
-                                    Grid.Column="0"
+            <Grid Grid.Column="0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <controls:GalleryControlPresenter
+                    Grid.Row="0"
+                    Margin="0"
+                    HeaderText="Global WPF UI Snackbar inside NavigationView content.">
+                    <controls:GalleryControlPresenter.Content>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Button
+                                Grid.Column="0"
+                                VerticalAlignment="Center"
+                                Command="{Binding ViewModel.OpenSnackbarCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SnackbarPage}, Mode=OneWay}"
+                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                                Content="Show snackbar" />
+                            <Grid Grid.Column="1" VerticalAlignment="Center">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <ComboBox
+                                    Grid.Row="0"
+                                    MinWidth="140"
+                                    Margin="0,8,0,0"
                                     VerticalAlignment="Center"
-                                    Command="{Binding ViewModel.OpenSnackbarCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SnackbarPage}, Mode=OneWay}"
-                                    CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                    Content="Show snackbar" />
-                                <Grid Grid.Column="1" VerticalAlignment="Center">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <ComboBox
-                                        Grid.Row="0"
-                                        MinWidth="140"
-                                        Margin="0,8,0,0"
-                                        VerticalAlignment="Center"
-                                        SelectedIndex="{Binding ViewModel.SnackbarAppearanceComboBoxSelectedIndex, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SnackbarPage}, Mode=TwoWay}">
-                                        <ComboBoxItem Content="Primary" />
-                                        <ComboBoxItem Content="Secondary" />
-                                        <ComboBoxItem Content="Info" />
-                                        <ComboBoxItem Content="Success" />
-                                        <ComboBoxItem Content="Caution" />
-                                        <ComboBoxItem Content="Danger" />
-                                        <ComboBoxItem Content="Light" />
-                                        <ComboBoxItem Content="Dark" />
-                                        <ComboBoxItem Content="Transparent" />
-                                    </ComboBox>
-                                    <Label
-                                        Grid.Row="1"
-                                        Margin="0,6,0,0"
-                                        Content="Timeout:" />
-                                    <Slider
-                                        Grid.Row="2"
-                                        AutoToolTipPlacement="BottomRight"
-                                        AutoToolTipPrecision="0"
-                                        IsSnapToTickEnabled="True"
-                                        Maximum="5"
-                                        Minimum="1"
-                                        TickFrequency="1"
-                                        TickPlacement="BottomRight"
-                                        Value="{Binding ViewModel.SnackbarTimeout, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SnackbarPage}, Mode=TwoWay}" />
-                                </Grid>
+                                    SelectedIndex="{Binding ViewModel.SnackbarAppearanceComboBoxSelectedIndex, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SnackbarPage}, Mode=TwoWay}">
+                                    <ComboBoxItem Content="Primary" />
+                                    <ComboBoxItem Content="Secondary" />
+                                    <ComboBoxItem Content="Info" />
+                                    <ComboBoxItem Content="Success" />
+                                    <ComboBoxItem Content="Caution" />
+                                    <ComboBoxItem Content="Danger" />
+                                    <ComboBoxItem Content="Light" />
+                                    <ComboBoxItem Content="Dark" />
+                                    <ComboBoxItem Content="Transparent" />
+                                </ComboBox>
+                                <Label
+                                    Grid.Row="1"
+                                    Margin="0,6,0,0"
+                                    Content="Timeout:" />
+                                <Slider
+                                    Grid.Row="2"
+                                    AutoToolTipPlacement="BottomRight"
+                                    AutoToolTipPrecision="0"
+                                    IsSnapToTickEnabled="True"
+                                    Maximum="5"
+                                    Minimum="1"
+                                    TickFrequency="1"
+                                    TickPlacement="BottomRight"
+                                    Value="{Binding ViewModel.SnackbarTimeout, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SnackbarPage}, Mode=TwoWay}" />
                             </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;ui:Snackbar Title=&quot;Title&quot; Appearance=&quot;Secondary&quot; /&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
+                        </Grid>
+                    </controls:GalleryControlPresenter.Content>
+                    <controls:GalleryControlPresenter.CodeText>
+                        &lt;ui:Snackbar Title=&quot;Title&quot; Appearance=&quot;Secondary&quot; /&gt;
+                    </controls:GalleryControlPresenter.CodeText>
+                </controls:GalleryControlPresenter>
             </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+
+            <controls:ControlDocumentationSummary
+                Grid.Column="1"
+                Margin="42,0,0,0"
+                CsharpUrl="{StaticResource PageCsharpUrl}"
+                XamlUrl="{StaticResource PageXamlUrl}" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Icons/FontIconPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Icons/FontIconPage.xaml
index 659797688..b06bca274 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Icons/FontIconPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Icons/FontIconPage.xaml
@@ -23,44 +23,41 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ui:FontIcon Glyph=&quot;&amp;#xe00b;&quot; /&gt;"
-                        HeaderText="WPF UI font icon.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ui:FontIcon
-                                HorizontalAlignment="Left"
-                                FontFamily="{DynamicResource SegoeFluentIcons}"
-                                FontSize="24"
-                                Glyph="&#xe00b;" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ui:FontIcon Glyph=&quot;&amp;#xe00b;&quot; /&gt;"
+                HeaderText="WPF UI font icon.">
+                <controls:GalleryControlPresenter.Content>
+                    <ui:FontIcon
+                        HorizontalAlignment="Left"
+                        FontFamily="{DynamicResource SegoeFluentIcons}"
+                        FontSize="24"
+                        Glyph="&#xe00b;" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,8,0,0"
-                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                        Text="By default, the FontIcon uses the `Segoe Fluent Icons` font, which is installed on Windows 11 by default. If you are using Windows 10 and below, you need to add this font to your application resources."
-                        TextWrapping="WrapWithOverflow" />
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <TextBlock
+                Grid.Row="1"
+                Margin="0,8,0,0"
+                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                Text="By default, the FontIcon uses the `Segoe Fluent Icons` font, which is installed on Windows 11 by default. If you are using Windows 10 and below, you need to add this font to your application resources."
+                TextWrapping="WrapWithOverflow" />
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Icons/IconsPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Icons/IconsPage.xaml
index f323cb6b8..14d5f192b 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Icons/IconsPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Icons/IconsPage.xaml
@@ -16,9 +16,10 @@
     ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
     ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+    ScrollViewer.CanContentScroll="False"
     mc:Ignorable="d">
 
-    <Grid Margin="42,42,42,4">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -88,19 +89,18 @@
             VirtualizingPanel.CacheLengthUnit="Pixel">
             <ItemsControl.ItemTemplate>
                 <DataTemplate DataType="{x:Type models:DisplayableIcon}">
-                    <ui:Button
+                    <Button
                         Width="80"
                         Height="80"
                         Margin="2"
                         Padding="0"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
-                        Appearance="Secondary"
                         Command="{Binding ViewModel.IconSelectedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:IconsPage}}"
                         CommandParameter="{Binding Path=Id, Mode=OneTime}"
-                        FontSize="25"
-                        Icon="{Binding Icon, Mode=OneTime}"
-                        ToolTip="{Binding Name, Mode=OneTime}" />
+                        ToolTip="{Binding Name, Mode=OneTime}">
+                        <ui:SymbolIcon FontSize="28" Symbol="{Binding Icon, Mode=OneTime}" />
+                    </Button>
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ui:VirtualizingItemsControl>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Icons/SymbolIconPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Icons/SymbolIconPage.xaml
index b89d034a4..c1d22e02f 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Icons/SymbolIconPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Icons/SymbolIconPage.xaml
@@ -23,45 +23,42 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="{Binding ViewModel.CodeText, Mode=OneWay}"
-                        HeaderText="WPF UI symbol icon.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <ui:SymbolIcon
-                                    HorizontalAlignment="Left"
-                                    Filled="{Binding ViewModel.IsIconFilled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SymbolIconPage}, Mode=OneWay}"
-                                    FontSize="28"
-                                    Symbol="Heart24" />
-                                <CheckBox
-                                    Grid.Column="1"
-                                    MinWidth="20"
-                                    Command="{Binding ViewModel.CheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SymbolIconPage}, Mode=OneWay}"
-                                    CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                    Content="Is filled" />
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="{Binding ViewModel.CodeText, Mode=OneWay}"
+                HeaderText="WPF UI symbol icon.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ui:SymbolIcon
+                            HorizontalAlignment="Left"
+                            Filled="{Binding ViewModel.IsIconFilled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SymbolIconPage}, Mode=OneWay}"
+                            FontSize="28"
+                            Symbol="Heart24" />
+                        <CheckBox
+                            Grid.Column="1"
+                            MinWidth="20"
+                            Command="{Binding ViewModel.CheckboxCheckedCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SymbolIconPage}, Mode=OneWay}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                            Content="Is filled" />
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Media/CanvasPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Media/CanvasPage.xaml
index 1b3ada983..7119fd89f 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Media/CanvasPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Media/CanvasPage.xaml
@@ -24,49 +24,46 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        HeaderText="A basic Canvas inside the ViewBox">
-                        <controls:GalleryControlPresenter.Content>
-                            <Viewbox Width="200" Height="200">
-                                <Canvas Width="47" Height="123">
-                                    <Path Data="M0,19H18V84h29v15H0V19Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
-                                    <Path Data="M46,80H29V15H0V0H46V80Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
-                                    <Path Data="M1.43,102.81h3.44v11.7c0,.47,.09,.81,.26,1.01,.17,.2,.42,.3,.73,.3,.22,0,.43-.03,.66-.1s.42-.14,.59-.23l.45,2.58c-.43,.2-.92,.36-1.48,.47s-1.08,.17-1.57,.17c-.98,0-1.73-.26-2.27-.79s-.81-1.27-.81-2.23v-12.91Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
-                                    <Path Data="M14.08,118.73c-.96,0-1.81-.15-2.56-.46s-1.38-.72-1.9-1.24c-.52-.53-.92-1.13-1.19-1.82s-.41-1.41-.41-2.16c0-1.07,.24-2.05,.72-2.93,.48-.88,1.17-1.59,2.08-2.13s1.99-.81,3.27-.81,2.36,.27,3.26,.8c.9,.54,1.58,1.24,2.05,2.11,.47,.87,.71,1.81,.71,2.83,0,.2-.01,.39-.03,.58s-.04,.36-.05,.5H11.67c.04,.49,.18,.9,.42,1.23s.54,.59,.91,.76c.37,.17,.77,.26,1.18,.26,.52,0,1-.12,1.45-.37,.45-.24,.76-.57,.94-.99l2.93,.82c-.29,.59-.69,1.11-1.22,1.56s-1.14,.81-1.85,1.07c-.71,.26-1.5,.39-2.36,.39Zm-2.5-6.84h4.91c-.06-.45-.19-.84-.41-1.18-.21-.33-.5-.59-.86-.78-.36-.19-.75-.28-1.18-.28s-.84,.09-1.19,.28c-.35,.18-.63,.44-.85,.78-.22,.34-.35,.73-.41,1.18Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
-                                    <Path Data="M28.81,118.73c-.85,0-1.58-.18-2.22-.54s-1.13-.85-1.48-1.47v6.38h-3.44v-15.75h2.99v1.84c.42-.64,.94-1.13,1.57-1.48,.63-.35,1.37-.53,2.22-.53,.76,0,1.46,.15,2.1,.45,.64,.3,1.19,.71,1.67,1.23,.47,.52,.84,1.13,1.1,1.82,.26,.69,.39,1.44,.39,2.25,0,1.1-.21,2.09-.62,2.97-.42,.88-.99,1.57-1.73,2.08-.74,.51-1.58,.76-2.53,.76Zm-1.16-2.9c.37,0,.71-.08,1.02-.24s.58-.37,.81-.64,.41-.58,.53-.93c.12-.36,.18-.73,.18-1.12s-.07-.77-.21-1.11-.33-.63-.57-.89-.53-.46-.86-.59c-.33-.14-.69-.21-1.08-.21-.23,0-.46,.04-.7,.1-.24,.07-.46,.17-.67,.3-.21,.13-.4,.29-.57,.46-.17,.18-.32,.38-.43,.62v2.29c.16,.37,.37,.71,.62,1,.26,.29,.55,.52,.88,.7s.67,.26,1.03,.26Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
-                                    <Path Data="M40.82,118.73c-.96,0-1.82-.16-2.57-.47-.75-.31-1.39-.74-1.9-1.27s-.91-1.15-1.17-1.84c-.27-.69-.4-1.42-.4-2.18s.13-1.51,.4-2.21,.66-1.31,1.17-1.84,1.15-.96,1.9-1.27c.75-.31,1.61-.47,2.57-.47s1.81,.16,2.56,.47c.75,.31,1.38,.73,1.89,1.27,.52,.54,.91,1.15,1.18,1.84s.41,1.43,.41,2.21-.14,1.49-.41,2.18c-.27,.69-.67,1.31-1.18,1.84-.52,.54-1.15,.96-1.89,1.27-.75,.31-1.6,.47-2.56,.47Zm-2.52-5.77c0,.57,.11,1.07,.33,1.5,.22,.43,.52,.77,.89,1,.37,.24,.8,.36,1.29,.36s.9-.12,1.28-.37c.38-.24,.68-.58,.89-1.01s.32-.93,.32-1.48-.11-1.07-.32-1.5-.51-.77-.89-1c-.38-.24-.81-.36-1.28-.36s-.92,.12-1.29,.36-.67,.57-.89,1c-.22,.43-.33,.93-.33,1.5Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
-                                </Canvas>
-                            </Viewbox>
-                        </controls:GalleryControlPresenter.Content>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;Viewbox Width=&quot;200&quot; Height=&quot;200&quot; &gt;\n
-                            \t&lt;Canvas Width=&quot;47&quot; Height=&quot;123&quot;&gt;\n
-                            \t\t&lt;Path Data=&quot;M0,19H18V84h29v15H0V19Z&quot; Fill=&quot;White&quot; /&gt;\n
-                            \t\t&lt;Path Data=&quot;M46,80H29V15H0V0H46V80Z&quot; Fill=&quot;White&quot; /&gt;\n
-                            \t&lt;/Canvas&gt;\n
-                            &lt;/Viewbox&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                HeaderText="A basic Canvas inside the ViewBox">
+                <controls:GalleryControlPresenter.Content>
+                    <Viewbox Width="200" Height="200">
+                        <Canvas Width="47" Height="123">
+                            <Path Data="M0,19H18V84h29v15H0V19Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
+                            <Path Data="M46,80H29V15H0V0H46V80Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
+                            <Path Data="M1.43,102.81h3.44v11.7c0,.47,.09,.81,.26,1.01,.17,.2,.42,.3,.73,.3,.22,0,.43-.03,.66-.1s.42-.14,.59-.23l.45,2.58c-.43,.2-.92,.36-1.48,.47s-1.08,.17-1.57,.17c-.98,0-1.73-.26-2.27-.79s-.81-1.27-.81-2.23v-12.91Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
+                            <Path Data="M14.08,118.73c-.96,0-1.81-.15-2.56-.46s-1.38-.72-1.9-1.24c-.52-.53-.92-1.13-1.19-1.82s-.41-1.41-.41-2.16c0-1.07,.24-2.05,.72-2.93,.48-.88,1.17-1.59,2.08-2.13s1.99-.81,3.27-.81,2.36,.27,3.26,.8c.9,.54,1.58,1.24,2.05,2.11,.47,.87,.71,1.81,.71,2.83,0,.2-.01,.39-.03,.58s-.04,.36-.05,.5H11.67c.04,.49,.18,.9,.42,1.23s.54,.59,.91,.76c.37,.17,.77,.26,1.18,.26,.52,0,1-.12,1.45-.37,.45-.24,.76-.57,.94-.99l2.93,.82c-.29,.59-.69,1.11-1.22,1.56s-1.14,.81-1.85,1.07c-.71,.26-1.5,.39-2.36,.39Zm-2.5-6.84h4.91c-.06-.45-.19-.84-.41-1.18-.21-.33-.5-.59-.86-.78-.36-.19-.75-.28-1.18-.28s-.84,.09-1.19,.28c-.35,.18-.63,.44-.85,.78-.22,.34-.35,.73-.41,1.18Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
+                            <Path Data="M28.81,118.73c-.85,0-1.58-.18-2.22-.54s-1.13-.85-1.48-1.47v6.38h-3.44v-15.75h2.99v1.84c.42-.64,.94-1.13,1.57-1.48,.63-.35,1.37-.53,2.22-.53,.76,0,1.46,.15,2.1,.45,.64,.3,1.19,.71,1.67,1.23,.47,.52,.84,1.13,1.1,1.82,.26,.69,.39,1.44,.39,2.25,0,1.1-.21,2.09-.62,2.97-.42,.88-.99,1.57-1.73,2.08-.74,.51-1.58,.76-2.53,.76Zm-1.16-2.9c.37,0,.71-.08,1.02-.24s.58-.37,.81-.64,.41-.58,.53-.93c.12-.36,.18-.73,.18-1.12s-.07-.77-.21-1.11-.33-.63-.57-.89-.53-.46-.86-.59c-.33-.14-.69-.21-1.08-.21-.23,0-.46,.04-.7,.1-.24,.07-.46,.17-.67,.3-.21,.13-.4,.29-.57,.46-.17,.18-.32,.38-.43,.62v2.29c.16,.37,.37,.71,.62,1,.26,.29,.55,.52,.88,.7s.67,.26,1.03,.26Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
+                            <Path Data="M40.82,118.73c-.96,0-1.82-.16-2.57-.47-.75-.31-1.39-.74-1.9-1.27s-.91-1.15-1.17-1.84c-.27-.69-.4-1.42-.4-2.18s.13-1.51,.4-2.21,.66-1.31,1.17-1.84,1.15-.96,1.9-1.27c.75-.31,1.61-.47,2.57-.47s1.81,.16,2.56,.47c.75,.31,1.38,.73,1.89,1.27,.52,.54,.91,1.15,1.18,1.84s.41,1.43,.41,2.21-.14,1.49-.41,2.18c-.27,.69-.67,1.31-1.18,1.84-.52,.54-1.15,.96-1.89,1.27-.75,.31-1.6,.47-2.56,.47Zm-2.52-5.77c0,.57,.11,1.07,.33,1.5,.22,.43,.52,.77,.89,1,.37,.24,.8,.36,1.29,.36s.9-.12,1.28-.37c.38-.24,.68-.58,.89-1.01s.32-.93,.32-1.48-.11-1.07-.32-1.5-.51-.77-.89-1c-.38-.24-.81-.36-1.28-.36s-.92,.12-1.29,.36-.67,.57-.89,1c-.22,.43-.33,.93-.33,1.5Z" Fill="{DynamicResource TextFillColorSecondaryBrush}" />
+                        </Canvas>
+                    </Viewbox>
+                </controls:GalleryControlPresenter.Content>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;Viewbox Width=&quot;200&quot; Height=&quot;200&quot; &gt;\n
+                    \t&lt;Canvas Width=&quot;47&quot; Height=&quot;123&quot;&gt;\n
+                    \t\t&lt;Path Data=&quot;M0,19H18V84h29v15H0V19Z&quot; Fill=&quot;White&quot; /&gt;\n
+                    \t\t&lt;Path Data=&quot;M46,80H29V15H0V0H46V80Z&quot; Fill=&quot;White&quot; /&gt;\n
+                    \t&lt;/Canvas&gt;\n
+                    &lt;/Viewbox&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Media/ImagePage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Media/ImagePage.xaml
index 887db0bfb..fb1623592 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Media/ImagePage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Media/ImagePage.xaml
@@ -23,52 +23,49 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;Image Height=&quot;100&quot; Source=&quot;Assets\MyImage.jpg&quot; /&gt;"
-                        HeaderText="Standand Image from a local file.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Image
-                                Height="200"
-                                HorizontalAlignment="Left"
-                                Source="pack://application:,,,/Assets/pexels-johannes-plenio-1103970.jpg" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;Image Height=&quot;100&quot; Source=&quot;Assets\MyImage.jpg&quot; /&gt;"
+                HeaderText="Standand Image from a local file.">
+                <controls:GalleryControlPresenter.Content>
+                    <Image
+                        Height="200"
+                        HorizontalAlignment="Left"
+                        Source="pack://application:,,,/Assets/pexels-johannes-plenio-1103970.jpg" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,32,0,0"
-                        CodeText="&lt;ui:Image CornerRadius=&quot;4&quot; BorderBrush=&quot;#33000000&quot; Height=&quot;100&quot; Source=&quot;Assets\MyImage.jpg&quot; /&gt;"
-                        HeaderText="WPF UI Image with rounded corners from a local file">
-                        <controls:GalleryControlPresenter.Content>
-                            <ui:Image
-                                CornerRadius="4"
-                                BorderBrush="#33000000"
-                                BorderThickness="2"
-                                Height="200"
-                                HorizontalAlignment="Left"
-                                Source="pack://application:,,,/Assets/pexels-johannes-plenio-1103970.jpg" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,32,0,0"
+                CodeText="&lt;ui:Image CornerRadius=&quot;4&quot; BorderBrush=&quot;#33000000&quot; Height=&quot;100&quot; Source=&quot;Assets\MyImage.jpg&quot; /&gt;"
+                HeaderText="WPF UI Image with rounded corners from a local file">
+                <controls:GalleryControlPresenter.Content>
+                    <ui:Image
+                        Height="200"
+                        HorizontalAlignment="Left"
+                        BorderBrush="#33000000"
+                        BorderThickness="2"
+                        CornerRadius="4"
+                        Source="pack://application:,,,/Assets/pexels-johannes-plenio-1103970.jpg" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Media/MediaPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Media/MediaPage.xaml
index 03bba5bc3..65f1261ee 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Media/MediaPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Media/MediaPage.xaml
@@ -18,10 +18,8 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-    <Grid Margin="38">
-        <controls:GalleryNavigationPresenter
-            Margin="0"
-            Padding="0"
-            ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
-    </Grid>
+    <controls:GalleryNavigationPresenter
+        Margin="0"
+        Padding="0"
+        ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Media/WebBrowserPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Media/WebBrowserPage.xaml
index a5654080f..f4cbe42cb 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Media/WebBrowserPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Media/WebBrowserPage.xaml
@@ -23,40 +23,38 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;WebBrowser Source=&quot;https&quot; /&gt;"
-                        HeaderText="Default WebBrowser.">
-                        <controls:GalleryControlPresenter.Content>
-                            <WebBrowser MinHeight="300" Source="https://wpfui.lepo.co" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;WebBrowser Source=&quot;https&quot; /&gt;"
+                HeaderText="Default WebBrowser.">
+                <controls:GalleryControlPresenter.Content>
+                    <WebBrowser MinHeight="300" Source="https://wpfui.lepo.co" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,8,0,0"
-                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                        Text="The WebBrowser control internally instantiates the native WebBrowser ActiveX control. WPF enables security features by applying feature controls to the WebBrowser ActiveX control. The feature controls that are applied differ for XBAPs and stand-alone applications. Some applications should apply additional feature controls to prevent malicious content from running. For more information, see the 'WebBrowser Control and Feature Controls' section in Security (WPF) and WebBrowser Control Overviews and Tutorials."
-                        TextAlignment="Justify"
-                        TextWrapping="WrapWithOverflow" />
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <TextBlock
+                Grid.Row="1"
+                Margin="0,8,0,0"
+                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                Text="The WebBrowser control internally instantiates the native WebBrowser ActiveX control. WPF enables security features by applying feature controls to the WebBrowser ActiveX control. The feature controls that are applied differ for XBAPs and stand-alone applications. Some applications should apply additional feature controls to prevent malicious content from running. For more information, see the 'WebBrowser Control and Feature Controls' section in Security (WPF) and WebBrowser Control Overviews and Tutorials."
+                TextAlignment="Justify"
+                TextWrapping="WrapWithOverflow" />
+        </Grid>
+
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Media/WebViewPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Media/WebViewPage.xaml
index b11743e1b..b9102fece 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Media/WebViewPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Media/WebViewPage.xaml
@@ -24,38 +24,35 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;wv2:WebView2 Source=&quot;https&quot; /&gt;"
-                        HeaderText="WPF UI symbol icon.">
-                        <controls:GalleryControlPresenter.Content>
-                            <wv2:WebView2 MinHeight="300" Source="https://wpfui.lepo.co" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;wv2:WebView2 Source=&quot;https&quot; /&gt;"
+                HeaderText="WPF UI symbol icon.">
+                <controls:GalleryControlPresenter.Content>
+                    <wv2:WebView2 MinHeight="300" Source="https://wpfui.lepo.co" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <ui:Hyperlink
-                        Grid.Row="1"
-                        Margin="0,8,0,0"
-                        Content="Learn more about WebView2 in WPF"
-                        NavigateUri="https://learn.microsoft.com/en-us/microsoft-edge/webview2/get-started/wpf" />
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <ui:Hyperlink
+                Grid.Row="1"
+                Margin="0,8,0,0"
+                Content="Learn more about WebView2 in WPF"
+                NavigateUri="https://learn.microsoft.com/en-us/microsoft-edge/webview2/get-started/wpf" />
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/BreadcrumbBarPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/BreadcrumbBarPage.xaml
index 375354232..07bdb4590 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/BreadcrumbBarPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/BreadcrumbBarPage.xaml
@@ -50,68 +50,63 @@
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            Grid.RowSpan="2"
-            Padding="42">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-                <controls:GalleryControlPresenter
-                    Grid.Row="0"
-                    Margin="0"
-                    CodeText="&lt;ui:BreadcrumbBar ItemsSource=&quot;{Binding ViewModel.Strings, Mode=OneWay}&quot; /&gt;"
-                    HeaderText="A BreadcrumbBar control.">
-                    <controls:GalleryControlPresenter.Content>
-                        <ui:BreadcrumbBar Command="{Binding ViewModel.StringSelectedCommand, Mode=OneWay}" ItemsSource="{Binding ViewModel.Strings, Mode=OneWay}" />
-                    </controls:GalleryControlPresenter.Content>
-                </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ui:BreadcrumbBar ItemsSource=&quot;{Binding ViewModel.Strings, Mode=OneWay}&quot; /&gt;"
+                HeaderText="A BreadcrumbBar control.">
+                <controls:GalleryControlPresenter.Content>
+                    <ui:BreadcrumbBar Command="{Binding ViewModel.StringSelectedCommand, Mode=OneWay}" ItemsSource="{Binding ViewModel.Strings, Mode=OneWay}" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                <controls:GalleryControlPresenter
-                    Grid.Row="1"
-                    Margin="0,32,0,0"
-                    HeaderText="BreadcrumbBar Control with Custom DataTemplate.">
-                    <controls:GalleryControlPresenter.Content>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <ui:BreadcrumbBar
-                                x:Name="BreadcrumbBar2"
-                                Grid.Column="0"
-                                Command="{Binding ViewModel.FolderSelectedCommand, Mode=OneWay}"
-                                ItemsSource="{Binding ViewModel.Folders, Mode=OneWay}">
-                                <ui:BreadcrumbBar.ItemTemplate>
-                                    <DataTemplate DataType="{x:Type models:Folder}">
-                                        <TextBlock Text="{Binding Name, Mode=OneTime}" />
-                                    </DataTemplate>
-                                </ui:BreadcrumbBar.ItemTemplate>
-                            </ui:BreadcrumbBar>
-                            <Button
-                                Grid.Column="1"
-                                Command="{Binding ViewModel.ResetFoldersCommand, Mode=OneWay}"
-                                Content="Reset" />
-                        </Grid>
-                    </controls:GalleryControlPresenter.Content>
-                    <controls:GalleryControlPresenter.CodeText>
-                        &lt;ui:BreadcrumbBar ItemsSource=&quot;{Binding ViewModel.Folders, Mode=OneWay}&quot; &gt;\n
-                        \t&lt;ui:BreadcrumbBar.ItemTemplate&gt;\n
-                        \t\t&lt;ui:DataTemplate DataType=&quot;{x:Type models:Folder}&quot; &gt;\n
-                        \t\t\t&lt;TextBlock Text=&quot;{Binding Name, Mode=OneTime}&quot; /&gt;\n
-                        \t\t&lt;/ui:DataTemplate&gt;\n
-                        \t&lt;/ui:BreadcrumbBar.ItemTemplate&gt;\n
-                        &lt;/ui:BreadcrumbBar&gt;
-                    </controls:GalleryControlPresenter.CodeText>
-                </controls:GalleryControlPresenter>
-            </Grid>
-        </ui:DynamicScrollViewer>
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,32,0,0"
+                HeaderText="BreadcrumbBar Control with Custom DataTemplate.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ui:BreadcrumbBar
+                            x:Name="BreadcrumbBar2"
+                            Grid.Column="0"
+                            Command="{Binding ViewModel.FolderSelectedCommand, Mode=OneWay}"
+                            ItemsSource="{Binding ViewModel.Folders, Mode=OneWay}">
+                            <ui:BreadcrumbBar.ItemTemplate>
+                                <DataTemplate DataType="{x:Type models:Folder}">
+                                    <TextBlock Text="{Binding Name, Mode=OneTime}" />
+                                </DataTemplate>
+                            </ui:BreadcrumbBar.ItemTemplate>
+                        </ui:BreadcrumbBar>
+                        <Button
+                            Grid.Column="1"
+                            Command="{Binding ViewModel.ResetFoldersCommand, Mode=OneWay}"
+                            Content="Reset" />
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;ui:BreadcrumbBar ItemsSource=&quot;{Binding ViewModel.Folders, Mode=OneWay}&quot; &gt;\n
+                    \t&lt;ui:BreadcrumbBar.ItemTemplate&gt;\n
+                    \t\t&lt;ui:DataTemplate DataType=&quot;{x:Type models:Folder}&quot; &gt;\n
+                    \t\t\t&lt;TextBlock Text=&quot;{Binding Name, Mode=OneTime}&quot; /&gt;\n
+                    \t\t&lt;/ui:DataTemplate&gt;\n
+                    \t&lt;/ui:BreadcrumbBar.ItemTemplate&gt;\n
+                    &lt;/ui:BreadcrumbBar&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
         <controls:ControlDocumentationSummary
-            Grid.RowSpan="2"
             Grid.Column="1"
+            Margin="42,0,0,0"
             CsharpUrl="{StaticResource PageCsharpUrl}"
             XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml
index b74e4089c..59d5b8085 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml
@@ -21,68 +21,66 @@
         <system:String x:Key="PageXamlUrl">https://github.com/lepoco/wpfui/blob/development/src/Wpf.Ui/Styles/Controls/Menu.xaml</system:String>
         <system:String x:Key="PageCsharpUrl">https://github.com/dotnet/wpf/blob/main/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Menu.cs</system:String>
     </Page.Resources>
+
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        HeaderText="Standard Menu.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Menu
-                                Grid.Row="1"
-                                Background="Transparent"
-                                FontSize="14">
-                                <ui:MenuItem Header="File" Icon="{ui:SymbolIcon DocumentSplitHint20}">
-                                    <MenuItem Header="New" />
-                                    <MenuItem Header="New window" />
-                                    <MenuItem Header="Open..." />
-                                    <MenuItem Header="Save" />
-                                    <MenuItem Header="Save As..." />
-                                    <Separator />
-                                    <MenuItem Header="Exit" />
-                                </ui:MenuItem>
-                                <ui:MenuItem Header="Edit" Icon="{ui:SymbolIcon DocumentEdit20}">
-                                    <MenuItem Header="Undo" />
-                                    <Separator />
-                                    <MenuItem Header="Cut" />
-                                    <MenuItem Header="Copy" />
-                                    <MenuItem Header="Paste" />
-                                    <MenuItem IsEnabled="False" />
-                                    <Separator />
-                                    <MenuItem Header="Search with browser" />
-                                    <MenuItem Header="Find..." />
-                                    <MenuItem Header="Find next" />
-                                    <Separator />
-                                    <MenuItem Header="Select All" />
-                                </ui:MenuItem>
-                                <Separator />
-                                <ui:MenuItem Icon="{ui:SymbolIcon TextBold20}" />
-                                <ui:MenuItem Icon="{ui:SymbolIcon TextItalic20}" />
-                                <ui:MenuItem Icon="{ui:SymbolIcon TextUnderline20}" />
-                            </Menu>
-                        </controls:GalleryControlPresenter.Content>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;Menu&gt;\n
-                            \t&lt;MenuItem Header=&quot;File&quot; /&gt;\n
-                            \t&lt;MenuItem Header=&quot;Edit&quot; /&gt;\n
-                            \t&lt;ui:MenuItem Header=&quot;Icon&quot; SymbolIcon=&quot;Fluent24&quot; /&gt;\n
-                            \t&lt;ui:MenuItem SymbolIcon=&quot;Fluent24&quot; /&gt;\n
-                            &lt;/Menu&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                HeaderText="Standard Menu.">
+                <controls:GalleryControlPresenter.Content>
+                    <Menu
+                        Grid.Row="1"
+                        Background="Transparent"
+                        FontSize="14">
+                        <ui:MenuItem Header="File" Icon="{ui:SymbolIcon DocumentSplitHint20}">
+                            <MenuItem Header="New" />
+                            <MenuItem Header="New window" />
+                            <MenuItem Header="Open..." />
+                            <MenuItem Header="Save" />
+                            <MenuItem Header="Save As..." />
+                            <Separator />
+                            <MenuItem Header="Exit" />
+                        </ui:MenuItem>
+                        <ui:MenuItem Header="Edit" Icon="{ui:SymbolIcon DocumentEdit20}">
+                            <MenuItem Header="Undo" />
+                            <Separator />
+                            <MenuItem Header="Cut" />
+                            <MenuItem Header="Copy" />
+                            <MenuItem Header="Paste" />
+                            <MenuItem IsEnabled="False" />
+                            <Separator />
+                            <MenuItem Header="Search with browser" />
+                            <MenuItem Header="Find..." />
+                            <MenuItem Header="Find next" />
+                            <Separator />
+                            <MenuItem Header="Select All" />
+                        </ui:MenuItem>
+                        <Separator />
+                        <ui:MenuItem Icon="{ui:SymbolIcon TextBold20}" />
+                        <ui:MenuItem Icon="{ui:SymbolIcon TextItalic20}" />
+                        <ui:MenuItem Icon="{ui:SymbolIcon TextUnderline20}" />
+                    </Menu>
+                </controls:GalleryControlPresenter.Content>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;Menu&gt;\n
+                    \t&lt;MenuItem Header=&quot;File&quot; /&gt;\n
+                    \t&lt;MenuItem Header=&quot;Edit&quot; /&gt;\n
+                    \t&lt;ui:MenuItem Header=&quot;Icon&quot; SymbolIcon=&quot;Fluent24&quot; /&gt;\n
+                    \t&lt;ui:MenuItem SymbolIcon=&quot;Fluent24&quot; /&gt;\n
+                    &lt;/Menu&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/NavigationPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/NavigationPage.xaml
index a21287f00..b6882d08f 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/NavigationPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/NavigationPage.xaml
@@ -18,10 +18,8 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-    <Grid Margin="38">
-        <controls:GalleryNavigationPresenter
-            Margin="0"
-            Padding="0"
-            ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
-    </Grid>
+    <controls:GalleryNavigationPresenter
+        Margin="0"
+        Padding="0"
+        ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/NavigationViewPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/NavigationViewPage.xaml
index 9c150498a..368f13d2e 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/NavigationViewPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/NavigationViewPage.xaml
@@ -24,373 +24,365 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition />
-                </Grid.RowDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
 
-                <Grid Grid.Row="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Margin="0"
-                        Padding="0"
-                        HeaderText="WPF UI NavigationView.">
-                        <ui:NavigationView
-                            MinHeight="300"
-                            Margin="0"
-                            IsBackButtonVisible="Auto"
-                            IsPaneToggleVisible="True"
-                            PaneDisplayMode="Left"
-                            PaneTitle="Pane Title">
-                            <ui:NavigationView.AutoSuggestBox>
-                                <ui:AutoSuggestBox Margin="8,0,8,8" PlaceholderText="Search" />
-                            </ui:NavigationView.AutoSuggestBox>
-                            <ui:NavigationView.MenuItems>
-                                <ui:NavigationViewItem
-                                    Content="Dashboard"
-                                    Icon="{ui:SymbolIcon Home24}"
-                                    TargetPageType="{x:Type samples:SamplePage1}" />
-                                <ui:NavigationViewItem
-                                    Content="Items"
-                                    Icon="{ui:SymbolIcon Library24}"
-                                    TargetPageType="{x:Type samples:SamplePage2}" />
-                            </ui:NavigationView.MenuItems>
-                            <ui:NavigationView.FooterMenuItems>
-                                <ui:NavigationViewItem
-                                    Content="Settings"
-                                    Icon="{ui:SymbolIcon Settings24}"
-                                    TargetPageType="{x:Type samples:SamplePage3}" />
-                            </ui:NavigationView.FooterMenuItems>
-                            <ui:NavigationView.Header>
-                                <Border
-                                    Margin="8"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="24"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="NavigationView Header" />
-                                </Border>
-                            </ui:NavigationView.Header>
-                            <ui:NavigationView.PaneHeader>
-                                <Border
-                                    Margin="0,0,0,8"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="24"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="Pane Header" />
-                                </Border>
-                            </ui:NavigationView.PaneHeader>
-                            <ui:NavigationView.PaneFooter>
-                                <Border
-                                    Margin="0,8,0,0"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="24"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="Pane Footer" />
-                                </Border>
-                            </ui:NavigationView.PaneFooter>
-                        </ui:NavigationView>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;ui:NavigationView IsBackButtonVisible=&quot;Auto&quot; &gt;\n
-                            \t&lt;ui:NavigationView.MenuItems&gt;\n
-                            \t\t&lt;ui:NavigationViewItem Content=&quot;Home&quot; Icon=&quot;Home24&quot; /&gt;\n
-                            \t&lt;/ui:NavigationView.MenuItems&gt;\n
-                            &lt;/ui:NavigationView&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
+        <Grid Grid.Row="0" Margin="0,0,0,42">
+            <controls:GalleryControlPresenter
+                Margin="0"
+                Padding="0"
+                HeaderText="WPF UI NavigationView.">
+                <ui:NavigationView
+                    MinHeight="300"
+                    Margin="0"
+                    IsBackButtonVisible="Auto"
+                    IsPaneToggleVisible="True"
+                    PaneDisplayMode="Left"
+                    PaneTitle="Pane Title">
+                    <ui:NavigationView.AutoSuggestBox>
+                        <ui:AutoSuggestBox Margin="8,0,8,8" PlaceholderText="Search" />
+                    </ui:NavigationView.AutoSuggestBox>
+                    <ui:NavigationView.MenuItems>
+                        <ui:NavigationViewItem
+                            Content="Dashboard"
+                            Icon="{ui:SymbolIcon Home24}"
+                            TargetPageType="{x:Type samples:SamplePage1}" />
+                        <ui:NavigationViewItem
+                            Content="Items"
+                            Icon="{ui:SymbolIcon Library24}"
+                            TargetPageType="{x:Type samples:SamplePage2}" />
+                    </ui:NavigationView.MenuItems>
+                    <ui:NavigationView.FooterMenuItems>
+                        <ui:NavigationViewItem
+                            Content="Settings"
+                            Icon="{ui:SymbolIcon Settings24}"
+                            TargetPageType="{x:Type samples:SamplePage3}" />
+                    </ui:NavigationView.FooterMenuItems>
+                    <ui:NavigationView.Header>
+                        <Border
+                            Margin="8"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="24"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="NavigationView Header" />
+                        </Border>
+                    </ui:NavigationView.Header>
+                    <ui:NavigationView.PaneHeader>
+                        <Border
+                            Margin="0,0,0,8"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="24"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="Pane Header" />
+                        </Border>
+                    </ui:NavigationView.PaneHeader>
+                    <ui:NavigationView.PaneFooter>
+                        <Border
+                            Margin="0,8,0,0"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="24"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="Pane Footer" />
+                        </Border>
+                    </ui:NavigationView.PaneFooter>
+                </ui:NavigationView>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;ui:NavigationView IsBackButtonVisible=&quot;Auto&quot; &gt;\n
+                    \t&lt;ui:NavigationView.MenuItems&gt;\n
+                    \t\t&lt;ui:NavigationViewItem Content=&quot;Home&quot; Icon=&quot;Home24&quot; /&gt;\n
+                    \t&lt;/ui:NavigationView.MenuItems&gt;\n
+                    &lt;/ui:NavigationView&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
 
-                <Grid Grid.Row="1" Margin="42,0,42,42">
-                    <controls:GalleryControlPresenter
-                        Margin="0"
-                        Padding="0"
-                        HeaderText="WPF UI Fluent NavigationView.">
-                        <ui:NavigationView
-                            MinHeight="300"
-                            Margin="0"
-                            IsBackButtonVisible="Collapsed"
-                            IsPaneToggleVisible="False"
-                            PaneDisplayMode="LeftFluent">
-                            <ui:NavigationView.MenuItems>
-                                <ui:NavigationViewItem
-                                    Content="Dashboard"
-                                    Icon="{ui:SymbolIcon Home24}"
-                                    TargetPageType="{x:Type samples:SamplePage1}" />
-                                <ui:NavigationViewItem
-                                    Content="Items"
-                                    Icon="{ui:SymbolIcon Library24}"
-                                    TargetPageType="{x:Type samples:SamplePage2}" />
-                            </ui:NavigationView.MenuItems>
-                            <ui:NavigationView.FooterMenuItems>
-                                <ui:NavigationViewItem
-                                    Content="Settings"
-                                    Icon="{ui:SymbolIcon Settings24}"
-                                    TargetPageType="{x:Type samples:SamplePage3}" />
-                            </ui:NavigationView.FooterMenuItems>
-                            <ui:NavigationView.Header>
-                                <Border
-                                    Margin="8"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="24"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="NavigationView Header" />
-                                </Border>
-                            </ui:NavigationView.Header>
-                            <ui:NavigationView.PaneHeader>
-                                <Border
-                                    Width="60"
-                                    Height="60"
-                                    Margin="0,0,0,8"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="0"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="Pane Header"
-                                        TextAlignment="Center"
-                                        TextWrapping="WrapWithOverflow" />
-                                </Border>
-                            </ui:NavigationView.PaneHeader>
-                            <ui:NavigationView.PaneFooter>
-                                <Border
-                                    Width="60"
-                                    Height="60"
-                                    Margin="0,8,0,0"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="0"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="Pane Footer"
-                                        TextAlignment="Center"
-                                        TextWrapping="WrapWithOverflow" />
-                                </Border>
-                            </ui:NavigationView.PaneFooter>
-                        </ui:NavigationView>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;ui:NavigationView PaneDisplayMode=&quot;LeftFluent&quot; &gt;\n
-                            \t&lt;ui:NavigationView.MenuItems&gt;\n
-                            \t\t&lt;ui:NavigationViewItem Content=&quot;Home&quot; Icon=&quot;Home24&quot; /&gt;\n
-                            \t&lt;/ui:NavigationView.MenuItems&gt;\n
-                            &lt;/ui:NavigationView&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
+        <Grid Grid.Row="1" Margin="0,0,0,42">
+            <controls:GalleryControlPresenter
+                Margin="0"
+                Padding="0"
+                HeaderText="WPF UI Fluent NavigationView.">
+                <ui:NavigationView
+                    MinHeight="300"
+                    Margin="0"
+                    IsBackButtonVisible="Collapsed"
+                    IsPaneToggleVisible="False"
+                    PaneDisplayMode="LeftFluent">
+                    <ui:NavigationView.MenuItems>
+                        <ui:NavigationViewItem
+                            Content="Dashboard"
+                            Icon="{ui:SymbolIcon Home24}"
+                            TargetPageType="{x:Type samples:SamplePage1}" />
+                        <ui:NavigationViewItem
+                            Content="Items"
+                            Icon="{ui:SymbolIcon Library24}"
+                            TargetPageType="{x:Type samples:SamplePage2}" />
+                    </ui:NavigationView.MenuItems>
+                    <ui:NavigationView.FooterMenuItems>
+                        <ui:NavigationViewItem
+                            Content="Settings"
+                            Icon="{ui:SymbolIcon Settings24}"
+                            TargetPageType="{x:Type samples:SamplePage3}" />
+                    </ui:NavigationView.FooterMenuItems>
+                    <ui:NavigationView.Header>
+                        <Border
+                            Margin="8"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="24"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="NavigationView Header" />
+                        </Border>
+                    </ui:NavigationView.Header>
+                    <ui:NavigationView.PaneHeader>
+                        <Border
+                            Width="60"
+                            Height="60"
+                            Margin="0,0,0,8"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="0"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="Pane Header"
+                                TextAlignment="Center"
+                                TextWrapping="WrapWithOverflow" />
+                        </Border>
+                    </ui:NavigationView.PaneHeader>
+                    <ui:NavigationView.PaneFooter>
+                        <Border
+                            Width="60"
+                            Height="60"
+                            Margin="0,8,0,0"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="0"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="Pane Footer"
+                                TextAlignment="Center"
+                                TextWrapping="WrapWithOverflow" />
+                        </Border>
+                    </ui:NavigationView.PaneFooter>
+                </ui:NavigationView>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;ui:NavigationView PaneDisplayMode=&quot;LeftFluent&quot; &gt;\n
+                    \t&lt;ui:NavigationView.MenuItems&gt;\n
+                    \t\t&lt;ui:NavigationViewItem Content=&quot;Home&quot; Icon=&quot;Home24&quot; /&gt;\n
+                    \t&lt;/ui:NavigationView.MenuItems&gt;\n
+                    &lt;/ui:NavigationView&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
 
-                <Grid Grid.Row="2" Margin="42,0,42,42">
-                    <controls:GalleryControlPresenter
-                        Margin="0"
-                        Padding="0"
-                        HeaderText="WPF UI Top NavigationView.">
-                        <ui:NavigationView
-                            MinHeight="300"
+        <Grid Grid.Row="2" Margin="0,0,0,42">
+            <controls:GalleryControlPresenter
+                Margin="0"
+                Padding="0"
+                HeaderText="WPF UI Top NavigationView.">
+                <ui:NavigationView
+                    MinHeight="300"
+                    Margin="0"
+                    IsBackButtonVisible="Auto"
+                    IsPaneToggleVisible="False"
+                    PaneDisplayMode="Top">
+                    <ui:NavigationView.MenuItems>
+                        <ui:NavigationViewItem
+                            Content="Menu Item 1"
+                            Icon="{ui:SymbolIcon Home24}"
+                            TargetPageType="{x:Type samples:SamplePage1}" />
+                        <ui:NavigationViewItem
+                            Content="Menu Item 2"
+                            Icon="{ui:SymbolIcon AppFolder24}"
+                            TargetPageType="{x:Type samples:SamplePage2}" />
+                        <ui:NavigationViewItem
+                            Content="Menu Item 3"
+                            Icon="{ui:SymbolIcon BezierCurveSquare20}"
+                            TargetPageType="{x:Type samples:SamplePage3}" />
+                        <ui:NavigationViewItem
+                            Content="Menu Item 4"
+                            Icon="{ui:SymbolIcon Library24}"
+                            TargetPageType="{x:Type samples:SamplePage1}" />
+                    </ui:NavigationView.MenuItems>
+                    <ui:NavigationView.FooterMenuItems>
+                        <ui:NavigationViewItem Icon="{ui:SymbolIcon Settings24}" TargetPageType="{x:Type samples:SamplePage3}" />
+                    </ui:NavigationView.FooterMenuItems>
+                    <ui:NavigationView.AutoSuggestBox>
+                        <ui:AutoSuggestBox
+                            MinWidth="140"
                             Margin="0"
-                            IsBackButtonVisible="Auto"
-                            IsPaneToggleVisible="False"
-                            PaneDisplayMode="Top">
-                            <ui:NavigationView.MenuItems>
-                                <ui:NavigationViewItem
-                                    Content="Menu Item 1"
-                                    Icon="{ui:SymbolIcon Home24}"
-                                    TargetPageType="{x:Type samples:SamplePage1}" />
-                                <ui:NavigationViewItem
-                                    Content="Menu Item 2"
-                                    Icon="{ui:SymbolIcon AppFolder24}"
-                                    TargetPageType="{x:Type samples:SamplePage2}" />
-                                <ui:NavigationViewItem
-                                    Content="Menu Item 3"
-                                    Icon="{ui:SymbolIcon BezierCurveSquare20}"
-                                    TargetPageType="{x:Type samples:SamplePage3}" />
-                                <ui:NavigationViewItem
-                                    Content="Menu Item 4"
-                                    Icon="{ui:SymbolIcon Library24}"
-                                    TargetPageType="{x:Type samples:SamplePage1}" />
-                            </ui:NavigationView.MenuItems>
-                            <ui:NavigationView.FooterMenuItems>
-                                <ui:NavigationViewItem Icon="{ui:SymbolIcon Settings24}" TargetPageType="{x:Type samples:SamplePage3}" />
-                            </ui:NavigationView.FooterMenuItems>
-                            <ui:NavigationView.AutoSuggestBox>
-                                <ui:AutoSuggestBox
-                                    MinWidth="140"
-                                    Margin="0"
-                                    PlaceholderText="Search" />
-                            </ui:NavigationView.AutoSuggestBox>
-                            <ui:NavigationView.PaneHeader>
-                                <Border
-                                    Margin="8,0"
-                                    VerticalAlignment="Stretch"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="24,0"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="Pane Header" />
-                                </Border>
-                            </ui:NavigationView.PaneHeader>
-                            <ui:NavigationView.PaneFooter>
-                                <Border
-                                    Margin="8,0"
-                                    VerticalAlignment="Stretch"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="24,0"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="Pane Footer" />
-                                </Border>
-                            </ui:NavigationView.PaneFooter>
-                            <ui:NavigationView.Header>
-                                <Border
-                                    Margin="8"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="24"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="NavigationView Header" />
-                                </Border>
-                            </ui:NavigationView.Header>
-                        </ui:NavigationView>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;ui:NavigationView PaneDisplayMode=&quot;Top&quot; &gt;\n
-                            \t&lt;ui:NavigationView.MenuItems&gt;\n
-                            \t\t&lt;ui:NavigationViewItem Content=&quot;Home&quot; Icon=&quot;Home24&quot; /&gt;\n
-                            \t&lt;/ui:NavigationView.MenuItems&gt;\n
-                            &lt;/ui:NavigationView&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-
+                            PlaceholderText="Search" />
+                    </ui:NavigationView.AutoSuggestBox>
+                    <ui:NavigationView.PaneHeader>
+                        <Border
+                            Margin="8,0"
+                            VerticalAlignment="Stretch"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="24,0"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="Pane Header" />
+                        </Border>
+                    </ui:NavigationView.PaneHeader>
+                    <ui:NavigationView.PaneFooter>
+                        <Border
+                            Margin="8,0"
+                            VerticalAlignment="Stretch"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="24,0"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="Pane Footer" />
+                        </Border>
+                    </ui:NavigationView.PaneFooter>
+                    <ui:NavigationView.Header>
+                        <Border
+                            Margin="8"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="24"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="NavigationView Header" />
+                        </Border>
+                    </ui:NavigationView.Header>
+                </ui:NavigationView>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;ui:NavigationView PaneDisplayMode=&quot;Top&quot; &gt;\n
+                    \t&lt;ui:NavigationView.MenuItems&gt;\n
+                    \t\t&lt;ui:NavigationViewItem Content=&quot;Home&quot; Icon=&quot;Home24&quot; /&gt;\n
+                    \t&lt;/ui:NavigationView.MenuItems&gt;\n
+                    &lt;/ui:NavigationView&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
 
-                <Grid Grid.Row="3" Margin="42,0,42,42">
-                    <controls:GalleryControlPresenter
-                        Margin="0"
-                        Padding="0"
-                        HeaderText="WPF UI Bottom NavigationView.">
-                        <ui:NavigationView
-                            MinHeight="300"
+        <Grid Grid.Row="3" Margin="0,0,0,42">
+            <controls:GalleryControlPresenter
+                Margin="0"
+                Padding="0"
+                HeaderText="WPF UI Bottom NavigationView.">
+                <ui:NavigationView
+                    MinHeight="300"
+                    Margin="0"
+                    IsBackButtonVisible="Auto"
+                    IsPaneToggleVisible="False"
+                    PaneDisplayMode="Bottom">
+                    <ui:NavigationView.MenuItems>
+                        <ui:NavigationViewItem
+                            Content="Menu Item 1"
+                            Icon="{ui:SymbolIcon Home24}"
+                            TargetPageType="{x:Type samples:SamplePage1}" />
+                        <ui:NavigationViewItem
+                            Content="Menu Item 2"
+                            Icon="{ui:SymbolIcon AppFolder24}"
+                            TargetPageType="{x:Type samples:SamplePage2}" />
+                        <ui:NavigationViewItem
+                            Content="Menu Item 3"
+                            Icon="{ui:SymbolIcon BezierCurveSquare20}"
+                            TargetPageType="{x:Type samples:SamplePage3}" />
+                        <ui:NavigationViewItem
+                            Content="Menu Item 4"
+                            Icon="{ui:SymbolIcon Library24}"
+                            TargetPageType="{x:Type samples:SamplePage1}" />
+                    </ui:NavigationView.MenuItems>
+                    <ui:NavigationView.FooterMenuItems>
+                        <ui:NavigationViewItem Icon="{ui:SymbolIcon Settings24}" TargetPageType="{x:Type samples:SamplePage3}" />
+                    </ui:NavigationView.FooterMenuItems>
+                    <ui:NavigationView.AutoSuggestBox>
+                        <ui:AutoSuggestBox
+                            MinWidth="140"
                             Margin="0"
-                            IsBackButtonVisible="Auto"
-                            IsPaneToggleVisible="False"
-                            PaneDisplayMode="Bottom">
-                            <ui:NavigationView.MenuItems>
-                                <ui:NavigationViewItem
-                                    Content="Menu Item 1"
-                                    Icon="{ui:SymbolIcon Home24}"
-                                    TargetPageType="{x:Type samples:SamplePage1}" />
-                                <ui:NavigationViewItem
-                                    Content="Menu Item 2"
-                                    Icon="{ui:SymbolIcon AppFolder24}"
-                                    TargetPageType="{x:Type samples:SamplePage2}" />
-                                <ui:NavigationViewItem
-                                    Content="Menu Item 3"
-                                    Icon="{ui:SymbolIcon BezierCurveSquare20}"
-                                    TargetPageType="{x:Type samples:SamplePage3}" />
-                                <ui:NavigationViewItem
-                                    Content="Menu Item 4"
-                                    Icon="{ui:SymbolIcon Library24}"
-                                    TargetPageType="{x:Type samples:SamplePage1}" />
-                            </ui:NavigationView.MenuItems>
-                            <ui:NavigationView.FooterMenuItems>
-                                <ui:NavigationViewItem Icon="{ui:SymbolIcon Settings24}" TargetPageType="{x:Type samples:SamplePage3}" />
-                            </ui:NavigationView.FooterMenuItems>
-                            <ui:NavigationView.AutoSuggestBox>
-                                <ui:AutoSuggestBox
-                                    MinWidth="140"
-                                    Margin="0"
-                                    PlaceholderText="Search" />
-                            </ui:NavigationView.AutoSuggestBox>
-                            <ui:NavigationView.PaneHeader>
-                                <Border
-                                    Margin="8,0"
-                                    VerticalAlignment="Stretch"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="24,0"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="Pane Header" />
-                                </Border>
-                            </ui:NavigationView.PaneHeader>
-                            <ui:NavigationView.PaneFooter>
-                                <Border
-                                    Margin="8,0"
-                                    VerticalAlignment="Stretch"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="24,0"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="Pane Footer" />
-                                </Border>
-                            </ui:NavigationView.PaneFooter>
-                            <ui:NavigationView.Header>
-                                <Border
-                                    Margin="8"
-                                    Background="{DynamicResource StripedBackgroundBrush}"
-                                    CornerRadius="4">
-                                    <TextBlock
-                                        Margin="24"
-                                        VerticalAlignment="Center"
-                                        FontWeight="Medium"
-                                        Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="NavigationView Header" />
-                                </Border>
-                            </ui:NavigationView.Header>
-                        </ui:NavigationView>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;ui:NavigationView PaneDisplayMode=&quot;Bottom&quot; &gt;\n
-                            \t&lt;ui:NavigationView.MenuItems&gt;\n
-                            \t\t&lt;ui:NavigationViewItem Content=&quot;Home&quot; Icon=&quot;Home24&quot; /&gt;\n
-                            \t&lt;/ui:NavigationView.MenuItems&gt;\n
-                            &lt;/ui:NavigationView&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
+                            PlaceholderText="Search" />
+                    </ui:NavigationView.AutoSuggestBox>
+                    <ui:NavigationView.PaneHeader>
+                        <Border
+                            Margin="8,0"
+                            VerticalAlignment="Stretch"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="24,0"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="Pane Header" />
+                        </Border>
+                    </ui:NavigationView.PaneHeader>
+                    <ui:NavigationView.PaneFooter>
+                        <Border
+                            Margin="8,0"
+                            VerticalAlignment="Stretch"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="24,0"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="Pane Footer" />
+                        </Border>
+                    </ui:NavigationView.PaneFooter>
+                    <ui:NavigationView.Header>
+                        <Border
+                            Margin="8"
+                            Background="{DynamicResource StripedBackgroundBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                Margin="24"
+                                VerticalAlignment="Center"
+                                FontWeight="Medium"
+                                Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                Text="NavigationView Header" />
+                        </Border>
+                    </ui:NavigationView.Header>
+                </ui:NavigationView>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;ui:NavigationView PaneDisplayMode=&quot;Bottom&quot; &gt;\n
+                    \t&lt;ui:NavigationView.MenuItems&gt;\n
+                    \t\t&lt;ui:NavigationViewItem Content=&quot;Home&quot; Icon=&quot;Home24&quot; /&gt;\n
+                    \t&lt;/ui:NavigationView.MenuItems&gt;\n
+                    &lt;/ui:NavigationView&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
 
-                <controls:ControlDocumentationSummary
-                    Grid.Row="4"
-                    Margin="42,24,42,42"
-                    HorizontalAlignment="Left"
-                    CsharpUrl="{StaticResource PageCsharpUrl}"
-                    XamlUrl="{StaticResource PageXamlUrl}" />
-            </Grid>
-        </ui:DynamicScrollViewer>
+        <controls:ControlDocumentationSummary
+            Grid.Row="4"
+            Margin="42,24,42,42"
+            HorizontalAlignment="Left"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/TabControlPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/TabControlPage.xaml
index 84237e828..c1331f148 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/TabControlPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/TabControlPage.xaml
@@ -23,52 +23,50 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;TabControl /&gt;"
-                        HeaderText="Standard TabControl.">
-                        <controls:GalleryControlPresenter.Content>
-                            <TabControl Margin="0,8,0,0">
-                                <TabItem>
-                                    <TabItem.Header>
-                                        <StackPanel Orientation="Horizontal">
-                                            <ui:SymbolIcon Margin="0,0,6,0" Symbol="XboxConsole24" />
-                                            <TextBlock Text="Hello" />
-                                        </StackPanel>
-                                    </TabItem.Header>
-                                    <Grid>
-                                        <TextBlock Margin="12" Text="World" />
-                                    </Grid>
-                                </TabItem>
-                                <TabItem IsSelected="True">
-                                    <TabItem.Header>
-                                        <StackPanel Orientation="Horizontal">
-                                            <ui:SymbolIcon Margin="0,0,6,0" Symbol="StoreMicrosoft16" />
-                                            <TextBlock Text="The cake" />
-                                        </StackPanel>
-                                    </TabItem.Header>
-                                    <Grid>
-                                        <TextBlock Margin="12" Text="Is a lie." />
-                                    </Grid>
-                                </TabItem>
-                            </TabControl>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;TabControl /&gt;"
+                HeaderText="Standard TabControl.">
+                <controls:GalleryControlPresenter.Content>
+                    <TabControl Margin="0,8,0,0">
+                        <TabItem>
+                            <TabItem.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <ui:SymbolIcon Margin="0,0,6,0" Symbol="XboxConsole24" />
+                                    <TextBlock Text="Hello" />
+                                </StackPanel>
+                            </TabItem.Header>
+                            <Grid>
+                                <TextBlock Margin="12" Text="World" />
+                            </Grid>
+                        </TabItem>
+                        <TabItem IsSelected="True">
+                            <TabItem.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <ui:SymbolIcon Margin="0,0,6,0" Symbol="StoreMicrosoft16" />
+                                    <TextBlock Text="The cake" />
+                                </StackPanel>
+                            </TabItem.Header>
+                            <Grid>
+                                <TextBlock Margin="12" Text="Is a lie." />
+                            </Grid>
+                        </TabItem>
+                    </TabControl>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/SettingsPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/SettingsPage.xaml
index fa5215c66..eeb12d7cf 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/SettingsPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/SettingsPage.xaml
@@ -20,7 +20,7 @@
         <helpers:EnumToBooleanConverter x:Key="EnumToBooleanConverter" />
     </Page.Resources>
 
-    <StackPanel Margin="42">
+    <StackPanel>
         <TextBlock
             FontSize="20"
             FontWeight="Medium"
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/InfoBarPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/InfoBarPage.xaml
index 7e5cabba0..41c0cedcc 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/InfoBarPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/InfoBarPage.xaml
@@ -23,101 +23,98 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <StackPanel Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Margin="0,0,0,42"
-                        CodeText="&lt;ui:InfoBar Title=&quot;Title&quot; Message=&quot;Essential message.&quot; /&gt;"
-                        HeaderText="A closable InfoBar.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <ui:InfoBar
-                                    Title="Title"
-                                    Grid.Column="0"
-                                    IsOpen="{Binding ViewModel.IsShortInfoBarOpened, Mode=TwoWay}"
-                                    Message="Essential app message."
-                                    Severity="{Binding ViewModel.ShortInfoBarSeverity, Mode=OneWay}" />
-                                <Grid Grid.Column="1" Margin="12,0,0,0">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <CheckBox
-                                        Grid.Row="0"
-                                        MinWidth="0"
-                                        Content="Is open"
-                                        IsChecked="{Binding ViewModel.IsShortInfoBarOpened, Mode=TwoWay}" />
-                                    <ComboBox
-                                        Grid.Row="1"
-                                        MinWidth="140"
-                                        Margin="0,8,0,0"
-                                        SelectedIndex="{Binding ViewModel.ShortInfoBarSeverityComboBoxSelectedIndex, Mode=TwoWay}">
-                                        <ComboBoxItem Content="Informational" />
-                                        <ComboBoxItem Content="Success" />
-                                        <ComboBoxItem Content="Warning" />
-                                        <ComboBoxItem Content="Error" />
-                                    </ComboBox>
-                                </Grid>
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+        <StackPanel Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Margin="0,0,0,42"
+                CodeText="&lt;ui:InfoBar Title=&quot;Title&quot; Message=&quot;Essential message.&quot; /&gt;"
+                HeaderText="A closable InfoBar.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ui:InfoBar
+                            Title="Title"
+                            Grid.Column="0"
+                            IsOpen="{Binding ViewModel.IsShortInfoBarOpened, Mode=TwoWay}"
+                            Message="Essential app message."
+                            Severity="{Binding ViewModel.ShortInfoBarSeverity, Mode=OneWay}" />
+                        <Grid Grid.Column="1" Margin="12,0,0,0">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <CheckBox
+                                Grid.Row="0"
+                                MinWidth="0"
+                                Content="Is open"
+                                IsChecked="{Binding ViewModel.IsShortInfoBarOpened, Mode=TwoWay}" />
+                            <ComboBox
+                                Grid.Row="1"
+                                MinWidth="140"
+                                Margin="0,8,0,0"
+                                SelectedIndex="{Binding ViewModel.ShortInfoBarSeverityComboBoxSelectedIndex, Mode=TwoWay}">
+                                <ComboBoxItem Content="Informational" />
+                                <ComboBoxItem Content="Success" />
+                                <ComboBoxItem Content="Warning" />
+                                <ComboBoxItem Content="Error" />
+                            </ComboBox>
+                        </Grid>
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Margin="0"
-                        CodeText="&lt;ui:InfoBar Title=&quot;Title&quot; Message=&quot;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.&quot; /&gt;"
-                        HeaderText="A closable InfoBar with a long message.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <ui:InfoBar
-                                    Title="Title"
-                                    Grid.Column="0"
-                                    IsOpen="{Binding ViewModel.IsLongInfoBarOpened, Mode=TwoWay}"
-                                    Message="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
-                                    Severity="{Binding ViewModel.LongInfoBarSeverity, Mode=OneWay}" />
-                                <Grid Grid.Column="1" Margin="12,0,0,0">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <CheckBox
-                                        Grid.Row="0"
-                                        MinWidth="0"
-                                        Content="Is open"
-                                        IsChecked="{Binding ViewModel.IsLongInfoBarOpened, Mode=TwoWay}" />
-                                    <ComboBox
-                                        Grid.Row="1"
-                                        MinWidth="140"
-                                        Margin="0,8,0,0"
-                                        SelectedIndex="{Binding ViewModel.LongInfoBarSeverityComboBoxSelectedIndex, Mode=TwoWay}">
-                                        <ComboBoxItem Content="Informational" />
-                                        <ComboBoxItem Content="Success" />
-                                        <ComboBoxItem Content="Warning" />
-                                        <ComboBoxItem Content="Error" />
-                                    </ComboBox>
-                                </Grid>
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </StackPanel>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:GalleryControlPresenter
+                Margin="0"
+                CodeText="&lt;ui:InfoBar Title=&quot;Title&quot; Message=&quot;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.&quot; /&gt;"
+                HeaderText="A closable InfoBar with a long message.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ui:InfoBar
+                            Title="Title"
+                            Grid.Column="0"
+                            IsOpen="{Binding ViewModel.IsLongInfoBarOpened, Mode=TwoWay}"
+                            Message="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
+                            Severity="{Binding ViewModel.LongInfoBarSeverity, Mode=OneWay}" />
+                        <Grid Grid.Column="1" Margin="12,0,0,0">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <CheckBox
+                                Grid.Row="0"
+                                MinWidth="0"
+                                Content="Is open"
+                                IsChecked="{Binding ViewModel.IsLongInfoBarOpened, Mode=TwoWay}" />
+                            <ComboBox
+                                Grid.Row="1"
+                                MinWidth="140"
+                                Margin="0,8,0,0"
+                                SelectedIndex="{Binding ViewModel.LongInfoBarSeverityComboBoxSelectedIndex, Mode=TwoWay}">
+                                <ComboBoxItem Content="Informational" />
+                                <ComboBoxItem Content="Success" />
+                                <ComboBoxItem Content="Warning" />
+                                <ComboBoxItem Content="Error" />
+                            </ComboBox>
+                        </Grid>
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </StackPanel>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ProgressBarPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ProgressBarPage.xaml
index 84b01e966..7dbd7c147 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ProgressBarPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ProgressBarPage.xaml
@@ -21,30 +21,27 @@
         <system:String x:Key="PageXamlUrl">https://github.com/lepoco/wpfui/blob/development/src/Wpf.Ui/Styles/Controls/ProgressBar.xaml</system:String>
         <system:String x:Key="PageCsharpUrl">https://github.com/dotnet/wpf/blob/main/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ProgressBar.cs</system:String>
     </Page.Resources>
+
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ProgressBar IsIndeterminate=&quot;True&quot; /&gt;"
-                        HeaderText="An indeterminate progress bar.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ProgressBar IsIndeterminate="True" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ProgressBar IsIndeterminate=&quot;True&quot; /&gt;"
+                HeaderText="An indeterminate progress bar.">
+                <controls:GalleryControlPresenter.Content>
+                    <ProgressBar IsIndeterminate="True" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ProgressRingPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ProgressRingPage.xaml
index e9311254f..5e3c70a42 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ProgressRingPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ProgressRingPage.xaml
@@ -23,29 +23,27 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ui:ProgressRing IsIndeterminate=&quot;True&quot; /&gt;"
-                        HeaderText="An indeterminate WPF UI progress ring.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ui:ProgressRing IsIndeterminate="True" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ui:ProgressRing IsIndeterminate=&quot;True&quot; /&gt;"
+                HeaderText="An indeterminate WPF UI progress ring.">
+                <controls:GalleryControlPresenter.Content>
+                    <ui:ProgressRing IsIndeterminate="True" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/StatusAndInfoPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/StatusAndInfoPage.xaml
index ed5aaa5ed..e69eca355 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/StatusAndInfoPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/StatusAndInfoPage.xaml
@@ -18,10 +18,8 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-    <Grid Margin="38">
-        <controls:GalleryNavigationPresenter
-            Margin="0"
-            Padding="0"
-            ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
-    </Grid>
+    <controls:GalleryNavigationPresenter
+        Margin="0"
+        Padding="0"
+        ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ToolTipPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ToolTipPage.xaml
index c70530aea..9abc87e1c 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ToolTipPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/ToolTipPage.xaml
@@ -22,33 +22,31 @@
         <system:String x:Key="PageCsharpUrl">https://github.com/dotnet/wpf/blob/main/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ToolTip.cs</system:String>
     </Page.Resources>
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;Button ToolTipService.ToolTip=&quot;Simple ToolTip&quot; /&gt;"
-                        HeaderText="A button with a simple ToolTip.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Button
-                                Content="Button with a simple ToolTip."
-                                ToolTipService.InitialShowDelay="100"
-                                ToolTipService.Placement="MousePoint"
-                                ToolTipService.ToolTip="Simple ToolTip" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;Button ToolTipService.ToolTip=&quot;Simple ToolTip&quot; /&gt;"
+                HeaderText="A button with a simple ToolTip.">
+                <controls:GalleryControlPresenter.Content>
+                    <Button
+                        Content="Button with a simple ToolTip."
+                        ToolTipService.InitialShowDelay="100"
+                        ToolTipService.Placement="MousePoint"
+                        ToolTipService.ToolTip="Simple ToolTip" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
index 0ba712568..bfc06acb1 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/AutoSuggestBoxPage.xaml
@@ -24,40 +24,35 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ui:AutoSuggestBox PlaceholderText=&quot;Search...&quot; /&gt;"
+                HeaderText="WPF UI AutoSuggestBox.">
+                <controls:GalleryControlPresenter.Content>
+                    <ui:AutoSuggestBox
+                        Icon="{ui:SymbolIcon Search24}"
+                        OriginalItemsSource="{Binding ViewModel.AutoSuggestBoxSuggestions, Mode=OneWay}"
+                        PlaceholderText="Search..." />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ui:AutoSuggestBox PlaceholderText=&quot;Search...&quot; /&gt;"
-                        HeaderText="WPF UI AutoSuggestBox.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ui:AutoSuggestBox
-                                Icon="{ui:SymbolIcon Search24}"
-                                OriginalItemsSource="{Binding ViewModel.AutoSuggestBoxSuggestions, Mode=OneWay}"
-                                PlaceholderText="Search..." />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-
-
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/LabelPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/LabelPage.xaml
index 5e2cee182..5e350fcac 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/LabelPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/LabelPage.xaml
@@ -23,51 +23,48 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;Label Content=&quot;I am a Label.&quot; /&gt;"
-                        HeaderText="A simple Label.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Label Content="I am a Label." />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;Label Content=&quot;I am a Label.&quot; /&gt;"
+                HeaderText="A simple Label.">
+                <controls:GalleryControlPresenter.Content>
+                    <Label Content="I am a Label." />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,36,0,0"
-                        CodeText="&lt;Label Target=&quot;{Binding ElementName=MyTextBox}&quot; /&gt;"
-                        HeaderText="A Label for TextBox.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <Label Grid.Row="0" Content="I am a Label of the TextBox below." />
-                                <!--  Target="{Binding ElementName=TextBoxForLabel}"  -->
-                                <TextBox Grid.Row="1" />
-                            </Grid>
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,36,0,0"
+                CodeText="&lt;Label Target=&quot;{Binding ElementName=MyTextBox}&quot; /&gt;"
+                HeaderText="A Label for TextBox.">
+                <controls:GalleryControlPresenter.Content>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Label Grid.Row="0" Content="I am a Label of the TextBox below." />
+                        <!--  Target="{Binding ElementName=TextBoxForLabel}"  -->
+                        <TextBox Grid.Row="1" />
+                    </Grid>
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/NumberBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/NumberBoxPage.xaml
index 5906b9b83..40988c923 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/NumberBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/NumberBoxPage.xaml
@@ -23,69 +23,66 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;ui:NumberBox PlaceholderText=&quot;Enter your age&quot; /&gt;"
-                        HeaderText="WPF UI NumberBox.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ui:NumberBox PlaceholderText="Enter your age" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;ui:NumberBox PlaceholderText=&quot;Enter your age&quot; /&gt;"
+                HeaderText="WPF UI NumberBox.">
+                <controls:GalleryControlPresenter.Content>
+                    <ui:NumberBox PlaceholderText="Enter your age" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,36,0,0"
-                        CodeText="&lt;ui:NumberBox Icon=&quot;NumberSymbolSquare24&quot; PlaceholderText=&quot;Enter your age&quot; /&gt;"
-                        HeaderText="WPF UI NumberBox with icon.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ui:NumberBox
-                                Icon="{ui:SymbolIcon NumberSymbolSquare24}"
-                                LargeChange="2.25"
-                                Maximum="10"
-                                Minimum="-10"
-                                PlaceholderText="Enter your age"
-                                SmallChange="0.25"
-                                SpinButtonPlacementMode="Hidden"
-                                Value="1.50" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,36,0,0"
+                CodeText="&lt;ui:NumberBox Icon=&quot;NumberSymbolSquare24&quot; PlaceholderText=&quot;Enter your age&quot; /&gt;"
+                HeaderText="WPF UI NumberBox with icon.">
+                <controls:GalleryControlPresenter.Content>
+                    <ui:NumberBox
+                        Icon="{ui:SymbolIcon NumberSymbolSquare24}"
+                        LargeChange="2.25"
+                        Maximum="10"
+                        Minimum="-10"
+                        PlaceholderText="Enter your age"
+                        SmallChange="0.25"
+                        SpinButtonPlacementMode="Hidden"
+                        Value="1.50" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="2"
-                        Margin="0,36,0,0"
-                        CodeText="&lt;ui:NumberBox DecimalPlaces=&quot;0&quot; /&gt;"
-                        HeaderText="WPF UI NumberBox without decimal places.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ui:NumberBox
-                                Icon="{ui:SymbolIcon NumberSymbolSquare24}"
-                                MaxDecimalPlaces="0"
-                                Maximum="100"
-                                Minimum="0"
-                                PlaceholderText="Enter your age"
-                                SmallChange="1"
-                                Value="12" />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:GalleryControlPresenter
+                Grid.Row="2"
+                Margin="0,36,0,0"
+                CodeText="&lt;ui:NumberBox DecimalPlaces=&quot;0&quot; /&gt;"
+                HeaderText="WPF UI NumberBox without decimal places.">
+                <controls:GalleryControlPresenter.Content>
+                    <ui:NumberBox
+                        Icon="{ui:SymbolIcon NumberSymbolSquare24}"
+                        MaxDecimalPlaces="0"
+                        Maximum="100"
+                        Minimum="0"
+                        PlaceholderText="Enter your age"
+                        SmallChange="1"
+                        Value="12" />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/PasswordBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/PasswordBoxPage.xaml
index 6ed25a420..9aefe798f 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/PasswordBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/PasswordBoxPage.xaml
@@ -24,47 +24,44 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;PasswordBox /&gt;"
-                        HeaderText="A simple PasswordBox.">
-                        <controls:GalleryControlPresenter.Content>
-                            <PasswordBox />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;PasswordBox /&gt;"
+                HeaderText="A simple PasswordBox.">
+                <controls:GalleryControlPresenter.Content>
+                    <PasswordBox />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,36,0,0"
-                        CodeText="&lt;ui:PasswordBox PlaceholderText=&quot;Password...&quot; Icon=&quot;Password24&quot; /&gt;"
-                        HeaderText="WPF UI PasswordBox.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ui:PasswordBox
-                                Icon="{ui:SymbolIcon Password24}"
-                                PlaceholderEnabled="True"
-                                PlaceholderText="Password..." />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,36,0,0"
+                CodeText="&lt;ui:PasswordBox PlaceholderText=&quot;Password...&quot; Icon=&quot;Password24&quot; /&gt;"
+                HeaderText="WPF UI PasswordBox.">
+                <controls:GalleryControlPresenter.Content>
+                    <ui:PasswordBox
+                        Icon="{ui:SymbolIcon Password24}"
+                        PlaceholderEnabled="True"
+                        PlaceholderText="Password..." />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/RichTextBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/RichTextBoxPage.xaml
index be790a015..67a7434f2 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/RichTextBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/RichTextBoxPage.xaml
@@ -23,29 +23,26 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;RichTextBox /&gt;"
-                        HeaderText="A simple RichTextBox">
-                        <controls:GalleryControlPresenter.Content>
-                            <RichTextBox />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+        <Grid Grid.Column="0">
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;RichTextBox /&gt;"
+                HeaderText="A simple RichTextBox">
+                <controls:GalleryControlPresenter.Content>
+                    <RichTextBox />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/TextBlockPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/TextBlockPage.xaml
index 78954f03a..7458c5441 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/TextBlockPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/TextBlockPage.xaml
@@ -23,72 +23,73 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;TextBlock Text=&quot;I am a text block.&quot; /&gt;"
-                        HeaderText="A simple TextBlock.">
-                        <controls:GalleryControlPresenter.Content>
-                            <TextBlock Text="I am a text block." />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;TextBlock Text=&quot;I am a text block.&quot; /&gt;"
+                HeaderText="A simple TextBlock.">
+                <controls:GalleryControlPresenter.Content>
+                    <TextBlock Text="I am a text block." />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,36,0,0"
-                        CodeText="&lt;TextBlock FontFamily=&quot;Comic Sans MS&quot; FontStyle=&quot;Italic&quot; /&gt;"
-                        HeaderText="A TextBlock with style applied.">
-                        <controls:GalleryControlPresenter.Content>
-                            <TextBlock
-                                FontFamily="Comic Sans MS"
-                                FontStyle="Italic"
-                                Text="I am a styled TextBlock." />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,36,0,0"
+                CodeText="&lt;TextBlock FontFamily=&quot;Comic Sans MS&quot; FontStyle=&quot;Italic&quot; /&gt;"
+                HeaderText="A TextBlock with style applied.">
+                <controls:GalleryControlPresenter.Content>
+                    <TextBlock
+                        FontFamily="Comic Sans MS"
+                        FontStyle="Italic"
+                        Text="I am a styled TextBlock." />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="2"
-                        Margin="0,36,0,0"
-                        HeaderText="A TextBlock with inline text elements.">
-                        <controls:GalleryControlPresenter.Content>
-                            <TextBlock>
-                                <Run FontFamily="Times New Roman" Foreground="DarkGray">
-                                    Text in a TextBlock doesn't have to be a simple string.
-                                </Run>
-                                <LineBreak />
-                                <Span>
-                                    Text can be <Bold>bold</Bold>, <Italic>italic</Italic>, or <Underline>underlined</Underline>.</Span>
-                            </TextBlock>
-                        </controls:GalleryControlPresenter.Content>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;TextBlock&gt;\n
-                            \t&lt;Run FontFamily=&quot;Times New Roman&quot; Foreground=&quot;DarkGray&quot;&gt;\n
-                            \t\t\'Text in a TextBlock doesnt have to be a simple string.'\n
-                            \t&lt;/Run&gt;\n
-                            \t&lt;LineBreak /&gt;\n
-                            &lt;/TextBlock&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:GalleryControlPresenter
+                Grid.Row="2"
+                Margin="0,36,0,0"
+                HeaderText="A TextBlock with inline text elements.">
+                <controls:GalleryControlPresenter.Content>
+                    <TextBlock FontSize="14">
+                        <Run FontFamily="Times New Roman" Foreground="DarkGray">
+                            Text in a TextBlock doesn't have to be a simple string.
+                        </Run>
+                        <LineBreak />
+                        <Span>
+                            Text can be<Bold>bold</Bold>
+                            ,<Italic>italic</Italic>
+                            , or<Underline>underlined</Underline>
+                            .</Span>
+                    </TextBlock>
+                </controls:GalleryControlPresenter.Content>
+                <controls:GalleryControlPresenter.CodeText>
+                    &lt;TextBlock&gt;\n
+                    \t&lt;Run FontFamily=&quot;Times New Roman&quot; Foreground=&quot;DarkGray&quot;&gt;\n
+                    \t\t\'Text in a TextBlock doesnt have to be a simple string.'\n
+                    \t&lt;/Run&gt;\n
+                    \t&lt;LineBreak /&gt;\n
+                    &lt;/TextBlock&gt;
+                </controls:GalleryControlPresenter.CodeText>
+            </controls:GalleryControlPresenter>
+        </Grid>
+
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/TextBoxPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/TextBoxPage.xaml
index abcc58ddb..cae15e527 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/TextBoxPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/TextBoxPage.xaml
@@ -23,43 +23,41 @@
     </Page.Resources>
 
     <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="280" />
+        </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        CodeText="&lt;TextBox /&gt;"
-                        HeaderText="A simple TextBox.">
-                        <controls:GalleryControlPresenter.Content>
-                            <TextBox />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <controls:GalleryControlPresenter
+                Grid.Row="0"
+                Margin="0"
+                CodeText="&lt;TextBox /&gt;"
+                HeaderText="A simple TextBox.">
+                <controls:GalleryControlPresenter.Content>
+                    <TextBox />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
 
-                    <controls:GalleryControlPresenter
-                        Grid.Row="1"
-                        Margin="0,36,0,0"
-                        CodeText="&lt;ui:TextBox PlaceholderText=&quot;Type something...&quot; /&gt;"
-                        HeaderText="A WPF UI TextBox.">
-                        <controls:GalleryControlPresenter.Content>
-                            <ui:TextBox PlaceholderText="Type something..." />
-                        </controls:GalleryControlPresenter.Content>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
+            <controls:GalleryControlPresenter
+                Grid.Row="1"
+                Margin="0,36,0,0"
+                CodeText="&lt;ui:TextBox PlaceholderText=&quot;Type something...&quot; /&gt;"
+                HeaderText="A WPF UI TextBox.">
+                <controls:GalleryControlPresenter.Content>
+                    <ui:TextBox PlaceholderText="Type something..." />
+                </controls:GalleryControlPresenter.Content>
+            </controls:GalleryControlPresenter>
+        </Grid>
+
+        <controls:ControlDocumentationSummary
+            Grid.Column="1"
+            Margin="42,0,0,0"
+            CsharpUrl="{StaticResource PageCsharpUrl}"
+            XamlUrl="{StaticResource PageXamlUrl}" />
     </Grid>
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Text/TextPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Text/TextPage.xaml
index bc1fc41d5..a50631789 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Text/TextPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Text/TextPage.xaml
@@ -16,10 +16,8 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-    <Grid Margin="38">
-        <controls:GalleryNavigationPresenter
-            Margin="0"
-            Padding="0"
-            ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
-    </Grid>
+    <controls:GalleryNavigationPresenter
+        Margin="0"
+        Padding="0"
+        ItemsSource="{Binding ViewModel.NavigationCards, Mode=OneWay}" />
 </Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Windows/WindowsPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Windows/WindowsPage.xaml
index 425a5985c..848730277 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Windows/WindowsPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Windows/WindowsPage.xaml
@@ -17,7 +17,7 @@
     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     mc:Ignorable="d">
 
-    <Grid Margin="38">
+    <Grid>
         <ItemsControl ItemsSource="{Binding ViewModel.WindowCards, Mode=OneWay}">
             <ItemsControl.ItemTemplate>
                 <DataTemplate DataType="{x:Type models:WindowCard}">
@@ -30,15 +30,13 @@
                         Icon="{Binding Icon, Mode=OneTime}"
                         IsChevronVisible="True">
                         <StackPanel>
-                            <TextBlock
+                            <ui:TextBlock
                                 Margin="0"
-                                FontSize="13"
                                 FontWeight="Medium"
                                 Text="{Binding Name, Mode=OneTime}"
                                 TextWrapping="WrapWithOverflow" />
-                            <TextBlock
-                                FontSize="10"
-                                Foreground="{DynamicResource TextFillColorTertiaryBrush}"
+                            <ui:TextBlock
+                                Appearance="Tertiary"
                                 Text="{Binding Description, Mode=OneTime}"
                                 TextWrapping="WrapWithOverflow" />
                         </StackPanel>
diff --git a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
index 2a16d5ba0..51493b0ff 100644
--- a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
@@ -42,6 +42,8 @@
 
         <ui:NavigationView
             x:Name="NavigationView"
+            Padding="42,10"
+            BreadcrumbBar="{Binding ElementName=BreadcrumbBar}"
             EnableDebugMessages="True"
             FooterMenuItemsSource="{Binding ViewModel.FooterMenuItems, Mode=OneWay}"
             IsBackButtonVisible="Visible"
@@ -54,7 +56,9 @@
             SelectionChanged="OnNavigationSelectionChanged"
             TitleBar="{Binding ElementName=TitleBar, Mode=OneWay}">
             <ui:NavigationView.Header>
-                <ui:BreadcrumbBar Margin="42,32,0,0" />
+                <StackPanel Margin="42,32,0,0">
+                    <ui:BreadcrumbBar x:Name="BreadcrumbBar" />
+                </StackPanel>
             </ui:NavigationView.Header>
             <ui:NavigationView.AutoSuggestBox>
                 <ui:AutoSuggestBox x:Name="AutoSuggestBox" PlaceholderText="Search">
diff --git a/src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj b/src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj
index 3df9430ff..db2259031 100644
--- a/src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj
+++ b/src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj
@@ -12,17 +12,6 @@
     <RootNamespace>Wpf.Ui.Gallery</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="Assets\geo_icons.png" />
-    <None Remove="Assets\octonaut.jpg" />
-    <None Remove="Assets\pexels-johannes-plenio-1103970.jpg" />
-    <None Remove="Assets\WinUiGallery\Button.png" />
-    <None Remove="Assets\WinUiGallery\Flyout.png" />
-    <None Remove="Assets\WinUiGallery\MenuBar.png" />
-    <None Remove="Assets\wpfui.png" />
-    <None Remove="Assets\wpfui_full.png" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="wpfui.ico" />
   </ItemGroup>
@@ -47,6 +36,7 @@
     <Resource Include="Assets\WinUiGallery\MenuBar.png" />
     <Resource Include="Assets\wpfui.png" />
     <Resource Include="Assets\wpfui_full.png" />
+    <Resource Include="CodeSamples\Typography\TypographySample_xaml.txt" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Wpf.Ui/Common/FontTypography.cs b/src/Wpf.Ui/Common/FontTypography.cs
new file mode 100644
index 000000000..d9d1f797a
--- /dev/null
+++ b/src/Wpf.Ui/Common/FontTypography.cs
@@ -0,0 +1,15 @@
+namespace Wpf.Ui.Common;
+
+/// <summary>
+/// TODO
+/// </summary>
+public enum FontTypography
+{
+    Caption,
+    Body,
+    BodyStrong,
+    Subtitle,
+    Title,
+    TitleLarge,
+    Display
+}
diff --git a/src/Wpf.Ui/Common/TextColor.cs b/src/Wpf.Ui/Common/TextColor.cs
new file mode 100644
index 000000000..25c627361
--- /dev/null
+++ b/src/Wpf.Ui/Common/TextColor.cs
@@ -0,0 +1,27 @@
+namespace Wpf.Ui.Common;
+
+/// <summary>
+/// Colors for UI labels and static text
+/// </summary>
+public enum TextColor
+{
+    /// <summary>
+    /// Rest or Hover
+    /// </summary>
+    Primary,
+
+    /// <summary>
+    /// Rest or Hover
+    /// </summary>
+    Secondary,
+
+    /// <summary>
+    /// Pressed only (not accessible)
+    /// </summary>
+    Tertiary,
+
+    /// <summary>
+    /// Disabled only (not accessible)
+    /// </summary>
+    Disabled
+}
diff --git a/src/Wpf.Ui/Controls/CodeBlock.cs b/src/Wpf.Ui/Controls/CodeBlock.cs
index 35e1e8403..f74de8f90 100644
--- a/src/Wpf.Ui/Controls/CodeBlock.cs
+++ b/src/Wpf.Ui/Controls/CodeBlock.cs
@@ -8,9 +8,13 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Media;
 using Wpf.Ui.Appearance;
 using Wpf.Ui.Common;
 using Wpf.Ui.Controls.NumberBoxControl;
+using Wpf.Ui.Extensions;
 using Color = System.Windows.Media.Color;
 
 namespace Wpf.Ui.Controls;
@@ -79,8 +83,21 @@ protected override void OnContentChanged(object oldContent, object newContent)
 
     protected virtual void UpdateSyntax()
     {
-        _sourceCode = Syntax.Highlighter.Clean(Content as string ?? String.Empty);
-        SyntaxContent = Syntax.Highlighter.Format(_sourceCode);
+        _sourceCode = Syntax.Highlighter.Clean(Content as string ?? string.Empty);
+
+        RichTextBox richTextBox = new RichTextBox()
+        {
+            IsTextSelectionEnabled = true,
+            VerticalContentAlignment = VerticalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Left,
+            HorizontalContentAlignment = HorizontalAlignment.Left
+        };
+
+        richTextBox.Document.Blocks.Clear();
+        richTextBox.Document.Blocks.Add(Syntax.Highlighter.FormatAsParagraph(_sourceCode));
+
+        SyntaxContent = richTextBox;
     }
 
     private void OnTemplateButtonClick(string? _)
diff --git a/src/Wpf.Ui/Controls/IconElements/FontIcon.cs b/src/Wpf.Ui/Controls/IconElements/FontIcon.cs
index a8a7f97b7..a7b55d578 100644
--- a/src/Wpf.Ui/Controls/IconElements/FontIcon.cs
+++ b/src/Wpf.Ui/Controls/IconElements/FontIcon.cs
@@ -129,11 +129,6 @@ public string Glyph
 
     protected override UIElement InitializeChildren()
     {
-        if (VisualParent is not null)
-        {
-            FontSize = TextElement.GetFontSize(VisualParent);
-        }
-
         if (FontSize.Equals(SystemFonts.MessageFontSize))
         {
             SetResourceReference(FontSizeProperty, "DefaultIconFontSize");   
diff --git a/src/Wpf.Ui/Controls/Navigation/INavigationView.cs b/src/Wpf.Ui/Controls/Navigation/INavigationView.cs
index 828ac69b9..4749f4f26 100644
--- a/src/Wpf.Ui/Controls/Navigation/INavigationView.cs
+++ b/src/Wpf.Ui/Controls/Navigation/INavigationView.cs
@@ -14,6 +14,7 @@
 using Wpf.Ui.Common;
 using Wpf.Ui.Contracts;
 using Wpf.Ui.Controls.AutoSuggestBoxControl;
+using Wpf.Ui.Controls.BreadcrumbControl;
 using Wpf.Ui.Controls.TitleBarControl;
 
 namespace Wpf.Ui.Controls.Navigation;
@@ -125,15 +126,20 @@ public interface INavigationView
     /// </summary>
     NavigationViewPaneDisplayMode PaneDisplayMode { get; set; }
 
+    /// <summary>
+    /// Gets or sets an TitleBar to be displayed in the NavigationView.
+    /// </summary>
+    TitleBar? TitleBar { get; set; }
+
     /// <summary>
     /// Gets or sets an AutoSuggestBox to be displayed in the NavigationView.
     /// </summary>
     AutoSuggestBox? AutoSuggestBox { get; set; }
 
     /// <summary>
-    /// Gets or sets an TitleBar to be displayed in the NavigationView.
+    /// Gets or sets an BreadcrumbBar that is in <see cref="Header"/>.
     /// </summary>
-    TitleBar? TitleBar { get; set; }
+    BreadcrumbBar? BreadcrumbBar { get; set; }
 
     /// <summary>
     /// Template Property for <see cref="MenuItems"/> and <see cref="FooterMenuItems"/>.
diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
index b0fbe3ddf..2b88a0c6d 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
@@ -74,29 +74,6 @@ protected override void OnInitialized(EventArgs e)
 
         NavigationStack.CollectionChanged += NavigationStackOnCollectionChanged;
 
-        if (Header is BreadcrumbBar breadcrumbBar)
-        {
-            breadcrumbBar.ItemsSource = _breadcrumbBarItems;
-            breadcrumbBar.ItemTemplate ??= Application.Current.TryFindResource("NavigationViewItemDataTemplate") as DataTemplate;
-            breadcrumbBar.ItemClicked += BreadcrumbBarOnItemClicked;
-        }
-
-        if (AutoSuggestBox is not null)
-        {
-            AutoSuggestBox.OriginalItemsSource = _autoSuggestBoxItems;
-            AutoSuggestBox.SuggestionChosen += AutoSuggestBoxOnSuggestionChosen;
-            AutoSuggestBox.QuerySubmitted += AutoSuggestBoxOnQuerySubmitted;
-        }
-
-        if (TitleBar is not null)
-        {
-            FrameMargin = s_frameMargin;
-            TitleBar.Margin = s_titleBarPaneOpenMargin;
-
-            if (AutoSuggestBox?.Margin is { Bottom: 0, Left: 0, Right: 0, Top: 0 })
-                AutoSuggestBox.Margin = s_autoSuggestBoxMargin;
-        }
-
         InvalidateArrange();
         InvalidateVisual();
         UpdateLayout();
diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs
index 552608681..5fda3cff5 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs
@@ -14,6 +14,7 @@
 using Wpf.Ui.Animations;
 using Wpf.Ui.Controls.TitleBarControl;
 using Wpf.Ui.Controls.AutoSuggestBoxControl;
+using Wpf.Ui.Controls.BreadcrumbControl;
 
 namespace Wpf.Ui.Controls.Navigation;
 
@@ -164,14 +165,21 @@ public partial class NavigationView
     /// </summary>
     public static readonly DependencyProperty AutoSuggestBoxProperty = DependencyProperty.Register(nameof(AutoSuggestBox),
         typeof(AutoSuggestBox), typeof(NavigationView),
-        new FrameworkPropertyMetadata(null));
+        new FrameworkPropertyMetadata(null, OnAutoSuggestBoxPropertyChangedCallback));
 
     /// <summary>
     /// Property for <see cref="TitleBar"/>.
     /// </summary>
     public static readonly DependencyProperty TitleBarProperty = DependencyProperty.Register(nameof(TitleBar),
         typeof(TitleBar), typeof(NavigationView),
-        new FrameworkPropertyMetadata(null));
+        new FrameworkPropertyMetadata(null, OnTitleBarPropertyChangedCallback));
+
+    /// <summary>
+    /// Property for <see cref="BreadcrumbBar"/>.
+    /// </summary>
+    public static readonly DependencyProperty BreadcrumbBarProperty = DependencyProperty.Register(nameof(BreadcrumbBar),
+        typeof(BreadcrumbBar), typeof(NavigationView),
+        new FrameworkPropertyMetadata(null, OnBreadcrumbBarPropertyChangedCallback));
 
     /// <summary>
     /// Property for <see cref="ItemTemplate"/>.
@@ -374,6 +382,13 @@ public TitleBar? TitleBar
         set => SetValue(TitleBarProperty, value);
     }
 
+    /// <inheritdoc/>
+    public BreadcrumbBar? BreadcrumbBar
+    {
+        get => (BreadcrumbBar)GetValue(BreadcrumbBarProperty);
+        set => SetValue(BreadcrumbBarProperty, value);
+    }
+
     /// <inheritdoc/>
     public ControlTemplate? ItemTemplate
     {
@@ -455,4 +470,72 @@ private static void IsPaneOpenChangedCallback(DependencyObject d, DependencyProp
 
         VisualStateManager.GoToState(navigationView, navigationView.IsPaneOpen ? "PaneOpen" : "PaneCompact", true);
     }
+
+    private static void OnTitleBarPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not NavigationView navigationView)
+            return;
+
+        if (e.NewValue is null && e.OldValue is TitleBar oldValue)
+        {
+            navigationView.FrameMargin = new Thickness(0);
+            oldValue.Margin = new Thickness(0);
+
+            if (navigationView.AutoSuggestBox?.Margin == s_autoSuggestBoxMargin)
+                navigationView.AutoSuggestBox.Margin = new Thickness(0);
+
+            return;
+        }
+
+        if (e.NewValue is not TitleBar titleBar)
+            return;
+
+        navigationView.FrameMargin = s_frameMargin;
+        titleBar.Margin = s_titleBarPaneOpenMargin;
+
+        if (navigationView.AutoSuggestBox?.Margin is { Bottom: 0, Left: 0, Right: 0, Top: 0 })
+            navigationView.AutoSuggestBox.Margin = s_autoSuggestBoxMargin;
+    }
+
+    private static void OnAutoSuggestBoxPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not NavigationView navigationView)
+            return;
+
+        if (e.NewValue is null && e.OldValue is AutoSuggestBox oldValue)
+        {
+            oldValue.SuggestionChosen -= navigationView.AutoSuggestBoxOnSuggestionChosen;
+            oldValue.QuerySubmitted -= navigationView.AutoSuggestBoxOnQuerySubmitted;
+            return;
+        }
+
+        if (e.NewValue is not AutoSuggestBox autoSuggestBox)
+            return;
+
+        autoSuggestBox.OriginalItemsSource = navigationView._autoSuggestBoxItems;
+        autoSuggestBox.SuggestionChosen += navigationView.AutoSuggestBoxOnSuggestionChosen;
+        autoSuggestBox.QuerySubmitted += navigationView.AutoSuggestBoxOnQuerySubmitted;
+
+        if (navigationView.TitleBar?.Margin == s_titleBarPaneOpenMargin && autoSuggestBox.Margin is { Bottom: 0, Left: 0, Right: 0, Top: 0 })
+            autoSuggestBox.Margin = s_autoSuggestBoxMargin;
+    }
+
+    private static void OnBreadcrumbBarPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not NavigationView navigationView)
+            return;
+
+        if (e.NewValue is null && e.OldValue is BreadcrumbBar oldValue)
+        {
+            oldValue.ItemClicked -= navigationView.BreadcrumbBarOnItemClicked;
+            return;
+        }
+
+        if (e.NewValue is not BreadcrumbBar breadcrumbBar)
+            return;
+
+        breadcrumbBar.ItemsSource = navigationView._breadcrumbBarItems;
+        breadcrumbBar.ItemTemplate ??= Application.Current.TryFindResource("NavigationViewItemDataTemplate") as DataTemplate;
+        breadcrumbBar.ItemClicked += navigationView.BreadcrumbBarOnItemClicked;
+    }
 }
diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationViewContentPresenter.cs b/src/Wpf.Ui/Controls/Navigation/NavigationViewContentPresenter.cs
index 9e290de7c..770114e04 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationViewContentPresenter.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationViewContentPresenter.cs
@@ -8,6 +8,7 @@
 
 using System;
 using System.ComponentModel;
+using System.Diagnostics.Tracing;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -32,6 +33,14 @@ public class NavigationViewContentPresenter : Frame
         DependencyProperty.Register(nameof(TransitionType), typeof(TransitionType),
             typeof(NavigationViewContentPresenter), new FrameworkPropertyMetadata(TransitionType.FadeInWithSlide));
 
+    /// <summary>
+    /// Property for <see cref="IsDynamicScrollViewerEnabled"/>.
+    /// </summary>
+    public static readonly DependencyProperty IsDynamicScrollViewerEnabledProperty =
+        DependencyProperty.Register(nameof(IsDynamicScrollViewerEnabled), typeof(bool),
+            typeof(NavigationViewContentPresenter),
+            new FrameworkPropertyMetadata(true, FrameworkPropertyMetadataOptions.AffectsMeasure));
+
     [Bindable(true), Category("Appearance")]
     public int TransitionDuration
     {
@@ -48,6 +57,15 @@ public TransitionType TransitionType
         set => SetValue(TransitionTypeProperty, value);
     }
 
+    /// <summary>
+    /// TODO
+    /// </summary>
+    public bool IsDynamicScrollViewerEnabled
+    {
+        get => (bool)GetValue(IsDynamicScrollViewerEnabledProperty);
+        protected set => SetValue(IsDynamicScrollViewerEnabledProperty, value);
+    }
+
     static NavigationViewContentPresenter()
     {
         DefaultStyleKeyProperty.OverrideMetadata(
@@ -65,23 +83,19 @@ static NavigationViewContentPresenter()
         JournalOwnershipProperty.OverrideMetadata(
             typeof(NavigationViewContentPresenter),
             new FrameworkPropertyMetadata(JournalOwnership.UsesParentJournal));
+
+        ScrollViewer.CanContentScrollProperty.OverrideMetadata(typeof(Page), new FrameworkPropertyMetadata(true));
     }
 
-    protected override void OnInitialized(EventArgs e)
+    public NavigationViewContentPresenter()
     {
-        base.OnInitialized(e);
-
-        Navigating += static (_, eventArgs) =>
+        Navigating += static (sender, eventArgs) =>
         {
             if (eventArgs.Content is null)
                 return;
 
-            NotifyContentAboutNavigatingTo(eventArgs.Content);
-
-            if (eventArgs.Navigator is not NavigationViewContentPresenter navigator)
-                return;
-
-            NotifyContentAboutNavigatingFrom(navigator.Content);
+            var self = (NavigationViewContentPresenter)sender;
+            self.OnNavigating(eventArgs);
         };
 
         Navigated += static (sender, eventArgs) =>
@@ -91,10 +105,16 @@ protected override void OnInitialized(EventArgs e)
             if (eventArgs.Content is null)
                 return;
 
-            self.ApplyTransitionEffectToNavigatedPage(eventArgs.Content);
+            self.OnNavigated(eventArgs);
         };
+    }
+
+    protected override void OnInitialized(EventArgs e)
+    {
+        base.OnInitialized(e);
 
-        Unloaded += (sender, _) =>
+        //I didn't understand something, but why is it necessary?
+        Unloaded += static (sender, _) =>
         {
             if (sender is NavigationViewContentPresenter navigator)
             {
@@ -113,6 +133,34 @@ protected override void OnMouseDown(MouseButtonEventArgs e)
         base.OnMouseDown(e);
     }
 
+    protected virtual void OnNavigating(System.Windows.Navigation.NavigatingCancelEventArgs eventArgs)
+    {
+        NotifyContentAboutNavigatingTo(eventArgs.Content);
+
+        if (eventArgs.Navigator is not NavigationViewContentPresenter navigator)
+            return;
+
+        NotifyContentAboutNavigatingFrom(navigator.Content);
+    }
+
+    protected virtual void OnNavigated(NavigationEventArgs eventArgs)
+    {
+        ApplyTransitionEffectToNavigatedPage(eventArgs.Content);
+
+        if (eventArgs.Content is not DependencyObject dependencyObject)
+            return;
+
+        IsDynamicScrollViewerEnabled = ScrollViewer.GetCanContentScroll(dependencyObject);
+    }
+
+    private void ApplyTransitionEffectToNavigatedPage(object content)
+    {
+        if (TransitionDuration < 1)
+            return;
+
+        Transitions.ApplyTransition(content, TransitionType, TransitionDuration);
+    }
+
     private static void NotifyContentAboutNavigatingTo(object content)
     {
         if (content is INavigationAware navigationAwareNavigationContent)
@@ -136,12 +184,4 @@ private static void NotifyContentAboutNavigatingFrom(object content)
         if (content is FrameworkElement { DataContext: INavigationAware navigationAwareCurrentContent })
             navigationAwareCurrentContent.OnNavigatedFrom();
     }
-
-    private void ApplyTransitionEffectToNavigatedPage(object content)
-    {
-        if (TransitionDuration < 1)
-            return;
-
-        Transitions.ApplyTransition(content, TransitionType, TransitionDuration);
-    }
 }
diff --git a/src/Wpf.Ui/Controls/RichTextBox.cs b/src/Wpf.Ui/Controls/RichTextBox.cs
new file mode 100644
index 000000000..2efe57ec7
--- /dev/null
+++ b/src/Wpf.Ui/Controls/RichTextBox.cs
@@ -0,0 +1,30 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Windows;
+
+namespace Wpf.Ui.Controls;
+
+/// <summary>
+/// TODO
+/// </summary>
+public class RichTextBox : System.Windows.Controls.RichTextBox
+{
+    /// <summary>
+    /// Property for <see cref="IsTextSelectionEnabledProperty"/>.
+    /// </summary>
+    public static readonly DependencyProperty IsTextSelectionEnabledProperty =
+        DependencyProperty.Register(nameof(IsTextSelectionEnabled), typeof(bool), typeof(RichTextBox),
+            new PropertyMetadata(false));
+
+    /// <summary>
+    /// TODO
+    /// </summary>
+    public bool IsTextSelectionEnabled
+    {
+        get => (bool)GetValue(IsTextSelectionEnabledProperty);
+        set => SetValue(IsTextSelectionEnabledProperty, value);
+    }
+}
diff --git a/src/Wpf.Ui/Controls/TextBlock.cs b/src/Wpf.Ui/Controls/TextBlock.cs
new file mode 100644
index 000000000..64378787d
--- /dev/null
+++ b/src/Wpf.Ui/Controls/TextBlock.cs
@@ -0,0 +1,66 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Windows;
+using System.Windows.Documents;
+using Wpf.Ui.Common;
+using Wpf.Ui.Extensions;
+
+namespace Wpf.Ui.Controls;
+
+/// <summary>
+/// Extended <see cref="System.Windows.Controls.TextBlock"/> with additional parameters like <see cref="FontTypography"/>.
+/// </summary>
+public class TextBlock : System.Windows.Controls.TextBlock
+{
+    static TextBlock()
+    {
+        TextElement.FontSizeProperty.OverrideMetadata(typeof(System.Windows.Controls.TextBlock), new FrameworkPropertyMetadata(14.0));
+    }
+
+    /// <summary>
+    /// Property for <see cref="FontTypography"/>.
+    /// </summary>
+    public static readonly DependencyProperty FontTypographyProperty = DependencyProperty.Register(
+        nameof(FontTypography),
+        typeof(FontTypography), typeof(TextBlock), new PropertyMetadata(FontTypography.Body,
+            static (o, args) => ((TextBlock)o).OnFontTypographyChanged((FontTypography)args.NewValue)));
+
+    /// <summary>
+    /// Property for <see cref="Appearance"/>.
+    /// </summary>
+    public static readonly DependencyProperty AppearanceProperty = DependencyProperty.Register(
+        nameof(Appearance),
+        typeof(TextColor), typeof(TextBlock), new PropertyMetadata(TextColor.Primary,
+            static (o, args) => ((TextBlock)o).OnAppearanceChanged((TextColor)args.NewValue)));
+
+    /// <summary>
+    /// TODO
+    /// </summary>
+    public FontTypography FontTypography
+    {
+        get => (FontTypography)GetValue(FontTypographyProperty);
+        set => SetValue(FontTypographyProperty, value);
+    }
+
+    /// <summary>
+    /// TODO
+    /// </summary>
+    public TextColor Appearance
+    {
+        get => (TextColor)GetValue(AppearanceProperty);
+        set => SetValue(AppearanceProperty, value);
+    }
+
+    private void OnFontTypographyChanged(FontTypography newTypography)
+    {
+        SetResourceReference(StyleProperty, newTypography.ToResourceValue());
+    }
+
+    private void OnAppearanceChanged(TextColor textColor)
+    {
+        SetResourceReference(ForegroundProperty, textColor.ToResourceValue());
+    }
+}
diff --git a/src/Wpf.Ui/Controls/TextBox.cs b/src/Wpf.Ui/Controls/TextBox.cs
index 493533bb2..80c62185e 100644
--- a/src/Wpf.Ui/Controls/TextBox.cs
+++ b/src/Wpf.Ui/Controls/TextBox.cs
@@ -76,6 +76,13 @@ public class TextBox : System.Windows.Controls.TextBox
     public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(nameof(ShowClearButton),
         typeof(bool), typeof(TextBox), new PropertyMetadata(false));
 
+    /// <summary>
+    /// Property for <see cref="IsTextSelectionEnabledProperty"/>.
+    /// </summary>
+    public static readonly DependencyProperty IsTextSelectionEnabledProperty =
+        DependencyProperty.Register(nameof(IsTextSelectionEnabled), typeof(bool), typeof(TextBox),
+            new PropertyMetadata(false));
+
     /// <summary>
     /// Property for <see cref="TemplateButtonCommand"/>.
     /// </summary>
@@ -155,6 +162,15 @@ public bool ShowClearButton
         protected set => SetValue(ShowClearButtonProperty, value);
     }
 
+    /// <summary>
+    /// TODO
+    /// </summary>
+    public bool IsTextSelectionEnabled
+    {
+        get => (bool)GetValue(IsTextSelectionEnabledProperty);
+        set => SetValue(IsTextSelectionEnabledProperty, value);
+    }
+
     /// <summary>
     /// Command triggered after clicking the button.
     /// </summary>
@@ -189,6 +205,8 @@ protected override void OnGotFocus(RoutedEventArgs e)
     {
         base.OnGotFocus(e);
 
+        CaretIndex = Text.Length;
+
         RevealClearButton();
     }
 
diff --git a/src/Wpf.Ui/Extensions/TextBlockFontTypographyExtensions.cs b/src/Wpf.Ui/Extensions/TextBlockFontTypographyExtensions.cs
new file mode 100644
index 000000000..e8f8ebdc8
--- /dev/null
+++ b/src/Wpf.Ui/Extensions/TextBlockFontTypographyExtensions.cs
@@ -0,0 +1,29 @@
+using System;
+using Wpf.Ui.Common;
+
+namespace Wpf.Ui.Extensions;
+
+/// <summary>
+/// TODO
+/// </summary>
+public static class TextBlockFontTypographyExtensions
+{
+    /// <summary>
+    /// TODO
+    /// </summary>
+    /// <param name="typography"></param>
+    /// <returns></returns>
+    /// <exception cref="ArgumentOutOfRangeException"></exception>
+    public static string ToResourceValue(this FontTypography typography) =>
+        typography switch
+        {
+            FontTypography.Caption => "CaptionTextBlockStyle",
+            FontTypography.Body => "BodyTextBlockStyle",
+            FontTypography.BodyStrong => "BodyStrongTextBlockStyle",
+            FontTypography.Subtitle => "SubtitleTextBlockStyle",
+            FontTypography.Title => "TitleTextBlockStyle",
+            FontTypography.TitleLarge => "TitleLargeTextBlockStyle",
+            FontTypography.Display => "DisplayTextBlockStyle",
+            _ => throw new ArgumentOutOfRangeException(nameof(typography), typography, null)
+        };
+}
diff --git a/src/Wpf.Ui/Extensions/TextColorExtensions.cs b/src/Wpf.Ui/Extensions/TextColorExtensions.cs
new file mode 100644
index 000000000..8055d1145
--- /dev/null
+++ b/src/Wpf.Ui/Extensions/TextColorExtensions.cs
@@ -0,0 +1,25 @@
+using System;
+using Wpf.Ui.Common;
+
+namespace Wpf.Ui.Extensions;
+
+/// <summary>
+/// TODO
+/// </summary>
+public static class TextColorExtensions
+{
+    /// <summary>
+    /// TODO
+    /// </summary>
+    /// <param name="textColor"></param>
+    /// <returns></returns>
+    public static string ToResourceValue(this TextColor textColor) =>
+        textColor switch
+        {
+            TextColor.Primary => "TextFillColorPrimaryBrush",
+            TextColor.Secondary => "TextFillColorSecondaryBrush",
+            TextColor.Tertiary => "TextFillColorTertiaryBrush",
+            TextColor.Disabled => "TextFillColorDisabledBrush",
+            _ => throw new ArgumentOutOfRangeException(nameof(textColor), textColor, null)
+        };
+}
diff --git a/src/Wpf.Ui/Styles/Assets/Typography.xaml b/src/Wpf.Ui/Styles/Assets/Typography.xaml
new file mode 100644
index 000000000..e5b3ce0ba
--- /dev/null
+++ b/src/Wpf.Ui/Styles/Assets/Typography.xaml
@@ -0,0 +1,72 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style TargetType="TextBlock">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="LineHeight" Value="20" />
+        <Setter Property="FontWeight" Value="Regular" />
+    </Style>
+
+    <Style
+        x:Key="CaptionTextBlockStyle"
+        BasedOn="{StaticResource {x:Type TextBlock}}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="LineHeight" Value="16" />
+        <Setter Property="FontWeight" Value="Regular" />
+    </Style>
+
+    <Style
+        x:Key="BodyTextBlockStyle"
+        BasedOn="{StaticResource {x:Type TextBlock}}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="LineHeight" Value="20" />
+        <Setter Property="FontWeight" Value="Regular" />
+    </Style>
+
+    <Style
+        x:Key="BodyStrongTextBlockStyle"
+        BasedOn="{StaticResource {x:Type TextBlock}}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="LineHeight" Value="20" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </Style>
+
+    <Style
+        x:Key="SubtitleTextBlockStyle"
+        BasedOn="{StaticResource {x:Type TextBlock}}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="20" />
+        <Setter Property="LineHeight" Value="28" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </Style>
+
+    <Style
+        x:Key="TitleTextBlockStyle"
+        BasedOn="{StaticResource {x:Type TextBlock}}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="28" />
+        <Setter Property="LineHeight" Value="36" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </Style>
+
+    <Style
+        x:Key="TitleLargeTextBlockStyle"
+        BasedOn="{StaticResource {x:Type TextBlock}}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="40" />
+        <Setter Property="LineHeight" Value="52" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </Style>
+
+    <Style
+        x:Key="DisplayTextBlockStyle"
+        BasedOn="{StaticResource {x:Type TextBlock}}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="68" />
+        <Setter Property="LineHeight" Value="92" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/Wpf.Ui/Styles/Assets/Variables.xaml b/src/Wpf.Ui/Styles/Assets/Variables.xaml
index bc3e99b29..84447609e 100644
--- a/src/Wpf.Ui/Styles/Assets/Variables.xaml
+++ b/src/Wpf.Ui/Styles/Assets/Variables.xaml
@@ -27,10 +27,6 @@
     <Duration x:Key="ControlFasterAnimationDuration">00:00:00.083</Duration>
     -->
 
-    <Style TargetType="TextBlock">
-        <Setter Property="FontSize" Value="14" />
-    </Style>
-
     <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
     <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
     <Thickness x:Key="TextControlThemePadding">10,8,10,7</Thickness>
@@ -54,4 +50,4 @@
     <system:Double x:Key="NavigationViewItemOnLeftMinHeight">32</system:Double>
 
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/Wpf.Ui/Styles/Controls/BreadcrumbBar.xaml b/src/Wpf.Ui/Styles/Controls/BreadcrumbBar.xaml
index 2f769442b..d5b40d106 100644
--- a/src/Wpf.Ui/Styles/Controls/BreadcrumbBar.xaml
+++ b/src/Wpf.Ui/Styles/Controls/BreadcrumbBar.xaml
@@ -9,7 +9,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:breadcrumbControl="clr-namespace:Wpf.Ui.Controls.BreadcrumbControl"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
     xmlns:iconElements="clr-namespace:Wpf.Ui.Controls.IconElements"
     xmlns:iconSources="clr-namespace:Wpf.Ui.Controls.IconSources">
 
diff --git a/src/Wpf.Ui/Styles/Controls/CardExpander.xaml b/src/Wpf.Ui/Styles/Controls/CardExpander.xaml
index 7252da460..cf0c2a561 100644
--- a/src/Wpf.Ui/Styles/Controls/CardExpander.xaml
+++ b/src/Wpf.Ui/Styles/Controls/CardExpander.xaml
@@ -24,34 +24,36 @@
     <system:Double x:Key="CardExpanderChevronSize">16.0</system:Double>
 
     <ControlTemplate x:Key="DefaultUiCardExpanderToggleButtonStyle" TargetType="{x:Type ToggleButton}">
-        <Grid Margin="{TemplateBinding Padding}" Background="Transparent">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <ContentPresenter
-                x:Name="ContentPresenter"
-                Grid.Column="0"
-                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                Content="{TemplateBinding Content}" />
-            <Grid
-                x:Name="ChevronGrid"
-                Grid.Column="1"
-                Margin="0"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                RenderTransformOrigin="0.5, 0.5">
-                <Grid.RenderTransform>
-                    <RotateTransform Angle="0" />
-                </Grid.RenderTransform>
+        <Border Padding="{TemplateBinding Padding}" Background="Transparent">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <ContentPresenter
+                    x:Name="ContentPresenter"
+                    Grid.Column="0"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                    Content="{TemplateBinding Content}" />
+                <Grid
+                    x:Name="ChevronGrid"
+                    Grid.Column="1"
+                    Margin="0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    RenderTransformOrigin="0.5, 0.5">
+                    <Grid.RenderTransform>
+                        <RotateTransform Angle="0" />
+                    </Grid.RenderTransform>
 
-                <iconElements:SymbolIcon
-                    FontSize="{StaticResource CardExpanderChevronSize}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Symbol="ChevronDown24" />
+                    <iconElements:SymbolIcon
+                        FontSize="{StaticResource CardExpanderChevronSize}"
+                        Foreground="{TemplateBinding Foreground}"
+                        Symbol="ChevronDown24" />
+                </Grid>
             </Grid>
-        </Grid>
+        </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsChecked" Value="True">
                 <Trigger.EnterActions>
diff --git a/src/Wpf.Ui/Styles/Controls/CodeBlock.xaml b/src/Wpf.Ui/Styles/Controls/CodeBlock.xaml
index b11b2d971..a3f3f1dbe 100644
--- a/src/Wpf.Ui/Styles/Controls/CodeBlock.xaml
+++ b/src/Wpf.Ui/Styles/Controls/CodeBlock.xaml
@@ -42,10 +42,6 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:CodeBlock}">
                     <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
                         <Border
                             x:Name="ContentBorder"
                             Padding="{TemplateBinding Padding}"
@@ -62,19 +58,6 @@
                                 ScrollViewer.CanContentScroll="False"
                                 TextElement.FontSize="12" />
                         </Border>
-                        <controls:Button
-                            Grid.Column="1"
-                            Margin="4,0,0,0"
-                            Padding="8"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Command="{Binding Path=ButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                            Foreground="{TemplateBinding Foreground}"
-                            ToolTip="Copies the code snippet to the clipboard.">
-                            <controls:Button.Icon>
-                                <iconElements:SymbolIcon Symbol="CopySelect20" />
-                            </controls:Button.Icon>
-                        </controls:Button>
                     </Grid>
                     <ControlTemplate.Resources>
                         <Style TargetType="{x:Type TextBlock}">
diff --git a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml
index 1b6e01d20..4bff024a7 100644
--- a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml
@@ -573,7 +573,7 @@
                     <navigation:NavigationViewContentPresenter
                         x:Name="PART_NavigationViewContentPresenter"
                         Grid.Row="1"
-                        Margin="{TemplateBinding Padding}"
+                        Padding="{TemplateBinding Padding}"
                         TransitionDuration="{TemplateBinding TransitionDuration}"
                         TransitionType="{TemplateBinding TransitionType}" />
 
@@ -1098,7 +1098,7 @@
                 <navigation:NavigationViewContentPresenter
                     x:Name="PART_NavigationViewContentPresenter"
                     Grid.Row="1"
-                    Margin="{TemplateBinding Padding}"
+                    Padding="{TemplateBinding Padding}"
                     TransitionDuration="{TemplateBinding TransitionDuration}"
                     TransitionType="{TemplateBinding TransitionType}" />
 
diff --git a/src/Wpf.Ui/Styles/Controls/NavigationViewBreadcrumbItem.xaml b/src/Wpf.Ui/Styles/Controls/NavigationViewBreadcrumbItem.xaml
index f483140d6..5818460f0 100644
--- a/src/Wpf.Ui/Styles/Controls/NavigationViewBreadcrumbItem.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NavigationViewBreadcrumbItem.xaml
@@ -8,10 +8,11 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
     xmlns:navigation="clr-namespace:Wpf.Ui.Controls.Navigation">
 
     <DataTemplate x:Key="NavigationViewItemDataTemplate" DataType="{x:Type navigation:NavigationViewBreadcrumbItem}">
-        <TextBlock Text="{Binding Content}" />
+        <controls:TextBlock FontTypography="Title" Text="{Binding Content}" />
     </DataTemplate>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/Wpf.Ui/Styles/Controls/NavigationViewContentPresenter.xaml b/src/Wpf.Ui/Styles/Controls/NavigationViewContentPresenter.xaml
index accaef669..2e1021e11 100644
--- a/src/Wpf.Ui/Styles/Controls/NavigationViewContentPresenter.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NavigationViewContentPresenter.xaml
@@ -11,20 +11,36 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
     xmlns:navigation="clr-namespace:Wpf.Ui.Controls.Navigation">
 
+    <ControlTemplate x:Key="DefaultNavigationViewContentPresenterControlTemplate" TargetType="{x:Type navigation:NavigationViewContentPresenter}">
+        <ContentPresenter x:Name="PART_FrameCP" Margin="{TemplateBinding Padding}" />
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="DefaultNavigationViewContentPresenterWithDynamicScrollViewerControlTemplate" TargetType="{x:Type navigation:NavigationViewContentPresenter}">
+        <controls:DynamicScrollViewer
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch"
+            Focusable="False">
+            <ContentPresenter x:Name="PART_FrameCP" Margin="{TemplateBinding Padding}" />
+        </controls:DynamicScrollViewer>
+    </ControlTemplate>
+
     <Style x:Key="DefaultNavigationViewContentPresenterStyle" TargetType="{x:Type navigation:NavigationViewContentPresenter}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type navigation:NavigationViewContentPresenter}">
-                    <ContentPresenter x:Name="PART_FrameCP" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsDynamicScrollViewerEnabled" Value="True">
+                <Setter Property="Template" Value="{StaticResource DefaultNavigationViewContentPresenterWithDynamicScrollViewerControlTemplate}" />
+            </Trigger>
+            <Trigger Property="IsDynamicScrollViewerEnabled" Value="False">
+                <Setter Property="Template" Value="{StaticResource DefaultNavigationViewContentPresenterControlTemplate}" />
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
     <Style BasedOn="{StaticResource DefaultNavigationViewContentPresenterStyle}" TargetType="{x:Type navigation:NavigationViewContentPresenter}" />
diff --git a/src/Wpf.Ui/Styles/Controls/RichTextBox.xaml b/src/Wpf.Ui/Styles/Controls/RichTextBox.xaml
index 72c5fa7ca..8e0a9843e 100644
--- a/src/Wpf.Ui/Styles/Controls/RichTextBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/RichTextBox.xaml
@@ -5,9 +5,12 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
 
-    <Style TargetType="{x:Type RichTextBox}">
+    <Style x:Key="DefaultRichTextBoxStyle" TargetType="{x:Type RichTextBox}">
         <Setter Property="Foreground">
             <Setter.Value>
                 <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
@@ -42,12 +45,14 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="4">
+                        CornerRadius="4"
+                        Focusable="False">
                         <ScrollViewer
                             x:Name="PART_ContentHost"
                             Margin="0,0,2,0"
                             Padding="{TemplateBinding Padding}"
-                            VerticalAlignment="Top"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Foreground="{TemplateBinding Foreground}"
                             HorizontalScrollBarVisibility="{TemplateBinding HorizontalScrollBarVisibility}"
                             VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}" />
@@ -78,4 +83,24 @@
         </Setter>
     </Style>
 
+    <Style BasedOn="{StaticResource DefaultRichTextBoxStyle}" TargetType="{x:Type RichTextBox}" />
+
+    <Style
+        x:Key="DefaultUiRichTextBoxStyle"
+        BasedOn="{StaticResource DefaultRichTextBoxStyle}"
+        TargetType="{x:Type controls:RichTextBox}">
+
+        <Style.Triggers>
+            <Trigger Property="IsTextSelectionEnabled" Value="True">
+                <Setter Property="IsReadOnly" Value="True" />
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="Padding" Value="0" />
+                <Setter Property="BorderBrush" Value="Transparent" />
+                <Setter Property="BorderThickness" Value="0" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style BasedOn="{StaticResource DefaultUiRichTextBoxStyle}" TargetType="{x:Type controls:RichTextBox}" />
+
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Styles/Controls/Snackbar.xaml b/src/Wpf.Ui/Styles/Controls/Snackbar.xaml
index f9a01ed4d..58f383f16 100644
--- a/src/Wpf.Ui/Styles/Controls/Snackbar.xaml
+++ b/src/Wpf.Ui/Styles/Controls/Snackbar.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
     This Source Code Form is subject to the terms of the MIT License.
     If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
     Copyright (C) Leszek Pomianowski and WPF UI Contributors.
diff --git a/src/Wpf.Ui/Styles/Controls/TextBox.xaml b/src/Wpf.Ui/Styles/Controls/TextBox.xaml
index 616ec35fb..d04035bd5 100644
--- a/src/Wpf.Ui/Styles/Controls/TextBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/TextBox.xaml
@@ -17,9 +17,9 @@
 
     <Thickness x:Key="TextBoxBorderThemeThickness">1,1,1,0</Thickness>
     <Thickness x:Key="TextBoxAccentBorderThemeThickness">0,0,0,1</Thickness>
-    <Thickness x:Key="TextBoxLeftIconMargin">10,8,0,0</Thickness>
-    <Thickness x:Key="TextBoxRightIconMargin">0,8,10,0</Thickness>
-    <Thickness x:Key="TextBoxClearButtonMargin">0,5,4,0</Thickness>
+    <Thickness x:Key="TextBoxLeftIconMargin">10,0,0,0</Thickness>
+    <Thickness x:Key="TextBoxRightIconMargin">0,0,10,0</Thickness>
+    <Thickness x:Key="TextBoxClearButtonMargin">0,0,4,0</Thickness>
     <Thickness x:Key="TextBoxClearButtonPadding">0,0,0,0</Thickness>
 
     <!--  TODO: Rework TextBox ScrollViewer  -->
@@ -162,6 +162,212 @@
         </Setter>
     </Style>
 
+
+    <ControlTemplate x:Key="DefaultUiTextBoxControlTemplate" TargetType="{x:Type controls:TextBox}">
+        <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
+            <Border
+                x:Name="ContentBorder"
+                MinWidth="{TemplateBinding MinWidth}"
+                MinHeight="{TemplateBinding MinHeight}"
+                Padding="0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding Border.CornerRadius}">
+                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <ContentPresenter
+                        x:Name="ControlIconLeft"
+                        Grid.Column="0"
+                        Margin="{StaticResource TextBoxLeftIconMargin}"
+                        VerticalAlignment="Center"
+                        Content="{TemplateBinding Icon}"
+                        Focusable="False"
+                        TextElement.FontSize="16"
+                        TextElement.Foreground="{TemplateBinding Foreground}"
+                        Visibility="Visible" />
+
+                    <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
+                        <ScrollViewer
+                            x:Name="PART_ContentHost"
+                            VerticalAlignment="Center"
+                            CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                            IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                            IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
+                            Style="{StaticResource DefaultTextBoxScrollViewerStyle}"
+                            TextElement.Foreground="{TemplateBinding Foreground}"
+                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
+                        <TextBlock
+                            x:Name="PlaceholderTextBox"
+                            Margin="0"
+                            Padding="1,0"
+                            VerticalAlignment="Center"
+                            Text="{TemplateBinding PlaceholderText}">
+                            <TextBlock.Foreground>
+                                <SolidColorBrush Color="{DynamicResource TextPlaceholderColor}" />
+                            </TextBlock.Foreground>
+                        </TextBlock>
+                    </Grid>
+
+                    <!--  Buttons and Icons have no padding from the main element to allow absolute positions if height is larger than the text entry zone  -->
+                    <controls:Button
+                        x:Name="ClearButton"
+                        Grid.Column="2"
+                        MinWidth="{StaticResource TextBoxClearButtonHeight}"
+                        MinHeight="{StaticResource TextBoxClearButtonHeight}"
+                        Margin="{StaticResource TextBoxClearButtonMargin}"
+                        Padding="{StaticResource TextBoxClearButtonPadding}"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        Appearance="Secondary"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                        Cursor="Arrow">
+                        <controls:Button.Foreground>
+                            <SolidColorBrush Color="{DynamicResource TextFillColorTertiary}" />
+                        </controls:Button.Foreground>
+                        <controls:Button.Icon>
+                            <iconElements:SymbolIcon FontSize="{TemplateBinding FontSize}" Symbol="Dismiss24" />
+                        </controls:Button.Icon>
+                    </controls:Button>
+
+                    <ContentPresenter
+                        x:Name="ControlIconRight"
+                        Grid.Column="3"
+                        Margin="{StaticResource TextBoxRightIconMargin}"
+                        VerticalAlignment="Center"
+                        Content="{TemplateBinding Icon}"
+                        TextElement.FontSize="16"
+                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                </Grid>
+            </Border>
+            <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
+            <Border
+                x:Name="AccentBorder"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                BorderThickness="{StaticResource TextBoxAccentBorderThemeThickness}"
+                CornerRadius="{TemplateBinding Border.CornerRadius}">
+                <Border.BorderBrush>
+                    <SolidColorBrush Color="{DynamicResource ControlStrongStrokeColorDefault}" />
+                </Border.BorderBrush>
+            </Border>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="PlaceholderEnabled" Value="False">
+                <Setter TargetName="PlaceholderTextBox" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="ShowClearButton" Value="False">
+                <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="ClearButton" Property="Margin" Value="0" />
+            </Trigger>
+            <Trigger Property="ClearButtonEnabled" Value="False">
+                <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="ClearButton" Property="Margin" Value="0" />
+            </Trigger>
+            <Trigger Property="IconPlacement" Value="Left">
+                <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="ControlIconRight" Property="Margin" Value="0" />
+            </Trigger>
+            <Trigger Property="IconPlacement" Value="Right">
+                <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="ControlIconLeft" Property="Margin" Value="0" />
+            </Trigger>
+            <Trigger Property="Icon" Value="{x:Null}">
+                <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="ControlIconRight" Property="Margin" Value="0" />
+                <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="ControlIconLeft" Property="Margin" Value="0" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2" />
+                <Setter TargetName="AccentBorder" Property="BorderBrush">
+                    <Setter.Value>
+                        <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
+                    </Setter.Value>
+                </Setter>
+                <Setter TargetName="ContentBorder" Property="Background">
+                    <Setter.Value>
+                        <SolidColorBrush Color="{DynamicResource ControlFillColorInputActive}" />
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsEnabled" Value="True" />
+                    <Condition Property="IsMouseOver" Value="True" />
+                    <Condition Property="IsFocused" Value="False" />
+                </MultiTrigger.Conditions>
+                <Setter TargetName="ContentBorder" Property="Background">
+                    <Setter.Value>
+                        <SolidColorBrush Color="{DynamicResource ControlFillColorSecondary}" />
+                    </Setter.Value>
+                </Setter>
+            </MultiTrigger>
+            <Trigger Property="IsReadOnly" Value="True">
+                <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="ClearButton" Property="Margin" Value="0" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="True">
+                <Setter Property="Cursor" Value="IBeam" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}" />
+                <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
+                <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
+                <Setter TargetName="ControlIconLeft" Property="TextElement.Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
+                <Setter TargetName="ControlIconRight" Property="TextElement.Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
+                <Setter TargetName="PlaceholderTextBox" Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
+                <Setter Property="ClearButtonEnabled" Value="False" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="DefaultUiTextBoxTextSelectionEnabledControlTemplate" TargetType="{x:Type controls:TextBox}">
+        <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
+            <Border
+                x:Name="ContentBorder"
+                MinWidth="{TemplateBinding MinWidth}"
+                MinHeight="{TemplateBinding MinHeight}"
+                Padding="0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                Focusable="False">
+                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Grid Margin="{TemplateBinding Padding}">
+                        <ScrollViewer
+                            x:Name="PART_ContentHost"
+                            VerticalAlignment="Center"
+                            CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                            IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                            IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
+                            Style="{StaticResource DefaultTextBoxScrollViewerStyle}"
+                            TextElement.Foreground="{TemplateBinding Foreground}"
+                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
+                    </Grid>
+                </Grid>
+            </Border>
+        </Grid>
+    </ControlTemplate>
+
     <Style x:Key="DefaultUiTextBoxStyle" TargetType="{x:Type controls:TextBox}">
         <!--  Universal WPF UI focus  -->
         <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
@@ -205,6 +411,19 @@
         <Setter Property="IconPlacement" Value="Left" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Style.Triggers>
+            <Trigger Property="IsTextSelectionEnabled" Value="False">
+                <Setter Property="Template" Value="{StaticResource DefaultUiTextBoxControlTemplate}" />
+            </Trigger>
+            <Trigger Property="IsTextSelectionEnabled" Value="True">
+                <Setter Property="IsReadOnly" Value="True" />
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="Padding" Value="0" />
+                <Setter Property="BorderBrush" Value="Transparent" />
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="Template" Value="{StaticResource DefaultUiTextBoxTextSelectionEnabledControlTemplate}" />
+            </Trigger>
+        </Style.Triggers>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:TextBox}">
diff --git a/src/Wpf.Ui/Styles/Wpf.Ui.xaml b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
index 26cdf1904..58ee12664 100644
--- a/src/Wpf.Ui/Styles/Wpf.Ui.xaml
+++ b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
@@ -12,6 +12,7 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Assets/Variables.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Assets/Fonts.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Assets/Typography.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Assets/StaticColors.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Assets/Accent.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Assets/Palette.xaml" />
diff --git a/src/Wpf.Ui/Syntax/Highlighter.cs b/src/Wpf.Ui/Syntax/Highlighter.cs
index 7ac1e4463..ba53f6c8b 100644
--- a/src/Wpf.Ui/Syntax/Highlighter.cs
+++ b/src/Wpf.Ui/Syntax/Highlighter.cs
@@ -42,17 +42,11 @@ internal static class Highlighter
 
     private const string AttributePattern = /* language=regex */ "(\\s*)([a-zA-Z\\d\\-:]+)=(\" | ')(.*?)\\3";
 
-    public static TextBlock Format(object code)
+    public static Paragraph FormatAsParagraph(string code, SyntaxLanguage language = SyntaxLanguage.Autodetect)
     {
-        return Format(code as string ?? String.Empty);
-    }
-
-    public static TextBlock Format(string code, SyntaxLanguage language = SyntaxLanguage.Autodetect)
-    {
-        TextBlock returnText = new TextBlock();
+        var paragraph = new Paragraph();
         Regex rgx = new(GetPattern(language, code));
 
-        Group codeMatched;
         bool lightTheme = IsLightTheme();
 
         foreach (Match match in rgx.Matches(code))
@@ -64,7 +58,7 @@ public static TextBlock Format(string code, SyntaxLanguage language = SyntaxLang
                     continue;
 
                 // Cast to group
-                codeMatched = (Group)group;
+                Group codeMatched = (Group)group;
 
                 // Remove empty groups
                 if (String.IsNullOrEmpty(codeMatched.Value))
@@ -72,15 +66,15 @@ public static TextBlock Format(string code, SyntaxLanguage language = SyntaxLang
 
                 if (codeMatched.Value.Contains("\t"))
                 {
-                    returnText.Inlines.Add(Line("  ", Brushes.Transparent));
+                    paragraph.Inlines.Add(Line("  ", Brushes.Transparent));
                 }
                 else if (codeMatched.Value.Contains("/*") || codeMatched.Value.Contains("//"))
                 {
-                    returnText.Inlines.Add(Line(codeMatched.Value, Brushes.Orange));
+                    paragraph.Inlines.Add(Line(codeMatched.Value, Brushes.Orange));
                 }
                 else if (codeMatched.Value.Contains("<") || codeMatched.Value.Contains(">"))
                 {
-                    returnText.Inlines.Add(Line(codeMatched.Value,
+                    paragraph.Inlines.Add(Line(codeMatched.Value,
                         lightTheme ? Brushes.DarkCyan : Brushes.CornflowerBlue));
                 }
                 else if (codeMatched.Value.Contains("\""))
@@ -92,18 +86,18 @@ public static TextBlock Format(string code, SyntaxLanguage language = SyntaxLang
                     {
                         for (int i = 0; i < attributeArray.Length; i += 2)
                         {
-                            returnText.Inlines.Add(Line(attributeArray[i],
+                            paragraph.Inlines.Add(Line(attributeArray[i],
                                 lightTheme ? Brushes.DarkSlateGray : Brushes.WhiteSmoke));
-                            returnText.Inlines.Add(Line("\"",
+                            paragraph.Inlines.Add(Line("\"",
                                 lightTheme ? Brushes.DarkCyan : Brushes.CornflowerBlue));
-                            returnText.Inlines.Add(Line(attributeArray[i + 1], Brushes.Coral));
-                            returnText.Inlines.Add(Line("\"",
+                            paragraph.Inlines.Add(Line(attributeArray[i + 1], Brushes.Coral));
+                            paragraph.Inlines.Add(Line("\"",
                                 lightTheme ? Brushes.DarkCyan : Brushes.CornflowerBlue));
                         }
                     }
                     else
                     {
-                        returnText.Inlines.Add(Line(codeMatched.Value,
+                        paragraph.Inlines.Add(Line(codeMatched.Value,
                             lightTheme ? Brushes.DarkSlateGray : Brushes.WhiteSmoke));
                     }
                 }
@@ -116,30 +110,30 @@ public static TextBlock Format(string code, SyntaxLanguage language = SyntaxLang
                     {
                         for (int i = 0; i < attributeArray.Length; i += 2)
                         {
-                            returnText.Inlines.Add(Line(attributeArray[i],
+                            paragraph.Inlines.Add(Line(attributeArray[i],
                                 lightTheme ? Brushes.DarkSlateGray : Brushes.WhiteSmoke));
-                            returnText.Inlines.Add(
+                            paragraph.Inlines.Add(
                                 Line("'", lightTheme ? Brushes.DarkCyan : Brushes.CornflowerBlue));
-                            returnText.Inlines.Add(Line(attributeArray[i + 1], Brushes.Coral));
-                            returnText.Inlines.Add(
+                            paragraph.Inlines.Add(Line(attributeArray[i + 1], Brushes.Coral));
+                            paragraph.Inlines.Add(
                                 Line("'", lightTheme ? Brushes.DarkCyan : Brushes.CornflowerBlue));
                         }
                     }
                     else
                     {
-                        returnText.Inlines.Add(Line(codeMatched.Value,
+                        paragraph.Inlines.Add(Line(codeMatched.Value,
                             lightTheme ? Brushes.DarkSlateGray : Brushes.WhiteSmoke));
                     }
                 }
                 else
                 {
-                    returnText.Inlines.Add(Line(codeMatched.Value,
+                    paragraph.Inlines.Add(Line(codeMatched.Value,
                         lightTheme ? Brushes.CornflowerBlue : Brushes.Aqua));
                 }
             }
         }
 
-        return returnText;
+        return paragraph;
     }
 
     public static string Clean(string code)
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
index c703d425d..3cf2ee84f 100644
--- a/src/Wpf.Ui/Wpf.Ui.csproj
+++ b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -24,7 +24,7 @@
     <PackageIcon>wpfui.png</PackageIcon>
   </PropertyGroup>
 
-  <ItemGroup>
+    <ItemGroup>
     <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
   </ItemGroup>