diff --git a/Bitvault.Avalonia/AddVaultContentActionView.axaml b/Bitvault.Avalonia/AddVaultContentActionView.axaml
index 6ad8284..fb7e283 100644
--- a/Bitvault.Avalonia/AddVaultContentActionView.axaml
+++ b/Bitvault.Avalonia/AddVaultContentActionView.axaml
@@ -1,7 +1,9 @@
 <UserControl
     x:Class="Bitvault.Avalonia.AddVaultContentActionView"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:Bitvault"
+    x:DataType="vm:AddVaultContentActionViewModel">
     <Button
         Grid.Column="1"
         Width="{StaticResource ButtonWidth}"
@@ -13,7 +15,7 @@
         ToolTip.Tip="Add item">
         <Interaction.Behaviors>
             <EventTriggerBehavior EventName="Click">
-                <NavigateAction Context="Content" Route="AddVaultContent" />
+                <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="AddVaultContent" />
             </EventTriggerBehavior>
         </Interaction.Behaviors>
     </Button>
diff --git a/Bitvault.Avalonia/AddVaultContentView.axaml b/Bitvault.Avalonia/AddVaultContentView.axaml
index 5f187d4..a444076 100644
--- a/Bitvault.Avalonia/AddVaultContentView.axaml
+++ b/Bitvault.Avalonia/AddVaultContentView.axaml
@@ -2,10 +2,11 @@
     x:Class="Bitvault.Avalonia.AddVaultContentView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ge="clr-namespace:GridExtra.Avalonia;assembly=GridExtra.Avalonia">
+    xmlns:vm="using:Bitvault"
+    x:DataType="vm:AddVaultContentViewModel">
     <Interaction.Behaviors>
         <EventTriggerBehavior EventName="Loaded">
-            <NavigateAction Context="ContentHeader" Route="AddVaultContentHeader" />
+            <NavigateAction Context="{Binding Named, StringFormat='{}{0}:ContentHeader'}" Route="AddVaultContentHeader" />
         </EventTriggerBehavior>
     </Interaction.Behaviors>
     <Grid>
@@ -34,7 +35,6 @@
                 <Setter Property="ResponsiveGrid.ExtraSmall" Value="12" />
             </Style>
         </Grid.Styles>
-
         <ResponsiveGrid>
             <Border Classes="Header" />
             <Border Classes="Section1" />
@@ -45,6 +45,5 @@
             <Border Classes="Section2" />
             <Border Classes="Footer" />
         </ResponsiveGrid>
-
     </Grid>
 </UserControl>
diff --git a/Bitvault/AddVaultContentActionViewModel.cs b/Bitvault/AddVaultContentActionViewModel.cs
index 190cf4d..7f811d7 100644
--- a/Bitvault/AddVaultContentActionViewModel.cs
+++ b/Bitvault/AddVaultContentActionViewModel.cs
@@ -1,4 +1,5 @@
-using Toolkit.Foundation;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Toolkit.Foundation;
 
 namespace Bitvault;
 
@@ -7,4 +8,10 @@ public partial class AddVaultContentActionViewModel(IServiceProvider provider,
     IMediator mediator,
     IPublisher publisher,
     ISubscriber subscriber,
-    IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);
\ No newline at end of file
+    IDisposer disposer,
+    NamedComponent named) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
+{
+
+    [ObservableProperty]
+    private string named = $"{named}";
+}
\ No newline at end of file
diff --git a/Bitvault/AddVaultContentViewModel.cs b/Bitvault/AddVaultContentViewModel.cs
index bc178d5..82d9eea 100644
--- a/Bitvault/AddVaultContentViewModel.cs
+++ b/Bitvault/AddVaultContentViewModel.cs
@@ -1,16 +1,16 @@
-using Toolkit.Foundation;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public partial class AddVaultContentViewModel : ObservableCollectionViewModel
+public partial class AddVaultContentViewModel(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
+    IDisposer disposer,
+    NamedComponent named) : ObservableCollectionViewModel(provider, factory, mediator, publisher, subscriber, disposer)
 {
-    public AddVaultContentViewModel(IServiceProvider provider, 
-        IServiceFactory factory, 
-        IMediator mediator,
-        IPublisher publisher,
-        ISubscriber subscriber, 
-        IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
-    {
-
-    }
+    [ObservableProperty]
+    private string named = $"{named}";
 }