diff --git a/Bitvault.Avalonia/AddItemActionView.axaml.cs b/Bitvault.Avalonia/AddItemActionView.axaml.cs
deleted file mode 100644
index b5e7c6d..0000000
--- a/Bitvault.Avalonia/AddItemActionView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class AddItemActionView : UserControl
-{
-    public AddItemActionView() => InitializeComponent();
-}
diff --git a/Bitvault.Avalonia/App.axaml.cs b/Bitvault.Avalonia/App.axaml.cs
index 1809207..5a16779 100644
--- a/Bitvault.Avalonia/App.axaml.cs
+++ b/Bitvault.Avalonia/App.axaml.cs
@@ -83,7 +83,7 @@ public partial class App : Application
 
                         services.AddTemplate<SearchHeaderViewModel, SearchHeaderView>("SearchHeader");
                         services.AddTemplate<ContainerHeaderViewModel, ContainerHeaderView>("ContainerHeader");
-                        services.AddTemplate<AddItemActionViewModel, AddItemActionView>();
+                        services.AddTemplate<CreateItemActionViewModel, CreateItemActionView>();
 
                         services.AddTemplate<ItemNavigationViewModel, ItemNavigationView>();
                         services.AddTemplate<ItemViewModel, ItemView>("Item");
@@ -92,6 +92,9 @@ public partial class App : Application
 
                         services.AddTemplate<ConfirmItemActionViewModel, ConfirmItemActionView>();
                         services.AddTemplate<DismissItemActionViewModel, DismissItemActionView>();
+                        services.AddTemplate<ArchiveItemActionViewModel, ArchiveItemActionView>();
+                        services.AddTemplate<EditItemActionViewModel, EditItemActionView>();
+                        services.AddTemplate<DeleteItemActionViewModel, DeleteItemActionView>();
 
                         services.AddTemplate<ItemHeaderViewModel, ItemHeaderView>();
 
diff --git a/Bitvault.Avalonia/ArchiveItemActionView.axaml b/Bitvault.Avalonia/ArchiveItemActionView.axaml
new file mode 100644
index 0000000..1eeffa9
--- /dev/null
+++ b/Bitvault.Avalonia/ArchiveItemActionView.axaml
@@ -0,0 +1,21 @@
+<UserControl
+    x:Class="Bitvault.Avalonia.ArchiveItemActionView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:Bitvault"
+    x:DataType="vm:ArchiveItemActionViewModel">
+    <Button
+        Width="{StaticResource ButtonWidth}"
+        Height="{StaticResource ButtonHeight}"
+        VerticalAlignment="Center"
+        Command="{Binding InvokeCommand}"
+        Foreground="{DynamicResource IconForegroundBrush}"
+        ToolTip.Tip="Archive">
+        <TextBlock
+            VerticalAlignment="Center"
+            FontFamily="{DynamicResource SymbolThemeFontFamily}"
+            FontSize="16"
+            Foreground="{DynamicResource IconForegroundBrush}"
+            Text="&#xE107;" />
+    </Button>
+</UserControl>
diff --git a/Bitvault.Avalonia/ArchiveItemActionView.axaml.cs b/Bitvault.Avalonia/ArchiveItemActionView.axaml.cs
new file mode 100644
index 0000000..3eb2c1e
--- /dev/null
+++ b/Bitvault.Avalonia/ArchiveItemActionView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ArchiveItemActionView : UserControl
+{
+    public ArchiveItemActionView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/Bitvault.Avalonia.csproj b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
index b04ec4f..1519675 100644
--- a/Bitvault.Avalonia/Bitvault.Avalonia.csproj
+++ b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
@@ -40,8 +40,8 @@
 	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Compile Update="AddItemActionView.axaml.cs">
-	    <DependentUpon>AddItemActionView.axaml</DependentUpon>
+	  <Compile Update="CreateItemActionView.axaml.cs">
+	    <DependentUpon>CreateItemActionView.axaml</DependentUpon>
 	  </Compile>
 	  <Compile Update="ItemCommandHeaderView.axaml.cs">
 	    <DependentUpon>ItemCommandHeaderView.axaml</DependentUpon>
diff --git a/Bitvault.Avalonia/ContainerView.axaml b/Bitvault.Avalonia/ContainerView.axaml
index 1121b2e..44f65d4 100644
--- a/Bitvault.Avalonia/ContainerView.axaml
+++ b/Bitvault.Avalonia/ContainerView.axaml
@@ -21,7 +21,9 @@
             Grid.Column="0"
             Margin="2,-1,0,0"
             ItemTemplate="{ReflectionBinding Template}"
-            ItemsSource="{Binding}">
+            ItemsSource="{Binding}"
+            SelectedIndex="{Binding SelectedIndex}"
+            SelectionMode="AlwaysSelected">
             <ListBox.Styles>
                 <Style Selector="ListBoxItem">
                     <Setter Property="IsSelected" Value="{ReflectionBinding Selected}" />
diff --git a/Bitvault.Avalonia/AddItemActionView.axaml b/Bitvault.Avalonia/CreateItemActionView.axaml
similarity index 73%
rename from Bitvault.Avalonia/AddItemActionView.axaml
rename to Bitvault.Avalonia/CreateItemActionView.axaml
index 7c75400..580ced5 100644
--- a/Bitvault.Avalonia/AddItemActionView.axaml
+++ b/Bitvault.Avalonia/CreateItemActionView.axaml
@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.AddItemActionView"
+    x:Class="Bitvault.Avalonia.CreateItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:AddItemActionViewModel">
+    x:DataType="vm:CreateItemActionViewModel">
     <Button
         Grid.Column="1"
         Width="{StaticResource ButtonWidth}"
@@ -22,7 +22,11 @@
                 <NavigateAction
                     Context="{Binding Named, StringFormat='{}{0}:Content'}"
                     Route="Item"
-                    Scope="self" />
+                    Scope="self">
+                    <NavigateAction.ParameterBindings>
+                        <ParameterBinding Key="Immutable" Value="{x:False}" />
+                    </NavigateAction.ParameterBindings>
+                </NavigateAction>
             </EventTriggerBehavior>
         </Interaction.Behaviors>
     </Button>
diff --git a/Bitvault.Avalonia/CreateItemActionView.axaml.cs b/Bitvault.Avalonia/CreateItemActionView.axaml.cs
new file mode 100644
index 0000000..69955e6
--- /dev/null
+++ b/Bitvault.Avalonia/CreateItemActionView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class CreateItemActionView : UserControl
+{
+    public CreateItemActionView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/DeleteItemActionView.axaml b/Bitvault.Avalonia/DeleteItemActionView.axaml
new file mode 100644
index 0000000..e0afb11
--- /dev/null
+++ b/Bitvault.Avalonia/DeleteItemActionView.axaml
@@ -0,0 +1,21 @@
+<UserControl
+    x:Class="Bitvault.Avalonia.DeleteItemActionView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:Bitvault"
+    x:DataType="vm:DeleteItemActionViewModel">
+    <Button
+        Width="{StaticResource ButtonWidth}"
+        Height="{StaticResource ButtonHeight}"
+        VerticalAlignment="Center"
+        Command="{Binding InvokeCommand}"
+        Foreground="{DynamicResource IconForegroundBrush}"
+        ToolTip.Tip="Delete">
+        <TextBlock
+            VerticalAlignment="Center"
+            FontFamily="{DynamicResource SymbolThemeFontFamily}"
+            FontSize="16"
+            Foreground="{DynamicResource IconForegroundBrush}"
+            Text="&#xE107;" />
+    </Button>
+</UserControl>
diff --git a/Bitvault.Avalonia/DeleteItemActionView.axaml.cs b/Bitvault.Avalonia/DeleteItemActionView.axaml.cs
new file mode 100644
index 0000000..23ab526
--- /dev/null
+++ b/Bitvault.Avalonia/DeleteItemActionView.axaml.cs
@@ -0,0 +1,12 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia
+{
+    public partial class DeleteItemActionView : UserControl
+    {
+        public DeleteItemActionView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Bitvault.Avalonia/DismissItemActionView.axaml b/Bitvault.Avalonia/DismissItemActionView.axaml
index a3491a0..81af79d 100644
--- a/Bitvault.Avalonia/DismissItemActionView.axaml
+++ b/Bitvault.Avalonia/DismissItemActionView.axaml
@@ -7,7 +7,7 @@
         Height="{StaticResource ButtonHeight}"
         VerticalAlignment="Center"
         Foreground="{DynamicResource IconForegroundBrush}"
-        ToolTip.Tip="Save">
+        ToolTip.Tip="Cancel">
         <TextBlock
             VerticalAlignment="Center"
             FontFamily="{DynamicResource SymbolThemeFontFamily}"
diff --git a/Bitvault.Avalonia/EditItemActionView.axaml b/Bitvault.Avalonia/EditItemActionView.axaml
new file mode 100644
index 0000000..499ab2f
--- /dev/null
+++ b/Bitvault.Avalonia/EditItemActionView.axaml
@@ -0,0 +1,21 @@
+<UserControl
+    x:Class="Bitvault.Avalonia.EditItemActionView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:Bitvault"
+    x:DataType="vm:EditItemActionViewModel">
+    <Button
+        Width="{StaticResource ButtonWidth}"
+        Height="{StaticResource ButtonHeight}"
+        VerticalAlignment="Center"
+        Command="{Binding InvokeCommand}"
+        Foreground="{DynamicResource IconForegroundBrush}"
+        ToolTip.Tip="Edit">
+        <TextBlock
+            VerticalAlignment="Center"
+            FontFamily="{DynamicResource SymbolThemeFontFamily}"
+            FontSize="16"
+            Foreground="{DynamicResource IconForegroundBrush}"
+            Text="&#xE104;" />
+    </Button>
+</UserControl>
diff --git a/Bitvault.Avalonia/EditItemActionView.axaml.cs b/Bitvault.Avalonia/EditItemActionView.axaml.cs
new file mode 100644
index 0000000..04d34a6
--- /dev/null
+++ b/Bitvault.Avalonia/EditItemActionView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class EditItemActionView : UserControl
+{
+    public EditItemActionView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/ItemHeaderView.axaml b/Bitvault.Avalonia/ItemHeaderView.axaml
index 0111a7a..b7d105b 100644
--- a/Bitvault.Avalonia/ItemHeaderView.axaml
+++ b/Bitvault.Avalonia/ItemHeaderView.axaml
@@ -11,7 +11,15 @@
             DisplayName="{Binding Value}" />
         <TextBox
             MaxWidth="360"
+            IsVisible="{Binding !Immutable}"
             Text="{Binding Value}"
+            TextAlignment="Center"
             Watermark="Enter name" />
+        <SelectableTextBlock
+            MaxWidth="360"
+            IsVisible="{Binding Immutable}"
+            SelectionBrush="Red"
+            Text="{Binding Value}"
+            TextAlignment="Center" />
     </StackPanel>
 </UserControl>
diff --git a/Bitvault.Avalonia/ItemNavigationView.axaml b/Bitvault.Avalonia/ItemNavigationView.axaml
index 4e3aa3d..9de9760 100644
--- a/Bitvault.Avalonia/ItemNavigationView.axaml
+++ b/Bitvault.Avalonia/ItemNavigationView.axaml
@@ -12,6 +12,7 @@
                 Scope="self" />
             <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="Item">
                 <NavigateAction.ParameterBindings>
+                    <ParameterBinding Key="Immutable" Value="{x:True}" />
                     <ParameterBinding Key="Id" Value="{Binding Id}" />
                     <ParameterBinding Key="Name" Value="{Binding Name}" />
                 </NavigateAction.ParameterBindings>
diff --git a/Bitvault/Archive.cs b/Bitvault/Archive.cs
new file mode 100644
index 0000000..08d5aa5
--- /dev/null
+++ b/Bitvault/Archive.cs
@@ -0,0 +1,10 @@
+namespace Bitvault;
+
+public record Archive
+{
+    public static ArchiveEventArgs<TValue> As<TValue>(TValue value) =>
+        new(value);
+
+    public static ArchiveEventArgs<TValue> As<TValue>() where TValue : new() =>
+        new(new TValue());
+}
diff --git a/Bitvault/ArchiveEventArgs.cs b/Bitvault/ArchiveEventArgs.cs
new file mode 100644
index 0000000..ec670e7
--- /dev/null
+++ b/Bitvault/ArchiveEventArgs.cs
@@ -0,0 +1,3 @@
+namespace Bitvault;
+
+public record ArchiveEventArgs<TValue>(TValue Value);
diff --git a/Bitvault/ArchiveItemActionViewModel.cs b/Bitvault/ArchiveItemActionViewModel.cs
new file mode 100644
index 0000000..2da63f2
--- /dev/null
+++ b/Bitvault/ArchiveItemActionViewModel.cs
@@ -0,0 +1,15 @@
+using CommunityToolkit.Mvvm.Input;
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public partial class ArchiveItemActionViewModel(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
+    IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
+{
+    [RelayCommand]
+    public async Task Invoke() => await Publisher.Publish(Archive.As<Item>());
+}
diff --git a/Bitvault/ContainerHeaderViewModel.cs b/Bitvault/ContainerHeaderViewModel.cs
index 1f4a9d0..85b493e 100644
--- a/Bitvault/ContainerHeaderViewModel.cs
+++ b/Bitvault/ContainerHeaderViewModel.cs
@@ -3,7 +3,7 @@
 namespace Bitvault;
 
 public partial class ContainerHeaderViewModel : ObservableCollectionViewModel<string, IDisposable>,
-    INotificationHandler<ActivateEventArgs<Filter<string>>>
+    INotificationHandler<RequestEventArgs<Filter<string>>>
 {
     public ContainerHeaderViewModel(IServiceProvider provider, 
         IServiceFactory factory,
@@ -15,12 +15,12 @@ public partial class ContainerHeaderViewModel : ObservableCollectionViewModel<st
     {
         Template = template;
 
-        Add<AddItemActionViewModel>(scope: true);
+        Add<CreateItemActionViewModel>(scope: true);
     }
 
     public IContentTemplate Template { get; set; }
 
-    public Task Handle(ActivateEventArgs<Filter<string>> args,
+    public Task Handle(RequestEventArgs<Filter<string>> args,
         CancellationToken cancellationToken = default)
     {
         if (args.Value is Filter<string> filter)
diff --git a/Bitvault/AddItemActionViewModel.cs b/Bitvault/CreateItemActionViewModel.cs
similarity index 84%
rename from Bitvault/AddItemActionViewModel.cs
rename to Bitvault/CreateItemActionViewModel.cs
index fb4d563..f4a2a4d 100644
--- a/Bitvault/AddItemActionViewModel.cs
+++ b/Bitvault/CreateItemActionViewModel.cs
@@ -3,7 +3,7 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public partial class AddItemActionViewModel(IServiceProvider provider,
+public partial class CreateItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/DeleteItemActionViewModel.cs b/Bitvault/DeleteItemActionViewModel.cs
index 6d0fc13..f139ef1 100644
--- a/Bitvault/DeleteItemActionViewModel.cs
+++ b/Bitvault/DeleteItemActionViewModel.cs
@@ -1,4 +1,5 @@
-using Toolkit.Foundation;
+using CommunityToolkit.Mvvm.Input;
+using Toolkit.Foundation;
 
 namespace Bitvault;
 
@@ -7,4 +8,8 @@ public partial class DeleteItemActionViewModel(IServiceProvider provider,
     IMediator mediator,
     IPublisher publisher,
     ISubscriber subscriber,
-    IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);
+    IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
+{
+    [RelayCommand]
+    public async Task Invoke() => await Publisher.Publish(Delete.As<Item>());
+}
diff --git a/Bitvault/EditItemActionViewModel.cs b/Bitvault/EditItemActionViewModel.cs
index 20bb91f..0f056c4 100644
--- a/Bitvault/EditItemActionViewModel.cs
+++ b/Bitvault/EditItemActionViewModel.cs
@@ -1,4 +1,5 @@
-using Toolkit.Foundation;
+using CommunityToolkit.Mvvm.Input;
+using Toolkit.Foundation;
 
 namespace Bitvault;
 
@@ -7,5 +8,9 @@ public partial class EditItemActionViewModel(IServiceProvider provider,
     IMediator mediator,
     IPublisher publisher,
     ISubscriber subscriber,
-    IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);
+    IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
+{
+    [RelayCommand]
+    public async Task Invoke() => await Publisher.Publish(Edit.As<Item>());
+}
 
diff --git a/Bitvault/FilterContainerNavigationViewModel.cs b/Bitvault/FilterContainerNavigationViewModel.cs
index 5beeac2..1273066 100644
--- a/Bitvault/FilterContainerNavigationViewModel.cs
+++ b/Bitvault/FilterContainerNavigationViewModel.cs
@@ -38,5 +38,5 @@ public partial class FilterContainerNavigationViewModel : ObservableViewModel,
             Task.FromResult(Activated = true);
 
     [RelayCommand]
-    public async Task Invoke() => await Publisher.Publish(Request.As(new Filter<string>(Filter)));
+    public async Task Invoke() => await Publisher.Publish(Request.As(new Filter<string>(Filter)), nameof(ContainerViewModel));
 }
\ No newline at end of file
diff --git a/Bitvault/ItemCommandHeaderViewModel.cs b/Bitvault/ItemCommandHeaderViewModel.cs
index bb2557b..729a4ce 100644
--- a/Bitvault/ItemCommandHeaderViewModel.cs
+++ b/Bitvault/ItemCommandHeaderViewModel.cs
@@ -14,6 +14,9 @@ public partial class ItemCommandHeaderViewModel : ObservableCollectionViewModel
     {
         Add<ConfirmItemActionViewModel>();
         Add<DismissItemActionViewModel>();
+        Add<EditItemActionViewModel>();
+        Add<DeleteItemActionViewModel>();
+        Add<ArchiveItemActionViewModel>();
 
         Template = template;
     }
diff --git a/Bitvault/ItemHeaderViewModel.cs b/Bitvault/ItemHeaderViewModel.cs
index 11df9c5..8d6eb8e 100644
--- a/Bitvault/ItemHeaderViewModel.cs
+++ b/Bitvault/ItemHeaderViewModel.cs
@@ -1,4 +1,5 @@
-using Toolkit.Foundation;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Toolkit.Foundation;
 
 namespace Bitvault;
 
@@ -8,10 +9,13 @@ public partial class ItemHeaderViewModel(IServiceProvider provider,
     IPublisher publisher,
     ISubscriber subscriber,
     IDisposer disposer,
+    bool immutable,
     string? value = null) : ObservableViewModel<string, string>(provider, factory, mediator, publisher, subscriber, disposer, value),
     IItemViewModel
 {
+    [ObservableProperty]
+    private bool immutable = immutable;
+
     public void Invoke(ItemConfiguration args) => 
         args.Name = Value;
-
 }
diff --git a/Bitvault/ItemNavigationViewModel.cs b/Bitvault/ItemNavigationViewModel.cs
index f8e1897..8e631ee 100644
--- a/Bitvault/ItemNavigationViewModel.cs
+++ b/Bitvault/ItemNavigationViewModel.cs
@@ -14,7 +14,9 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
     int id,
     string name,
     string description) :
-    ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
+    ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer),
+    INotificationHandler<ArchiveEventArgs<Item>>,
+    IRemovable
 {
     [ObservableProperty]
     private string? description = description;
@@ -31,4 +33,11 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
     [ObservableProperty]
     private bool selected;
     public IContentTemplate Template { get; set; } = template;
+
+    public Task Handle(ArchiveEventArgs<Item> args, 
+        CancellationToken cancellationToken = default)
+    {
+        Dispose();
+        return Task.CompletedTask;
+    }
 }
\ No newline at end of file
diff --git a/Bitvault/ItemViewModel.cs b/Bitvault/ItemViewModel.cs
index 86df5fd..a286f01 100644
--- a/Bitvault/ItemViewModel.cs
+++ b/Bitvault/ItemViewModel.cs
@@ -13,6 +13,9 @@ public partial class ItemViewModel :
     [ObservableProperty]
     private string named;
 
+    [ObservableProperty]
+    private bool immutable;
+
     public ItemViewModel(IServiceProvider provider, 
         IServiceFactory factory, 
         IMediator mediator,
@@ -21,14 +24,16 @@ public partial class ItemViewModel :
         IDisposer disposer,
         IContentTemplate template,
         NamedComponent named,
+        bool immutable = true,
         int? id = null,
         string? name = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
         Template = template;
         Named = $"{named}";
         Id = id;
+        Immutable = immutable;
 
-        Add<ItemHeaderViewModel>(name ?? "");
+        Add<ItemHeaderViewModel>(immutable, name ?? "");
     }
 
     public IContentTemplate Template { get; set; }