diff --git a/Bitvault.Avalonia/AddItemContentNavigationViewModel.axaml b/Bitvault.Avalonia/AddItemContentNavigationViewModel.axaml
new file mode 100644
index 0000000..808bd0e
--- /dev/null
+++ b/Bitvault.Avalonia/AddItemContentNavigationViewModel.axaml
@@ -0,0 +1,6 @@
+<UserControl
+    x:Class="Bitvault.Avalonia.AddItemContentNavigationView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SettingsExpander Header="Add item" IsClickEnabled="True" />
+</UserControl>
diff --git a/Bitvault.Avalonia/AddItemContentNavigationViewModel.axaml.cs b/Bitvault.Avalonia/AddItemContentNavigationViewModel.axaml.cs
new file mode 100644
index 0000000..94f4907
--- /dev/null
+++ b/Bitvault.Avalonia/AddItemContentNavigationViewModel.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class AddItemContentNavigationView : UserControl
+{
+    public AddItemContentNavigationView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/App.axaml b/Bitvault.Avalonia/App.axaml
index 10e4f84..7f9a60e 100644
--- a/Bitvault.Avalonia/App.axaml
+++ b/Bitvault.Avalonia/App.axaml
@@ -5,21 +5,5 @@
     xmlns:ui="using:FluentAvalonia.UI.Controls">
     <Application.Styles>
         <ThemeResources PreferSystemTheme="True" PreferUserAccentColor="True" />
-        <Style Selector="ui|SettingsExpanderItem">
-            <Style Selector="^ /template/ Expander#Expander">
-                <Setter Property="IsVisible" Value="False" />
-            </Style>
-            <Style Selector="^:footerBottom /template/ ContentPresenter#FooterPresenter">
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-            </Style>
-        </Style>
-        <Style Selector="ui|SettingsExpander /template/ Expander#Expander ToggleButton">
-            <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-        </Style>
     </Application.Styles>
-    <Application.Resources>
-        <FontFamily x:Key="SymbolFontFamily">avares://HyperX.Launcher.Avalonia/Assets/SegoeIcons.ttf#Segoe Fluent Icons</FontFamily>
-        <x:Double x:Key="SettingsExpanderItemAdaptiveWidthTrigger">0</x:Double>
-        <Thickness x:Key="SettingsExpanderItemBottomFooterMargin">0,8,0,0</Thickness>
-    </Application.Resources>
 </Application>
diff --git a/Bitvault.Avalonia/App.axaml.cs b/Bitvault.Avalonia/App.axaml.cs
index 338d14f..3ebed38 100644
--- a/Bitvault.Avalonia/App.axaml.cs
+++ b/Bitvault.Avalonia/App.axaml.cs
@@ -108,6 +108,8 @@ public partial class App : Application
                         services.AddTemplate<DeleteItemActionViewModel, DeleteItemActionView>();
 
                         services.AddTemplate<ItemHeaderViewModel, ItemHeaderView>();
+                        services.AddTemplate<ItemContentViewModel, ItemContentView>();
+                        services.AddTemplate<AddItemContentNavigationViewModel, AddItemContentNavigationView>();
 
                         services.AddScoped<IValueStore<Item>, ValueStore<Item>>();
 
diff --git a/Bitvault.Avalonia/Bitvault.Avalonia.csproj b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
index c3a5e8a..1c0c64d 100644
--- a/Bitvault.Avalonia/Bitvault.Avalonia.csproj
+++ b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
@@ -40,6 +40,9 @@
 	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj" />
 	</ItemGroup>
 	<ItemGroup>
+	  <Compile Update="AddItemContentNavigationViewModel.axaml.cs">
+	    <DependentUpon>AddItemContentNavigationViewModel.axaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="CreateItemActionView.axaml.cs">
 	    <DependentUpon>CreateItemActionView.axaml</DependentUpon>
 	  </Compile>
@@ -61,6 +64,9 @@
 	  <Compile Update="ItemHeaderView.axaml.cs">
 	    <DependentUpon>ItemHeaderView.axaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="ItemContentView.axaml.cs">
+	    <DependentUpon>ItemContentView.axaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="OpenView.axaml.cs">
 	    <DependentUpon>OpenView.axaml</DependentUpon>
 	  </Compile>
diff --git a/Bitvault.Avalonia/ItemContentView.axaml b/Bitvault.Avalonia/ItemContentView.axaml
new file mode 100644
index 0000000..b1a5f0d
--- /dev/null
+++ b/Bitvault.Avalonia/ItemContentView.axaml
@@ -0,0 +1,8 @@
+<UserControl
+    x:Class="Bitvault.Avalonia.ItemContentView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:Bitvault"
+    x:DataType="vm:ItemContentViewModel">
+    <ItemsControl ItemTemplate="{ReflectionBinding Template}" ItemsSource="{Binding}" />
+</UserControl>
diff --git a/Bitvault.Avalonia/ItemContentView.axaml.cs b/Bitvault.Avalonia/ItemContentView.axaml.cs
new file mode 100644
index 0000000..1b241ec
--- /dev/null
+++ b/Bitvault.Avalonia/ItemContentView.axaml.cs
@@ -0,0 +1,9 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ItemContentView : UserControl
+{
+    public ItemContentView() => 
+        InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/ItemView.axaml b/Bitvault.Avalonia/ItemView.axaml
index 02d0732..925e1f3 100644
--- a/Bitvault.Avalonia/ItemView.axaml
+++ b/Bitvault.Avalonia/ItemView.axaml
@@ -13,6 +13,12 @@
         </AttachedBehaviour>
     </Interaction.Behaviors>
     <ScrollViewer Padding="12,12,12,0">
-        <ItemsControl ItemTemplate="{ReflectionBinding Template}" ItemsSource="{Binding}" />
+        <ItemsControl ItemTemplate="{ReflectionBinding Template}" ItemsSource="{Binding}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Spacing="24" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
     </ScrollViewer>
 </UserControl>
diff --git a/Bitvault/AddItemContentNavigationViewModel.cs b/Bitvault/AddItemContentNavigationViewModel.cs
new file mode 100644
index 0000000..15289b7
--- /dev/null
+++ b/Bitvault/AddItemContentNavigationViewModel.cs
@@ -0,0 +1,17 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public partial class AddItemContentNavigationViewModel : Observable,
+    IItemEntryViewModel
+{
+    public AddItemContentNavigationViewModel(IServiceProvider provider,
+        IServiceFactory factory,
+        IMediator mediator, 
+        IPublisher publisher, 
+        ISubscription subscriber, 
+        IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
+    {
+
+    }
+}
diff --git a/Bitvault/ItemContentViewModel.cs b/Bitvault/ItemContentViewModel.cs
new file mode 100644
index 0000000..30c195d
--- /dev/null
+++ b/Bitvault/ItemContentViewModel.cs
@@ -0,0 +1,26 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public partial class ItemContentViewModel :
+    ObservableCollection<IItemEntryViewModel>,
+    IItemEntryViewModel
+{
+    public ItemContentViewModel(IServiceProvider provider,
+        IServiceFactory factory, IMediator mediator,
+        IPublisher publisher,
+        ISubscription subscriber,
+        IDisposer disposer,
+        IContentTemplate template,
+        bool immutable = true) : base(provider, factory, mediator, publisher, subscriber, disposer)
+    {
+        Template = template;
+
+        if (!immutable)
+        {
+            Insert<AddItemContentNavigationViewModel>();
+        }
+    }
+
+    public IContentTemplate Template { get; set; }
+}
diff --git a/Bitvault/ItemViewModel.cs b/Bitvault/ItemViewModel.cs
index 183e5df..c1fa301 100644
--- a/Bitvault/ItemViewModel.cs
+++ b/Bitvault/ItemViewModel.cs
@@ -45,6 +45,7 @@ public partial class ItemViewModel :
         Name = name;
 
         Add<ItemHeaderViewModel>(immutable, name);
+        Add<ItemContentViewModel>(immutable);
     }
 
     public IContentTemplate Template { get; set; }