diff --git a/Bitvault.Avalonia/AllNavigationView.axaml b/Bitvault.Avalonia/AllNavigationView.axaml
index f57629f..fac82c2 100644
--- a/Bitvault.Avalonia/AllNavigationView.axaml
+++ b/Bitvault.Avalonia/AllNavigationView.axaml
@@ -14,7 +14,7 @@
                         <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="Container">
+                <NavigateAction Region="Main" Route="Container">
                     <NavigateAction.ParameterBindings>
                         <ParameterBinding Key="Filter" Value="{Binding Filter}" />
                     </NavigateAction.ParameterBindings>
diff --git a/Bitvault.Avalonia/ArchiveNavigationView.axaml b/Bitvault.Avalonia/ArchiveNavigationView.axaml
index 6516c31..16c8885 100644
--- a/Bitvault.Avalonia/ArchiveNavigationView.axaml
+++ b/Bitvault.Avalonia/ArchiveNavigationView.axaml
@@ -14,7 +14,7 @@
                         <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="Vault">
+                <NavigateAction Region="Main" Route="Vault">
                     <NavigateAction.ParameterBindings>
                         <ParameterBinding Key="Filter" Value="{Binding Filter}" />
                     </NavigateAction.ParameterBindings>
diff --git a/Bitvault.Avalonia/ContainerNavigationView.axaml b/Bitvault.Avalonia/ContainerNavigationView.axaml
index da91325..fca93e4 100644
--- a/Bitvault.Avalonia/ContainerNavigationView.axaml
+++ b/Bitvault.Avalonia/ContainerNavigationView.axaml
@@ -19,7 +19,7 @@
                         <ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="OpenContainer" />
+                <NavigateAction Region="Main" Route="OpenContainer" />
                 <ChangePropertyAction
                     PropertyName="SelectsOnInvoked"
                     TargetObject="{Binding #NavigationViewItem}"
@@ -47,7 +47,7 @@
                         <ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="OpenContainer" />
+                <NavigateAction Region="Main" Route="OpenContainer" />
             </ConditionAction>
             <ConditionAction>
                 <ConditionAction.Condition>
@@ -56,7 +56,7 @@
                         <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="Container" />
+                <NavigateAction Region="Main" Route="Container" />
                 <InvokeNavigationViewItemAction />
             </ConditionAction>
         </AttachedEventTriggerBehaviour>
diff --git a/Bitvault.Avalonia/ContainerView.axaml b/Bitvault.Avalonia/ContainerView.axaml
index 5be41e2..422eaa3 100644
--- a/Bitvault.Avalonia/ContainerView.axaml
+++ b/Bitvault.Avalonia/ContainerView.axaml
@@ -11,9 +11,9 @@
             Height="40"
             Margin="4,4,0,0">
             <Interaction.Behaviors>
-                <EventTriggerBehavior EventName="Loaded">
-                    <NavigateAction Context="{Binding $self}" Route="ContainerHeader" />
-                </EventTriggerBehavior>
+                <AttachedBehaviour>
+                    <NavigateAction Region="{Binding $self}" Route="ContainerHeader" />
+                </AttachedBehaviour>
             </Interaction.Behaviors>
         </ContentControl>
         <ListBox
diff --git a/Bitvault.Avalonia/CreateContainerNavigationView.axaml b/Bitvault.Avalonia/CreateContainerNavigationView.axaml
index 3cc32fd..5301865 100644
--- a/Bitvault.Avalonia/CreateContainerNavigationView.axaml
+++ b/Bitvault.Avalonia/CreateContainerNavigationView.axaml
@@ -8,7 +8,7 @@
         <Button MinWidth="132" Content="Create vault">
             <Interaction.Behaviors>
                 <EventTriggerBehavior EventName="Click">
-                    <NavigateAction Route="CreateContainer" />
+                    <NavigateAction Region="self" Route="CreateContainer" />
                 </EventTriggerBehavior>
             </Interaction.Behaviors>
         </Button>
diff --git a/Bitvault.Avalonia/CreateItemActionView.axaml b/Bitvault.Avalonia/CreateItemActionView.axaml
index 580ced5..59aa433 100644
--- a/Bitvault.Avalonia/CreateItemActionView.axaml
+++ b/Bitvault.Avalonia/CreateItemActionView.axaml
@@ -16,11 +16,11 @@
         <Interaction.Behaviors>
             <EventTriggerBehavior EventName="Click">
                 <NavigateAction
-                    Context="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
+                    Region="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
                     Route="ItemCommandHeader"
                     Scope="self" />
                 <NavigateAction
-                    Context="{Binding Named, StringFormat='{}{0}:Content'}"
+                    Region="{Binding Named, StringFormat='{}{0}:Content'}"
                     Route="Item"
                     Scope="self">
                     <NavigateAction.ParameterBindings>
diff --git a/Bitvault.Avalonia/ItemNavigationView.axaml b/Bitvault.Avalonia/ItemNavigationView.axaml
index d097bbd..d5003c1 100644
--- a/Bitvault.Avalonia/ItemNavigationView.axaml
+++ b/Bitvault.Avalonia/ItemNavigationView.axaml
@@ -8,11 +8,11 @@
     <Interaction.Behaviors>
         <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
             <NavigateAction
-                Context="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
+                Region="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
                 Route="ItemCommandHeader"
                 Scope="self" />
             <NavigateAction
-                Context="{Binding Named, StringFormat='{}{0}:Content'}"
+                Region="{Binding Named, StringFormat='{}{0}:Content'}"
                 Route="Item"
                 Scope="self">
                 <NavigateAction.ParameterBindings>
diff --git a/Bitvault.Avalonia/MainView.axaml b/Bitvault.Avalonia/MainView.axaml
index ffb796d..c1a5984 100644
--- a/Bitvault.Avalonia/MainView.axaml
+++ b/Bitvault.Avalonia/MainView.axaml
@@ -16,7 +16,7 @@
             <Interaction.Behaviors>
                 <EventTriggerBehavior EventName="Loaded">
                     <NavigateRegionAction Name="Main">
-                        <NavigateAction Context="Main" Route="Container" />
+                        <NavigateAction Region="Main" Route="Container" />
                     </NavigateRegionAction>
                 </EventTriggerBehavior>
             </Interaction.Behaviors>
diff --git a/Bitvault.Avalonia/MainWindow.axaml b/Bitvault.Avalonia/MainWindow.axaml
index 17bed2c..2eb4c38 100644
--- a/Bitvault.Avalonia/MainWindow.axaml
+++ b/Bitvault.Avalonia/MainWindow.axaml
@@ -11,7 +11,7 @@
         <Interaction.Behaviors>
             <AttachedBehaviour>
                 <NavigateRegionAction Name="Window">
-                    <NavigateAction Context="Window" Route="Main" />
+                    <NavigateAction Region="Window" Route="Main" />
                 </NavigateRegionAction>
             </AttachedBehaviour>
         </Interaction.Behaviors>
diff --git a/Bitvault.Avalonia/ManageNavigationView.axaml b/Bitvault.Avalonia/ManageNavigationView.axaml
index 8e0ae9c..d24c3de 100644
--- a/Bitvault.Avalonia/ManageNavigationView.axaml
+++ b/Bitvault.Avalonia/ManageNavigationView.axaml
@@ -5,7 +5,7 @@
     Content="Manage Vaults">
     <Interaction.Behaviors>
         <EventTriggerBehavior EventName="Tapped">
-            <NavigateAction Context="Main" Route="Manage" />
+            <NavigateAction Region="Main" Route="Manage" />
         </EventTriggerBehavior>
     </Interaction.Behaviors>
 </NavigationViewItem>
diff --git a/Bitvault.Avalonia/StarredNavigationView.axaml b/Bitvault.Avalonia/StarredNavigationView.axaml
index 0a2dacc..07269ee 100644
--- a/Bitvault.Avalonia/StarredNavigationView.axaml
+++ b/Bitvault.Avalonia/StarredNavigationView.axaml
@@ -14,7 +14,7 @@
                         <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="Vault">
+                <NavigateAction Region="Main" Route="Vault">
                     <NavigateAction.ParameterBindings>
                         <ParameterBinding Key="Filter" Value="{Binding Filter}" />
                     </NavigateAction.ParameterBindings>
diff --git a/Bitvault/ItemViewModel.cs b/Bitvault/ItemViewModel.cs
index 238b14e..ecbdee4 100644
--- a/Bitvault/ItemViewModel.cs
+++ b/Bitvault/ItemViewModel.cs
@@ -19,7 +19,6 @@ public partial class ItemViewModel :
         ISubscription subscriber, 
         IDisposer disposer,
         IContentTemplate template,
-        IValueStore<Item> foom,
         bool immutable = true,
         int? id = null,
         string? name = null) : base(provider, factory, mediator, publisher, subscriber, disposer)