diff --git a/LM-Kit-Maestro/UI/Pages/AssistantsPage.xaml b/LM-Kit-Maestro/UI/Pages/AssistantsPage.xaml
index 301d7a2..acb386e 100644
--- a/LM-Kit-Maestro/UI/Pages/AssistantsPage.xaml
+++ b/LM-Kit-Maestro/UI/Pages/AssistantsPage.xaml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ui:PageBase xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:local="clr-namespace:LMKit.Maestro"
@@ -12,38 +12,23 @@
              xmlns:services="clr-namespace:LMKit.Maestro.Services"
              x:DataType="vm:AssistantsPageViewModel"
              x:Class="LMKit.Maestro.UI.AssistantsPage">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="{x:Static ui:UIConstants.PageTopBarHeight}"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
 
-        <!-- Header -->
-        <Grid 
-            Margin="0, -8, 0, 0"
-            BackgroundColor="{StaticResource Surface}"
-            VerticalOptions="Start"
-            Grid.ColumnSpan="3" 
-            ColumnDefinitions="auto, *, auto">
+    <ui:PageBase.Header>
+        <ui:ModelSelectionButton
+            BindingContext="{Binding ModelListViewModel}"
+            x:Name="modelSelectionButton"
+            Margin="16, 0"
+            MaximumWidthRequest="{x:Static ui:UIConstants.ModelSelectionButtonMaxWidth}"
+            HeightRequest="{x:Static ui:UIConstants.ModelSelectionButtonHeight}">
+        </ui:ModelSelectionButton>
+    </ui:PageBase.Header>
 
-            <ui:ModelSelectionButton 
-                x:Name="modelSelectionButton"
-                BindingContext="{Binding ModelListViewModel}"
-                VerticalOptions="Start"
-                Margin="16, 0"
-                MaximumWidthRequest="{x:Static ui:UIConstants.ModelSelectionButtonMaxWidth}"
-                HeightRequest="{x:Static ui:UIConstants.ModelSelectionButtonHeight}"
-                Grid.Column="1">
-            </ui:ModelSelectionButton>
-        </Grid>
-
-        <BlazorWebView 
-            x:Name="blazorWebView" 
-            Grid.Row="1" 
-            HostPage="wwwroot/index.html">
+    <ui:PageBase.Body>
+        <BlazorWebView HostPage="wwwroot/index.html" StartPath="/assistants">
             <BlazorWebView.RootComponents>
-                <RootComponent Selector="#app" ComponentType="{x:Type razor:Translation}" />
+                <RootComponent Selector="#app" ComponentType="{x:Type razor:Routes}" />
             </BlazorWebView.RootComponents>
         </BlazorWebView>
-    </Grid>
-</ContentPage>
\ No newline at end of file
+    </ui:PageBase.Body>
+
+</ui:PageBase>
\ No newline at end of file
diff --git a/LM-Kit-Maestro/UI/Pages/AssistantsPage.xaml.cs b/LM-Kit-Maestro/UI/Pages/AssistantsPage.xaml.cs
index a1d7ed9..c48a7d9 100644
--- a/LM-Kit-Maestro/UI/Pages/AssistantsPage.xaml.cs
+++ b/LM-Kit-Maestro/UI/Pages/AssistantsPage.xaml.cs
@@ -2,7 +2,7 @@
 
 namespace LMKit.Maestro.UI;
 
-public partial class AssistantsPage : ContentPage
+public partial class AssistantsPage : PageBase
 {
     private readonly AssistantsPageViewModel _assistantsPageViewModel;
 
diff --git a/LM-Kit-Maestro/UI/Pages/ChatPage.xaml b/LM-Kit-Maestro/UI/Pages/ChatPage.xaml
index 92bd954..4f794de 100644
--- a/LM-Kit-Maestro/UI/Pages/ChatPage.xaml
+++ b/LM-Kit-Maestro/UI/Pages/ChatPage.xaml
@@ -129,14 +129,15 @@
                 x:Name="chatsSidebar"
                 WidthRequest="{Binding Source={x:Reference chatPage}, Path=ChatsSidebarWidth, x:DataType=ui:ChatPage}"
                 Grid.Row="1"/>
-            
+
             <BlazorWebView
                 x:Name="blazorWebView"
                 Grid.RowSpan="2"
                 Grid.Column="1"
-                HostPage="wwwroot/index.html">
+                HostPage="wwwroot/index.html"
+                StartPath="/chat">
                 <BlazorWebView.RootComponents>
-                    <RootComponent Selector="#app" ComponentType="{x:Type razor:Chat}" />
+                    <RootComponent Selector="#app" ComponentType="{x:Type razor:Routes}" />
                 </BlazorWebView.RootComponents>
             </BlazorWebView>
 
@@ -148,4 +149,4 @@
                 BindingContext="{Binding SettingsViewModel}"/>
         </Grid>
     </ui:PageBase.Body>
-</ui:PageBase>
+</ui:PageBase>
\ No newline at end of file
diff --git a/LM-Kit-Maestro/UI/Razor/Components/Chat.razor b/LM-Kit-Maestro/UI/Razor/Components/Chat.razor
index 1eef6d3..68ed672 100644
--- a/LM-Kit-Maestro/UI/Razor/Components/Chat.razor
+++ b/LM-Kit-Maestro/UI/Razor/Components/Chat.razor
@@ -1,4 +1,6 @@
-@inject LMKitService LMKitService
+    @page "/chat"
+
+@inject LMKitService LMKitService
 @inject HttpClient Http
 @inject IJSRuntime JS
 @inject IScrollHandler ScrollHandler
diff --git a/LM-Kit-Maestro/UI/Razor/Routes.razor b/LM-Kit-Maestro/UI/Razor/Components/Routes.razor
similarity index 100%
rename from LM-Kit-Maestro/UI/Razor/Routes.razor
rename to LM-Kit-Maestro/UI/Razor/Components/Routes.razor