diff --git a/Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj b/Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj
index 292dd06..89e119b 100644
--- a/Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj
+++ b/Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj
@@ -9,7 +9,7 @@
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia.Desktop" Version="11.1.0-beta1" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.1.0-beta2" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Bitvault.Avalonia\Bitvault.Avalonia.csproj" />
diff --git a/Bitvault.Avalonia/AddVaultContentActionView.axaml b/Bitvault.Avalonia/AddVaultContentActionView.axaml
new file mode 100644
index 0000000..76487ef
--- /dev/null
+++ b/Bitvault.Avalonia/AddVaultContentActionView.axaml
@@ -0,0 +1,21 @@
+<UserControl
+    x:Class="Bitvault.Avalonia.AddVaultContentActionView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Button
+        Grid.Column="1"
+        Width="{StaticResource ButtonWidth}"
+        Height="{StaticResource ButtonHeight}"
+        VerticalAlignment="Center"
+        BorderThickness="0"
+        Content="&#xE710;"
+        FontFamily="{DynamicResource SymbolThemeFontFamily}"
+        FontSize="16"
+        ToolTip.Tip="Add item">
+        <Interaction.Behaviors>
+            <EventTriggerBehavior EventName="Click">
+                <NavigateAction Context="Content" Route="AddVaultContent" />
+            </EventTriggerBehavior>
+        </Interaction.Behaviors>
+    </Button>
+</UserControl>
diff --git a/Bitvault.Avalonia/AddVaultContentActionView.axaml.cs b/Bitvault.Avalonia/AddVaultContentActionView.axaml.cs
new file mode 100644
index 0000000..5337e38
--- /dev/null
+++ b/Bitvault.Avalonia/AddVaultContentActionView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class AddVaultContentActionView : UserControl
+{
+    public AddVaultContentActionView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/AddVaultContentView.axaml b/Bitvault.Avalonia/AddVaultContentView.axaml
new file mode 100644
index 0000000..5ac68c7
--- /dev/null
+++ b/Bitvault.Avalonia/AddVaultContentView.axaml
@@ -0,0 +1,6 @@
+<UserControl
+    x:Class="Bitvault.Avalonia.AddVaultContentView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Add vault content placeholder
+</UserControl>
diff --git a/Bitvault.Avalonia/AddVaultContentView.axaml.cs b/Bitvault.Avalonia/AddVaultContentView.axaml.cs
new file mode 100644
index 0000000..b40e72f
--- /dev/null
+++ b/Bitvault.Avalonia/AddVaultContentView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class AddVaultContentView : UserControl
+{
+    public AddVaultContentView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/AllNavigationView.axaml b/Bitvault.Avalonia/AllNavigationView.axaml
index b75b3a6..35d87e2 100644
--- a/Bitvault.Avalonia/AllNavigationView.axaml
+++ b/Bitvault.Avalonia/AllNavigationView.axaml
@@ -5,7 +5,7 @@
     xmlns:vm="using:Bitvault"
     x:DataType="vm:AllNavigationViewModel"
     Content="All"
-    IsSelected="{Binding Selected, Mode=TwoWay}">
+    IsSelected="{Binding Selected}">
     <Interaction.Behaviors>
         <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
             <ConditionAction>
diff --git a/Bitvault.Avalonia/App.axaml b/Bitvault.Avalonia/App.axaml
index f939e4d..0d6b9d9 100644
--- a/Bitvault.Avalonia/App.axaml
+++ b/Bitvault.Avalonia/App.axaml
@@ -3,9 +3,9 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
-    RequestedThemeVariant="Dark">
+    RequestedThemeVariant="Default">
     <Application.Styles>
-        <ThemeResources />
+        <ThemeResources PreferUserAccentColor="True" />
         <Style Selector="ui|SettingsExpanderItem">
             <Style Selector="^ /template/ Expander#Expander">
                 <Setter Property="IsVisible" Value="False" />
diff --git a/Bitvault.Avalonia/App.axaml.cs b/Bitvault.Avalonia/App.axaml.cs
index 1654e3f..9184ff8 100644
--- a/Bitvault.Avalonia/App.axaml.cs
+++ b/Bitvault.Avalonia/App.axaml.cs
@@ -72,9 +72,13 @@ public partial class App : Application
                         services.AddTemplate<VaultViewModel, VaultView>("Vault");
                         services.AddHandler<VaultViewModelHandler>();
 
-                        services.AddTemplate<LockerNavigationViewModel, LockerNavigationView>();
+                        services.AddTemplate<VaultSearchHeaderViewModel, VaultSearchHeaderView>("VaultSearchHeader");
+                        services.AddTemplate<VaultHeaderViewModel, VaultHeaderView>("VaultHeader");
+                        services.AddTemplate<AddVaultContentActionViewModel, AddVaultContentActionView>();
+                        services.AddTemplate<AddVaultContentViewModel, AddVaultContentView>("AddVaultContent");
+                        services.AddTemplate<VaultContentViewModel, VaultContentView>("VaultContent");
 
-                        services.AddTemplate<VaultCommandViewModel, VaultCommandView>("VaultCommands");
+                        services.AddTemplate<VaultContentNavigationViewModel, VaultContentNavigationView>();
                     });
                 })!);
 
diff --git a/Bitvault.Avalonia/Bitvault.Avalonia.csproj b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
index a75bfb6..dace963 100644
--- a/Bitvault.Avalonia/Bitvault.Avalonia.csproj
+++ b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
@@ -12,22 +12,25 @@
 		<DefineConstants>$(DefineConstants);ENABLE_XAML_HOT_RELOAD</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.1.0-beta1" />
-		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.0" />
-		<PackageReference Include="HotAvalonia.Extensions" Version="1.1.0" PrivateAssets="All" />
-		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0-beta1" />
+	  <Compile Remove="VaultContentNavigationView.axaml.cs" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.1.0-beta2" />
+		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.1" />
+		<PackageReference Include="HotAvalonia.Extensions" Version="1.1.1" PrivateAssets="All" />
+		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0-beta2" />
 		<PackageReference Include="Avalonia.Labs.Controls" Version="11.0.10.1" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview2" />
+		<PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview1" />
 		<PackageReference Include="System.Reactive" Version="6.0.1-preview.1" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0-beta1" />
+		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0-beta2.1" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.3.24172.9" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.3.24172.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-beta1" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-beta2" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Bitvault\Bitvault.csproj" />
@@ -37,12 +40,18 @@
 	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj" />
 	</ItemGroup>
 	<ItemGroup>
+	  <Compile Update="AddVaultContentActionView.axaml.cs">
+	    <DependentUpon>AddVaultContentActionView.axaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="OpenView.axaml.cs">
 	    <DependentUpon>OpenView.axaml</DependentUpon>
 	  </Compile>
 	  <Compile Update="ManageNavigationView.axaml.cs">
 	    <DependentUpon>ManageNavigationView.axaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="VaultHeaderView.axaml.cs">
+	    <DependentUpon>VaultHeaderView.axaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="VaultNavigationView.axaml.cs">
 	    <DependentUpon>VaultNavigationView.axaml</DependentUpon>
 	  </Compile>
diff --git a/Bitvault.Avalonia/LockerNavigationView.axaml b/Bitvault.Avalonia/LockerNavigationView.axaml
deleted file mode 100644
index 047aec4..0000000
--- a/Bitvault.Avalonia/LockerNavigationView.axaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<ListBoxItem
-    x:Class="Bitvault.Avalonia.LockerNavigationView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    Welcome to Avalonia!
-</ListBoxItem>
diff --git a/Bitvault.Avalonia/VaultContentNavigationView.axaml.cs b/Bitvault.Avalonia/VaultContentNavigationView.axaml.cs
new file mode 100644
index 0000000..0566a9f
--- /dev/null
+++ b/Bitvault.Avalonia/VaultContentNavigationView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class VaultContentNavigationView : ListBoxItem
+{
+    public VaultContentNavigationView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/VaultContentView.axaml b/Bitvault.Avalonia/VaultContentView.axaml
new file mode 100644
index 0000000..3f98ade
--- /dev/null
+++ b/Bitvault.Avalonia/VaultContentView.axaml
@@ -0,0 +1,6 @@
+<UserControl
+    x:Class="Bitvault.Avalonia.VaultContentView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Vault content placeholder
+</UserControl>
diff --git a/Bitvault.Avalonia/VaultContentView.axaml.cs b/Bitvault.Avalonia/VaultContentView.axaml.cs
new file mode 100644
index 0000000..7f72690
--- /dev/null
+++ b/Bitvault.Avalonia/VaultContentView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class VaultContentView : UserControl
+{
+    public VaultContentView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/VaultHeaderView.axaml b/Bitvault.Avalonia/VaultHeaderView.axaml
new file mode 100644
index 0000000..9e62c0f
--- /dev/null
+++ b/Bitvault.Avalonia/VaultHeaderView.axaml
@@ -0,0 +1,27 @@
+<UserControl
+    x:Class="Bitvault.Avalonia.VaultHeaderView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:Bitvault"
+    x:DataType="vm:VaultHeaderViewModel">
+    <Grid ColumnDefinitions="*,Auto">
+        <TextBlock
+            Grid.Column="0"
+            Margin="16,0,0,0"
+            VerticalAlignment="Center"
+            Text="{Binding Value}"
+            Theme="{DynamicResource BodyStrongTextBlockStyle}" />
+        <ItemsControl
+            Grid.Column="1"
+            Margin="0,0,4,0"
+            VerticalAlignment="Center"
+            ItemTemplate="{ReflectionBinding Template}"
+            ItemsSource="{Binding}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Horizontal" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+    </Grid>
+</UserControl>
diff --git a/Bitvault.Avalonia/VaultHeaderView.axaml.cs b/Bitvault.Avalonia/VaultHeaderView.axaml.cs
new file mode 100644
index 0000000..f183505
--- /dev/null
+++ b/Bitvault.Avalonia/VaultHeaderView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class VaultHeaderView : UserControl
+{
+    public VaultHeaderView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/VaultSearchHeaderView.axaml b/Bitvault.Avalonia/VaultSearchHeaderView.axaml
new file mode 100644
index 0000000..4f723d0
--- /dev/null
+++ b/Bitvault.Avalonia/VaultSearchHeaderView.axaml
@@ -0,0 +1,6 @@
+<UserControl
+    x:Class="Bitvault.Avalonia.VaultSearchHeaderView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <AutoCompleteBox VerticalAlignment="Center" />
+</UserControl>
diff --git a/Bitvault.Avalonia/LockerNavigationView.axaml.cs b/Bitvault.Avalonia/VaultSearchHeaderView.axaml.cs
similarity index 55%
rename from Bitvault.Avalonia/LockerNavigationView.axaml.cs
rename to Bitvault.Avalonia/VaultSearchHeaderView.axaml.cs
index 6fb7ef7..d612112 100644
--- a/Bitvault.Avalonia/LockerNavigationView.axaml.cs
+++ b/Bitvault.Avalonia/VaultSearchHeaderView.axaml.cs
@@ -2,9 +2,9 @@ using Avalonia.Controls;
 
 namespace Bitvault.Avalonia
 {
-    public partial class LockerNavigationView : UserControl
+    public partial class VaultSearchHeaderView : UserControl
     {
-        public LockerNavigationView()
+        public VaultSearchHeaderView()
         {
             InitializeComponent();
         }
diff --git a/Bitvault.Avalonia/VaultView.axaml b/Bitvault.Avalonia/VaultView.axaml
index f6ae424..663eb54 100644
--- a/Bitvault.Avalonia/VaultView.axaml
+++ b/Bitvault.Avalonia/VaultView.axaml
@@ -11,29 +11,27 @@
         <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{DynamicResource SubtleFillColorSecondary}" />
         <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{DynamicResource SubtleFillColorTertiary}" />
     </UserControl.Resources>
-    <Grid ColumnDefinitions="1*,Auto,2*">
-        <Grid Grid.Column="0" RowDefinitions="Auto,*">
-            <Grid
-                Height="40"
-                Margin="0,4,0,0"
-                ColumnDefinitions="*,Auto">
-                <TextBlock Grid.Column="0" Text="{Binding Filter}" />
-                <Button
-                    Grid.Column="1"
-                    Width="{StaticResource ButtonWidth}"
-                    Height="{StaticResource ButtonHeight}"
-                    VerticalAlignment="Center"
-                    BorderThickness="0"
-                    Content="&#xE72B;"
-                    FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                    FontSize="16" />
-            </Grid>
-            <ListBox
-                Grid.Row="1"
-                Grid.Column="0"
-                Margin="0,-1,0,0"
-                ItemTemplate="{ReflectionBinding Template}"
-                ItemsSource="{Binding}" />
-        </Grid>
+    <Grid ColumnDefinitions="320,*" RowDefinitions="Auto,*">
+        <ContentControl
+            Grid.Row="0"
+            Grid.Column="0"
+            Height="40"
+            Margin="4,4,0,0">
+            <Interaction.Behaviors>
+                <EventTriggerBehavior EventName="Loaded">
+                    <NavigateAction Context="{Binding $self}" Route="VaultHeader" />
+                </EventTriggerBehavior>
+            </Interaction.Behaviors>
+        </ContentControl>
+        <ListBox
+            Grid.Row="1"
+            Grid.Column="0"
+            Margin="2,-1,0,0"
+            ItemTemplate="{ReflectionBinding Template}"
+            ItemsSource="{Binding}" />
+        <Frame
+            x:Name="Content"
+            Grid.Row="1"
+            Grid.Column="1" />
     </Grid>
 </UserControl>
diff --git a/Bitvault.Avalonia/VaultView.axaml.cs b/Bitvault.Avalonia/VaultView.axaml.cs
index 7839863..0bcc7e4 100644
--- a/Bitvault.Avalonia/VaultView.axaml.cs
+++ b/Bitvault.Avalonia/VaultView.axaml.cs
@@ -4,6 +4,7 @@ using Toolkit.Foundation;
 namespace Bitvault.Avalonia;
 
 [NavigationTarget("Header")]
+[NavigationTarget("Content")]
 public partial class VaultView : UserControl
 {
     public VaultView() => InitializeComponent();
diff --git a/Bitvault/AddVaultContentActionViewModel.cs b/Bitvault/AddVaultContentActionViewModel.cs
new file mode 100644
index 0000000..9f03402
--- /dev/null
+++ b/Bitvault/AddVaultContentActionViewModel.cs
@@ -0,0 +1,10 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public partial class AddVaultContentActionViewModel(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
+    IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);
diff --git a/Bitvault/AddVaultContentViewModel.cs b/Bitvault/AddVaultContentViewModel.cs
new file mode 100644
index 0000000..ea6f7a2
--- /dev/null
+++ b/Bitvault/AddVaultContentViewModel.cs
@@ -0,0 +1,10 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public partial class AddVaultContentViewModel(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
+    IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);
diff --git a/Bitvault/Locker.cs b/Bitvault/Content.cs
similarity index 94%
rename from Bitvault/Locker.cs
rename to Bitvault/Content.cs
index 92300fb..de7eddd 100644
--- a/Bitvault/Locker.cs
+++ b/Bitvault/Content.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public record Locker
+public record Content
 {
     [Key]
     public int Id { get; set; }
diff --git a/Bitvault/FilterVaultNavigationViewModel.cs b/Bitvault/FilterVaultNavigationViewModel.cs
index 90aa28b..c9e9435 100644
--- a/Bitvault/FilterVaultNavigationViewModel.cs
+++ b/Bitvault/FilterVaultNavigationViewModel.cs
@@ -38,5 +38,5 @@ public partial class FilterVaultNavigationViewModel : ObservableViewModel,
             Task.FromResult(Activated = true);
 
     [RelayCommand]
-    public async Task Invoke() => await Publisher.Publish(Vault.As(new Filter<string>(Filter)), nameof(VaultViewModel));
+    public async Task Invoke() => await Publisher.Publish(Vault.As(new Filter<string>(Filter)));
 }
\ No newline at end of file
diff --git a/Bitvault/MainViewModel.cs b/Bitvault/MainViewModel.cs
index b0c86f3..69597f7 100644
--- a/Bitvault/MainViewModel.cs
+++ b/Bitvault/MainViewModel.cs
@@ -3,7 +3,7 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-[Notification(nameof(MainViewModel))]
+[Enumerate(nameof(MainViewModel))]
 public partial class MainViewModel :
     ObservableCollectionViewModel<IMainNavigationViewModel>
 {
diff --git a/Bitvault/ManageNavigationViewModel.cs b/Bitvault/ManageNavigationViewModel.cs
index fa940e8..a639a15 100644
--- a/Bitvault/ManageNavigationViewModel.cs
+++ b/Bitvault/ManageNavigationViewModel.cs
@@ -9,44 +9,4 @@ public partial class ManageNavigationViewModel(IServiceProvider provider,
     ISubscriber subscriber,
     IDisposer disposer) :
     ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer),
-    IMainNavigationViewModel;
-
-public partial class VaultCommandViewModel : ObservableCollectionViewModel
-{
-    public VaultCommandViewModel(IServiceProvider provider, 
-        IServiceFactory factory,
-        IMediator mediator, 
-        IPublisher publisher,
-        ISubscriber subscriber,
-        IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
-    {
-        Add<SearchVaultCommandViewModel>();
-        Add<CreateLockerCommandViewModel>();
-    }
-}
-
-public partial class SearchVaultCommandViewModel :
-    ObservableCollectionViewModel
-{
-    public SearchVaultCommandViewModel(IServiceProvider provider,
-        IServiceFactory factory,
-        IMediator mediator,
-        IPublisher publisher,
-        ISubscriber subscriber,
-        IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
-    {
-    }
-}
-
-public partial class CreateLockerCommandViewModel : 
-    ObservableCollectionViewModel
-{
-    public CreateLockerCommandViewModel(IServiceProvider provider, 
-        IServiceFactory factory, 
-        IMediator mediator,
-        IPublisher publisher,
-        ISubscriber subscriber,
-        IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
-    {
-    }
-}
\ No newline at end of file
+    IMainNavigationViewModel;
\ No newline at end of file
diff --git a/Bitvault/VaultContentNavigationViewModel.cs b/Bitvault/VaultContentNavigationViewModel.cs
new file mode 100644
index 0000000..8ead72d
--- /dev/null
+++ b/Bitvault/VaultContentNavigationViewModel.cs
@@ -0,0 +1,32 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public partial class VaultContentNavigationViewModel(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
+    IDisposer disposer,
+    IContentTemplate template,
+    string name,
+    string description) :
+    ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
+{
+    [ObservableProperty]
+    private bool selected;
+
+    [ObservableProperty]
+    private string? name = name;
+
+    [ObservableProperty]
+    private string? description = description;
+
+    public IContentTemplate Template { get; set; } = template;
+
+    partial void OnSelectedChanged(bool value)
+    {
+        throw new NotImplementedException();
+    }
+}
\ No newline at end of file
diff --git a/Bitvault/LockerNavigationViewModel.cs b/Bitvault/VaultContentViewModel.cs
similarity index 84%
rename from Bitvault/LockerNavigationViewModel.cs
rename to Bitvault/VaultContentViewModel.cs
index ab6ab9a..2d15e8f 100644
--- a/Bitvault/LockerNavigationViewModel.cs
+++ b/Bitvault/VaultContentViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public class LockerNavigationViewModel(IServiceProvider provider,
+public class VaultContentViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/VaultDbContext.cs b/Bitvault/VaultDbContext.cs
index cac68d9..a2e9274 100644
--- a/Bitvault/VaultDbContext.cs
+++ b/Bitvault/VaultDbContext.cs
@@ -9,17 +9,17 @@ public class VaultDbContext(DbContextOptions<VaultDbContext> options) :
 
     public DbSet<Document> Documents { get; set; }
 
-    public DbSet<Locker> Lockers { get; set; }
+    public DbSet<Content> Items { get; set; }
 
     public DbSet<Tag> Tags { get; set; }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
-        modelBuilder.Entity<Locker>()
+        modelBuilder.Entity<Content>()
             .HasMany(x => x.Tags)
             .WithOne();
 
-        modelBuilder.Entity<Locker>()
+        modelBuilder.Entity<Content>()
             .HasMany(x => x.Documents)
             .WithOne();
     }
diff --git a/Bitvault/VaultHeaderViewModel.cs b/Bitvault/VaultHeaderViewModel.cs
new file mode 100644
index 0000000..79d9b27
--- /dev/null
+++ b/Bitvault/VaultHeaderViewModel.cs
@@ -0,0 +1,33 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public partial class VaultHeaderViewModel : ObservableCollectionViewModel<string, IDisposable>,
+    INotificationHandler<Vault<Filter<string>>>
+{
+    public VaultHeaderViewModel(IServiceProvider provider, 
+        IServiceFactory factory,
+        IMediator mediator,
+        IPublisher publisher,
+        ISubscriber subscriber,
+        IDisposer disposer,
+        IContentTemplate template) : base(provider, factory, mediator, publisher, subscriber, disposer)
+    {
+        Template = template;
+
+        Add<AddVaultContentActionViewModel>();
+    }
+
+    public IContentTemplate Template { get; set; }
+
+    public Task Handle(Vault<Filter<string>> args,
+        CancellationToken cancellationToken = default)
+    {
+        if (args.Value is Filter<string> filter)
+        {
+            Value = filter.Value;
+        }
+
+        return Task.CompletedTask;
+    }
+}
diff --git a/Bitvault/LockerViewModel.cs b/Bitvault/VaultItemViewModel.cs
similarity index 82%
rename from Bitvault/LockerViewModel.cs
rename to Bitvault/VaultItemViewModel.cs
index 7eaec7f..784d38d 100644
--- a/Bitvault/LockerViewModel.cs
+++ b/Bitvault/VaultItemViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public class LockerViewModel(IServiceProvider provider,
+public class VaultItemViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/VaultSearchHeaderViewModel.cs b/Bitvault/VaultSearchHeaderViewModel.cs
new file mode 100644
index 0000000..9e2864a
--- /dev/null
+++ b/Bitvault/VaultSearchHeaderViewModel.cs
@@ -0,0 +1,10 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public partial class VaultSearchHeaderViewModel(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator, 
+    IPublisher publisher,
+    ISubscriber subscriber,
+    IDisposer disposer) : ObservableViewModel<string>(provider, factory, mediator, publisher, subscriber, disposer);
diff --git a/Bitvault/VaultViewModel.cs b/Bitvault/VaultViewModel.cs
index 4a97a65..af090e6 100644
--- a/Bitvault/VaultViewModel.cs
+++ b/Bitvault/VaultViewModel.cs
@@ -3,7 +3,8 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-[Notification(nameof(VaultViewModel))]
+
+[Enumerate(nameof(VaultViewModel))]
 public partial class VaultViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
@@ -11,7 +12,7 @@ public partial class VaultViewModel(IServiceProvider provider,
     ISubscriber subscriber,
     IDisposer disposer,
     IContentTemplate template,
-    string? filter = null) : ObservableCollectionViewModel<LockerNavigationViewModel>(provider, factory, mediator, publisher, subscriber, disposer),
+    string? filter = null) : ObservableCollectionViewModel<VaultContentNavigationViewModel>(provider, factory, mediator, publisher, subscriber, disposer),
     INotificationHandler<Vault<Filter<string>>>
 {
     [ObservableProperty]
@@ -31,8 +32,8 @@ public partial class VaultViewModel(IServiceProvider provider,
         await base.Deactivated();
     }
 
-    protected override IEnumerate CreateEnumeration(object? key) => 
-        Enumerate<LockerNavigationViewModel>.With(new VaultViewModelOptions { Filter = Filter }) with { Key = key };
+    protected override IEnumerate PrepareEnumeration(object? key) => 
+        Enumerate<VaultContentNavigationViewModel>.With(new VaultViewModelOptions { Filter = Filter }) with { Key = key };
 
     public async Task Handle(Vault<Filter<string>> args, 
         CancellationToken cancellationToken = default)
diff --git a/Bitvault/VaultViewModelHandler.cs b/Bitvault/VaultViewModelHandler.cs
index 0e588f9..45f046e 100644
--- a/Bitvault/VaultViewModelHandler.cs
+++ b/Bitvault/VaultViewModelHandler.cs
@@ -4,18 +4,18 @@ namespace Bitvault;
 
 public class VaultViewModelHandler(IServiceFactory factory,
     IPublisher publisher) :
-    INotificationHandler<Enumerate<LockerNavigationViewModel, VaultViewModelOptions>>
+    INotificationHandler<Enumerate<VaultContentNavigationViewModel, VaultViewModelOptions>>
 {
-    public async Task Handle(Enumerate<LockerNavigationViewModel, VaultViewModelOptions> args,
+    public async Task Handle(Enumerate<VaultContentNavigationViewModel, VaultViewModelOptions> args,
         CancellationToken cancellationToken = default)
     {
         if (args.Options?.Filter is "All")
         {
             for (int i = 0; i < 100; i++)
             {
-                if (factory.Create<LockerNavigationViewModel>() is LockerNavigationViewModel viewModel)
+                if (factory.Create<VaultContentNavigationViewModel>("Name " + i, "Description " + 1) is VaultContentNavigationViewModel viewModel)
                 {
-                    await publisher.Publish(new Create<LockerNavigationViewModel>(viewModel),
+                    await publisher.Publish(new Create<VaultContentNavigationViewModel>(viewModel),
                         nameof(VaultViewModel), cancellationToken);
                 }
             }
@@ -25,9 +25,9 @@ public class VaultViewModelHandler(IServiceFactory factory,
         {
             for (int i = 0; i < 10; i++)
             {
-                if (factory.Create<LockerNavigationViewModel>() is LockerNavigationViewModel viewModel)
+                if (factory.Create<VaultContentNavigationViewModel>("Name " + i, "Description " + 1) is VaultContentNavigationViewModel viewModel)
                 {
-                    await publisher.Publish(new Create<LockerNavigationViewModel>(viewModel),
+                    await publisher.Publish(new Create<VaultContentNavigationViewModel>(viewModel),
                         nameof(VaultViewModel), cancellationToken);
                 }
             }
@@ -35,11 +35,11 @@ public class VaultViewModelHandler(IServiceFactory factory,
 
         if (args.Options?.Filter is "Archive")
         {
-            for (int i = 0; i < 100000; i++)
+            for (int i = 0; i < 1000; i++)
             {
-                if (factory.Create<LockerNavigationViewModel>() is LockerNavigationViewModel viewModel)
+                if (factory.Create<VaultContentNavigationViewModel>("Name " + i, "Description " + 1) is VaultContentNavigationViewModel viewModel)
                 {
-                    await publisher.Publish(new Create<LockerNavigationViewModel>(viewModel),
+                    await publisher.Publish(new Create<VaultContentNavigationViewModel>(viewModel),
                         nameof(VaultViewModel), cancellationToken);
                 }
             }