diff --git a/LM-Kit-Maestro/AppConstants.cs b/LM-Kit-Maestro/AppConstants.cs
index db1decac..5e6135b6 100644
--- a/LM-Kit-Maestro/AppConstants.cs
+++ b/LM-Kit-Maestro/AppConstants.cs
@@ -28,12 +28,10 @@ internal static class AppConstants
 
     public const double AlertPopupWidth = 400;
 
-    public const double TabBarHeight = 64;
+    public const double TabBarHeight = 48;
 
     public const double PageTopBarHeight = 64;
 
-    public const double ChatPageTopBarHeight = TabBarHeight + 64 - 8;
-
     public const double ModelSelectionButtonMaxWidth = 568;
 
     public const double MinimizedHeaderButtonWidth = ChatWindowLayoutMinimumWidth - (16 * 2);
diff --git a/LM-Kit-Maestro/AppShell.xaml b/LM-Kit-Maestro/AppShell.xaml
index 789b3e4b..ae68fb44 100644
--- a/LM-Kit-Maestro/AppShell.xaml
+++ b/LM-Kit-Maestro/AppShell.xaml
@@ -54,10 +54,9 @@
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
 
-            <!--<BoxView Grid.RowSpan="" HeightRequest="1" VerticalOptions="Start"/>-->
-            <!--<BoxView Grid.RowSpan="3" HeightRequest="1" VerticalOptions="End"/>-->
 
-            <Grid BackgroundColor="Transparent">
+            <Grid BackgroundColor="{StaticResource Primary}"/>
+            <Border StrokeThickness="0" BackgroundColor="{StaticResource Surface}" Stroke="Transparent" StrokeShape="RoundRectangle 4 4 0 0" ZIndex="1">
                 <Grid Padding="12, 0">
                     <HorizontalStackLayout
                         VerticalOptions="Center"
@@ -85,7 +84,7 @@
                         </BindableLayout.ItemTemplate>
                     </HorizontalStackLayout>
                 </Grid>
-            </Grid>
+            </Border>
 
             <shell:SimpleNavigationHost Grid.Row="1"/>
         </Grid>
diff --git a/LM-Kit-Maestro/UI/ChatConversationsView.xaml.cs b/LM-Kit-Maestro/UI/ChatConversationsView.xaml.cs
index 5dbfd18e..d273d788 100644
--- a/LM-Kit-Maestro/UI/ChatConversationsView.xaml.cs
+++ b/LM-Kit-Maestro/UI/ChatConversationsView.xaml.cs
@@ -78,7 +78,7 @@ private async void OnConversationListItemShowMoreClicked(object? sender, EventAr
             ChatConversationActionPopupViewModel chatConversationActionPopupViewModel = new ChatConversationActionPopupViewModel()
             {
                 ConversationX = collectionView.ScrollX + conversationItem.Width,
-                ConversationY = conversationItem.Y - collectionView.ScrollY + conversationItem.Height + AppConstants.ChatPageTopBarHeight,
+                ConversationY = conversationItem.Y - collectionView.ScrollY + conversationItem.Height + AppConstants.TabBarHeight + AppConstants.PageTopBarHeight,
                 ConversationItemHeight = conversationItem.Height,
                 ConversationListHeight = Height
             };
diff --git a/LM-Kit-Maestro/UI/Pages/ChatPage.xaml.cs b/LM-Kit-Maestro/UI/Pages/ChatPage.xaml.cs
index d9184222..b7ed567f 100644
--- a/LM-Kit-Maestro/UI/Pages/ChatPage.xaml.cs
+++ b/LM-Kit-Maestro/UI/Pages/ChatPage.xaml.cs
@@ -5,7 +5,7 @@ namespace LMKit.Maestro.UI;
 public partial class ChatPage : PageBase
 {
     private const int SidebarAnimationLength = 100;
-    public static readonly Thickness ChatViewMargin = new Thickness(AppConstants.HeaderHorizontalMargin, AppConstants.ChatPageHeaderHeight, AppConstants.PageTopBarHeight, 0);
+    public static readonly Thickness ChatViewMargin = new Thickness(AppConstants.HeaderHorizontalMargin, AppConstants.PageTopBarHeight + AppConstants.TabBarHeight, AppConstants.HeaderHorizontalMargin, 0);
 
     private readonly ChatPageViewModel _chatViewModel;
 
diff --git a/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml b/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml
index ed0d6ddb..fb68581e 100644
--- a/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml
+++ b/LM-Kit-Maestro/UI/Pages/ModelsPage.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:controls="clr-namespace:LMKit.Maestro.Controls"
@@ -10,8 +10,7 @@
              xmlns:converters="clr-namespace:LMKit.Maestro.Converters"
              x:DataType="vm:ModelsPageViewModel"
              x:Class="LMKit.Maestro.UI.ModelsPage"
-             x:Name="modelsPage"
-             Title="ModelsPage">
+             x:Name="modelsPage">
 
     <!--<ContentPage.Resources>
         <ControlTemplate "ModelDownloadingTemplate">
@@ -24,7 +23,7 @@
 
         </ControlTemplate>
     </ContentPage.Resources>-->
-    <ContentPage.Resources>
+    <ui:PageBase.Resources>
         <!--<Style TargetType="controls:StatefulContentView">
             <Setter Property="VisualStateManager.VisualStateGroups">
                 <VisualStateGroupList>
@@ -229,9 +228,9 @@
                 </Border>
             </Grid>
         </DataTemplate>
-    </ContentPage.Resources>
+    </ui:PageBase.Resources>
 
-    <Grid Margin="0, 0, 0, 20" RowSpacing="20" RowDefinitions="auto, *, 20" >
+    <ui:PageBase.Header>
         <Grid 
             Margin="0, -8, 0, 0"
             Padding="20, 0"
@@ -247,7 +246,7 @@
                 
                 ColumnDefinitions="auto, *"
                 HorizontalOptions="Fill">
-                
+
                 <Label 
                     VerticalOptions="Center"
                     StyleClass="Subtitle"
@@ -258,14 +257,14 @@
                     Grid.Column="1"
                     ColumnSpacing="8"
                     ColumnDefinitions="*, auto, auto">
-                    
+
                     <Border 
                         StrokeThickness="1"
                         VerticalOptions="Center"
                         StrokeShape="RoundRectangle 4" 
                         BackgroundColor="Transparent"
                         Stroke="{StaticResource Surface4}">
-                        
+
                         <controls:CustomEntry VerticalOptions="End"  IsReadOnly="True" Text="{Binding AppSettingsService.ModelsFolderPath}"/>
                     </Border>
 
@@ -287,90 +286,93 @@
                 </Grid>
             </Grid>
         </Grid>
+    </ui:PageBase.Header>
 
-        <Border 
-            Grid.Row="1" 
-            Stroke="Transparent" 
-            StrokeShape="RoundRectangle 4" 
-            StrokeThickness="0">
-            <Grid RowDefinitions="auto, *, auto">
-
-                <VerticalStackLayout
-                    Spacing="16"
-                    Margin="0, 16, 0, 0"
-                    IsVisible="{Binding Source={x:Reference modelsPage}, Path=SelectedTab, Converter={mct:IsEqualConverter}, ConverterParameter={x:Static ui:ModelsPageTab.UserModels}}">
-                    <HorizontalStackLayout Spacing="12" VerticalOptions="Center" HorizontalOptions="Center">
-                        <HorizontalStackLayout.Triggers>
-                            <DataTrigger TargetType="HorizontalStackLayout" Binding="{Binding FileManager.FileCollectingInProgress}" Value="True">
-                                <Setter Property="ToolTipProperties.Text" Value="Folder scan in progress"/>
-                            </DataTrigger>
-                        </HorizontalStackLayout.Triggers>
-
-                        <ActivityIndicator 
-                            HorizontalOptions="Center"
-                            IsVisible="{Binding FileManager.FileCollectingInProgress}"
-                            BackgroundColor="Transparent"
-                            VerticalOptions="Center"
-                            Color="{StaticResource Outline}"
-                            Margin="0" IsRunning="True" HeightRequest="12" WidthRequest="12"/>
-
-                        <Label 
-                            HorizontalOptions="Center"
-                            VerticalOptions="Center"
-                            IsVisible="{Binding ModelListViewModel.UserModels.Count, Converter={converters:GreaterThanZeroConverter}}">
-                            <Label.FormattedText>
-                                <FormattedString>
-                                    <Span Text="You have "/>
-                                    <Span Text="{Binding ModelListViewModel.UserModels.Count}" FontAttributes="Bold"/>
-                                    <Span Text=" installed model(s) taking a total of "/>
-                                    <Span Text="{Binding ModelListViewModel.TotalModelSize, Converter={converters:FileSizeConverter}}" FontAttributes="Bold"/>
-                                </FormattedString>
-                            </Label.FormattedText>
-                        </Label>
-                    </HorizontalStackLayout>
+    <ui:PageBase.Body>
+        <Grid 
+            Margin="0, 0, 0, 20" RowSpacing="20"
+            RowDefinitions="*, 20">
+            <Border 
+                Stroke="Transparent" 
+                StrokeShape="RoundRectangle 4" 
+                StrokeThickness="0">
+                <Grid RowDefinitions="auto, *, auto">
+                    <VerticalStackLayout
+                        Spacing="16"
+                        Margin="0, 16, 0, 0"
+                        IsVisible="{Binding Source={x:Reference modelsPage}, Path=SelectedTab, Converter={mct:IsEqualConverter}, ConverterParameter={x:Static ui:ModelsPageTab.UserModels}}">
+                        <HorizontalStackLayout Spacing="12" VerticalOptions="Center" HorizontalOptions="Center">
+                            <HorizontalStackLayout.Triggers>
+                                <DataTrigger TargetType="HorizontalStackLayout" Binding="{Binding FileManager.FileCollectingInProgress}" Value="True">
+                                    <Setter Property="ToolTipProperties.Text" Value="Folder scan in progress"/>
+                                </DataTrigger>
+                            </HorizontalStackLayout.Triggers>
+
+                            <ActivityIndicator 
+                                HorizontalOptions="Center"
+                                IsVisible="{Binding FileManager.FileCollectingInProgress}"
+                                BackgroundColor="Transparent"
+                                VerticalOptions="Center"
+                                Color="{StaticResource Outline}"
+                                Margin="0" IsRunning="True" HeightRequest="12" WidthRequest="12"/>
+
+                            <Label 
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center"
+                                IsVisible="{Binding ModelListViewModel.UserModels.Count, Converter={converters:GreaterThanZeroConverter}}">
+                                <Label.FormattedText>
+                                    <FormattedString>
+                                        <Span Text="You have "/>
+                                        <Span Text="{Binding ModelListViewModel.UserModels.Count}" FontAttributes="Bold"/>
+                                        <Span Text=" installed model(s) taking a total of "/>
+                                        <Span Text="{Binding ModelListViewModel.TotalModelSize, Converter={converters:FileSizeConverter}}" FontAttributes="Bold"/>
+                                    </FormattedString>
+                                </Label.FormattedText>
+                            </Label>
+                        </HorizontalStackLayout>
 
-                    <Grid>
-                        <ui:LinkView 
+                        <Grid>
+                            <ui:LinkView 
                             Icon="{StaticResource CircleInfo}"
                             TextColor="{StaticResource Error}"
                             Text="{Binding FileManager.UnsortedModels.Count, StringFormat='{}You have {0} unsorted model files'}"
                             Command="{Binding Source={x:Reference modelsPage}, Path=ShowUnsortedModelFilesPopupCommand}"
                             IsVisible="{Binding FileManager.UnsortedModels.Count, Converter={converters:GreaterThanZeroConverter}}"/>
-                    </Grid>
-                </VerticalStackLayout>
-
-                <CollectionView Margin="0, 16, 0, 0" x:Name="modelsCollectionView" Grid.Row="1">
-                    <CollectionView.ItemsLayout>
-                        <LinearItemsLayout ItemSpacing="8" Orientation="Vertical"/>
-                    </CollectionView.ItemsLayout>
-
-                    <CollectionView.Triggers>
-                        <DataTrigger TargetType="CollectionView" Value="True" Binding="{Binding Source={x:Reference modelsCollectionView}, Path=ItemsSource.Count, Converter={converters:EqualToZeroConverter}}">
-                            <Setter Property="VerticalOptions" Value="Center"/>
-                        </DataTrigger>
-
-                        <DataTrigger TargetType="CollectionView" Binding="{Binding Source={x:Reference modelsPage}, Path=SelectedTab}" Value="{x:Static ui:ModelsPageTab.UserModels}">
-                            <Setter Property="ItemsSource" Value="{Binding ModelListViewModel.UserModels}"/>
-                            <Setter Property="ItemTemplate" Value="{StaticResource UserModelsTemplate}"/>
-                            <Setter Property="EmptyView">
-                                <Setter.Value>
-                                    <VerticalStackLayout VerticalOptions="End" HorizontalOptions="Center" Spacing="8">
-                                        <Label HorizontalTextAlignment="Center" Text="It looks like you don't have any model yet."/>
-                                        <Label HorizontalTextAlignment="Center" Text="Model files added to your model folder will appear here."/>
-                                    </VerticalStackLayout>
-
-                                </Setter.Value>
-                            </Setter>
-                        </DataTrigger>
-
-                        <!--<DataTrigger TargetType="CollectionView" Binding="{Binding Source={x:Reference modelsPage}, Path=SelectedTab}" Value="{x:Static ui:ModelsPageTab.LMKitModels}">
+                        </Grid>
+                    </VerticalStackLayout>
+
+                    <CollectionView Margin="0, 16, 0, 0" x:Name="modelsCollectionView" Grid.Row="1">
+                        <CollectionView.ItemsLayout>
+                            <LinearItemsLayout ItemSpacing="8" Orientation="Vertical"/>
+                        </CollectionView.ItemsLayout>
+
+                        <CollectionView.Triggers>
+                            <DataTrigger TargetType="CollectionView" Value="True" Binding="{Binding Source={x:Reference modelsCollectionView}, Path=ItemsSource.Count, Converter={converters:EqualToZeroConverter}}">
+                                <Setter Property="VerticalOptions" Value="Center"/>
+                            </DataTrigger>
+
+                            <DataTrigger TargetType="CollectionView" Binding="{Binding Source={x:Reference modelsPage}, Path=SelectedTab}" Value="{x:Static ui:ModelsPageTab.UserModels}">
+                                <Setter Property="ItemsSource" Value="{Binding ModelListViewModel.UserModels}"/>
+                                <Setter Property="ItemTemplate" Value="{StaticResource UserModelsTemplate}"/>
+                                <Setter Property="EmptyView">
+                                    <Setter.Value>
+                                        <VerticalStackLayout VerticalOptions="End" HorizontalOptions="Center" Spacing="8">
+                                            <Label HorizontalTextAlignment="Center" Text="It looks like you don't have any model yet."/>
+                                            <Label HorizontalTextAlignment="Center" Text="Model files added to your model folder will appear here."/>
+                                        </VerticalStackLayout>
+
+                                    </Setter.Value>
+                                </Setter>
+                            </DataTrigger>
+
+                            <!--<DataTrigger TargetType="CollectionView" Binding="{Binding Source={x:Reference modelsPage}, Path=SelectedTab}" Value="{x:Static ui:ModelsPageTab.LMKitModels}">
                             <Setter Property="ItemsSource" Value="{Binding ModelListViewModel.AvailableModels}"/>
                             <Setter Property="ItemTemplate" Value="{StaticResource LMKitModelsTemplate}"/>
                         </DataTrigger>-->
-                    </CollectionView.Triggers>
-                </CollectionView>
+                        </CollectionView.Triggers>
+                    </CollectionView>
 
-                <!--<Grid RowDefinitions="1, *" Margin="0, 0" Grid.Row="2">
+                    <!--<Grid RowDefinitions="1, *" Margin="0, 0" Grid.Row="2">
                     <BoxView  Margin="16,0"/>
                     <Grid Padding="16" VerticalOptions="Center" Grid.Row="1" ColumnDefinitions="*, auto, *">
                         <controls:StatefulContentView Grid.Row="1" Tapped="UserModelsTabTapped">
@@ -396,38 +398,39 @@
                         </controls:StatefulContentView>
                     </Grid>
                 </Grid>-->
-            </Grid>
-        </Border>
-
-        <controls:StatefulContentView TappedCommand="{Binding OpenHuggingFaceLinkCommand}" Grid.Row="2">
-            <VisualStateManager.VisualStateGroups>
-                <VisualStateGroupList>
-                    <VisualStateGroup x:Name="CommonStates">
-                        <VisualState x:Name="Normal" />
-                        <VisualState x:Name="Pressed">
-                            <VisualState.Setters>
-                                <Setter TargetName="hfLabel" Property="Label.TextColor" Value="#FFD21E"/>
-                                <Setter Property="Opacity" Value="0.8"/>
-                            </VisualState.Setters>
-                        </VisualState>
-                        <VisualState x:Name="PointerOver">
-                            <VisualState.Setters>
-
-                                <!--<Setter Property="Opacity" Value="0.7"/>-->
-                                <Setter TargetName="hfLabel" Property="Label.TextColor" Value="#FFD21E"/>
-                                <!--<Setter TargetName="hfLogo" Property="Image.WidthRequest" Value="20"/>
+                </Grid>
+            </Border>
+
+            <controls:StatefulContentView TappedCommand="{Binding OpenHuggingFaceLinkCommand}" Grid.Row="1">
+                <VisualStateManager.VisualStateGroups>
+                    <VisualStateGroupList>
+                        <VisualStateGroup x:Name="CommonStates">
+                            <VisualState x:Name="Normal" />
+                            <VisualState x:Name="Pressed">
+                                <VisualState.Setters>
+                                    <Setter TargetName="hfLabel" Property="Label.TextColor" Value="#FFD21E"/>
+                                    <Setter Property="Opacity" Value="0.8"/>
+                                </VisualState.Setters>
+                            </VisualState>
+                            <VisualState x:Name="PointerOver">
+                                <VisualState.Setters>
+
+                                    <!--<Setter Property="Opacity" Value="0.7"/>-->
+                                    <Setter TargetName="hfLabel" Property="Label.TextColor" Value="#FFD21E"/>
+                                    <!--<Setter TargetName="hfLogo" Property="Image.WidthRequest" Value="20"/>
                                 <Setter TargetName="hfLogo" Property="Image.HeightRequest" Value="20"/>-->
-                            </VisualState.Setters>
-                        </VisualState>
-                    </VisualStateGroup>
-                </VisualStateGroupList>
-            </VisualStateManager.VisualStateGroups>
+                                </VisualState.Setters>
+                            </VisualState>
+                        </VisualStateGroup>
+                    </VisualStateGroupList>
+                </VisualStateManager.VisualStateGroups>
+
+                <HorizontalStackLayout Spacing="8" HorizontalOptions="Center">
+                    <Image x:Name="hfLogo" VerticalOptions="Center" HeightRequest="16" WidthRequest="16" Source="hugging_face.png"/>
+                    <Label x:Name="hfLabel" TextColor="{StaticResource Outline}" Text="See more models"/>
+                </HorizontalStackLayout>
+            </controls:StatefulContentView>
 
-            <HorizontalStackLayout Spacing="8" HorizontalOptions="Center">
-                <Image x:Name="hfLogo" VerticalOptions="Center" HeightRequest="16" WidthRequest="16" Source="hugging_face.png"/>
-                <Label x:Name="hfLabel" TextColor="{StaticResource Outline}" Text="See more models"/>
-            </HorizontalStackLayout>
-        </controls:StatefulContentView>
-    </Grid>
-
-</ContentPage>
\ No newline at end of file
+        </Grid>
+    </ui:PageBase.Body>
+</ui:PageBase>
\ No newline at end of file
diff --git a/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml.cs b/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml.cs
index 6f9de0bb..2d069f60 100644
--- a/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml.cs
+++ b/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml.cs
@@ -4,7 +4,7 @@
 
 namespace LMKit.Maestro.UI;
 
-public partial class ModelsPage : ContentPage
+public partial class ModelsPage : PageBase
 {
     private readonly ModelsPageViewModel _modelsPageViewModel;
 
diff --git a/LM-Kit-Maestro/UI/Pages/PageBase.xaml b/LM-Kit-Maestro/UI/Pages/PageBase.xaml
index c9b477d4..2f089041 100644
--- a/LM-Kit-Maestro/UI/Pages/PageBase.xaml
+++ b/LM-Kit-Maestro/UI/Pages/PageBase.xaml
@@ -6,13 +6,16 @@
              Title="PageBase"
              x:Name="pageBase"
              >
-    <Grid RowDefinitions="auto, *">
+    <Grid RowDefinitions="auto, 1, *">
+        <Border StrokeThickness="0" BackgroundColor="{StaticResource Surface}" Stroke="Transparent" StrokeShape="RoundRectangle 0 0 0 0" ZIndex="1">
+            <ContentView 
+                HeightRequest="{x:Static local:AppConstants.PageTopBarHeight}"
+                Content="{Binding Source={x:Reference pageBase}, Path=Header}"/>
+        </Border>
+
+        <BoxView Grid.Row="1" />
         <ContentView 
-            BackgroundColor="Red"
-            HeightRequest="{x:Static local:AppConstants.PageTopBarHeight}"
-            Content="{Binding Source={x:Reference pageBase}, Path=Header}"/>
-        <ContentView 
-            Grid.Row="1"
+            Grid.Row="2"
             Content="{Binding Source={x:Reference pageBase}, Path=Body}"/>
     </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/LM-Kit-Maestro/UI/Popups/ChatConversationActionPopup.xaml.cs b/LM-Kit-Maestro/UI/Popups/ChatConversationActionPopup.xaml.cs
index 2d050ca8..39285de8 100644
--- a/LM-Kit-Maestro/UI/Popups/ChatConversationActionPopup.xaml.cs
+++ b/LM-Kit-Maestro/UI/Popups/ChatConversationActionPopup.xaml.cs
@@ -35,7 +35,7 @@ private async void OnDeleteClicked(object sender, EventArgs e)
     private void OnPopupContentSizeChanged(object sender, EventArgs e)
     {
         var popupBottom = popupContentGrid.Height + _chatConversationActionPopupViewModel.ConversationY;
-        var pageBottom = _chatConversationActionPopupViewModel.ConversationListHeight + AppConstants.ChatPageTopBarHeight;
+        var pageBottom = _chatConversationActionPopupViewModel.ConversationListHeight + AppConstants.PageTopBarHeight + AppConstants.TabBarHeight;
 
         if (popupBottom > pageBottom)
         {
diff --git a/LM-Kit-Maestro/UI/TopBarScaffold.xaml b/LM-Kit-Maestro/UI/TopBarScaffold.xaml
index 23c870e1..1c765879 100644
--- a/LM-Kit-Maestro/UI/TopBarScaffold.xaml
+++ b/LM-Kit-Maestro/UI/TopBarScaffold.xaml
@@ -10,7 +10,7 @@
     xmlns:vm="clr-namespace:LMKit.Maestro.ViewModels"
     x:Class="LMKit.Maestro.UI.TopBarScaffold">
     <Grid 
-        HeightRequest="{x:Static local:AppConstants.ChatPageTopBarHeight}"
+        HeightRequest="128"
         BackgroundColor="{StaticResource Surface}">
     </Grid>
 </ContentView>