diff --git a/Wallet.Avalonia/AllNavigationView.axaml b/Wallet.Avalonia/AllNavigationView.axaml
index 6ead957..5ec18e3 100644
--- a/Wallet.Avalonia/AllNavigationView.axaml
+++ b/Wallet.Avalonia/AllNavigationView.axaml
@@ -15,7 +15,7 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Wallet">
-                    <Parameter Key="Filter" Value="{Binding Filter}" />
+                    <Parameter Key="Filter" Value="{Binding Value}" />
                 </NavigateAction>
             </ConditionAction>
             <ConditionAction>
@@ -25,7 +25,7 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Left" Route="ItemCollection">
-                    <Parameter Key="Filter" Value="{Binding Filter}" />
+                    <Parameter Key="Filter" Value="{Binding Value}" />
                     <Parameter Key="Transition" Value="FromRight" />
                     <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
                     <Parameter Key="ClearBackStack" Value="{x:True}" />
@@ -33,4 +33,7 @@
             </ConditionAction>
         </DataTriggerBehavior>
     </Interaction.Behaviors>
+    <NavigationViewItem.InfoBadge>
+        <InfoBadge Value="{Binding Key}" />
+    </NavigationViewItem.InfoBadge>
 </NavigationViewItem>
diff --git a/Wallet.Avalonia/App.axaml.cs b/Wallet.Avalonia/App.axaml.cs
index 4484820..4c6ce6f 100644
--- a/Wallet.Avalonia/App.axaml.cs
+++ b/Wallet.Avalonia/App.axaml.cs
@@ -108,6 +108,7 @@ public partial class App : Application
                         services.AddHandler<CreateItemHandler>();
                         services.AddHandler<UpdateItemHander>();
                         services.AddHandler<UpdateItemStateHandler>();
+                        services.AddHandler<CountCategoriesHandler>();
 
                         services.AddHandler<OpenWalletHandler>();
 
@@ -184,6 +185,8 @@ public partial class App : Application
 
                         services.AddHandler<HyperlinkHandler>();
 
+                        services.AddHandler<ItemChangedHandler>(ServiceLifetime.Singleton);
+
                         services.AddHandler<ArchiveItemHandler>();
                         services.AddHandler<UnarchiveItemHandler>();
                         services.AddHandler<FavouriteItemHandler>();
diff --git a/Wallet.Avalonia/ArchiveNavigationView.axaml b/Wallet.Avalonia/ArchiveNavigationView.axaml
index 549b3a1..6a0a757 100644
--- a/Wallet.Avalonia/ArchiveNavigationView.axaml
+++ b/Wallet.Avalonia/ArchiveNavigationView.axaml
@@ -15,7 +15,7 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Wallet">
-                    <Parameter Key="Filter" Value="{Binding Filter}" />
+                    <Parameter Key="Filter" Value="{Binding Value}" />
                 </NavigateAction>
             </ConditionAction>
             <ConditionAction>
@@ -25,7 +25,7 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Left" Route="ItemCollection">
-                    <Parameter Key="Filter" Value="{Binding Filter}" />
+                    <Parameter Key="Filter" Value="{Binding Value}" />
                     <Parameter Key="Transition" Value="FromRight" />
                     <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
                     <Parameter Key="ClearBackStack" Value="{x:True}" />
@@ -33,4 +33,7 @@
             </ConditionAction>
         </DataTriggerBehavior>
     </Interaction.Behaviors>
+    <NavigationViewItem.InfoBadge>
+        <InfoBadge Value="{Binding Key}" />
+    </NavigationViewItem.InfoBadge>
 </NavigationViewItem>
diff --git a/Wallet.Avalonia/CategoryNavigationView.axaml b/Wallet.Avalonia/CategoryNavigationView.axaml
index 4865dfd..565f3e6 100644
--- a/Wallet.Avalonia/CategoryNavigationView.axaml
+++ b/Wallet.Avalonia/CategoryNavigationView.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Wallet"
     x:DataType="vm:CategoryNavigationViewModel"
-    Content="{Binding Filter}"
+    Content="{Binding Value}"
     IsSelected="{Binding Selected}">
     <Interaction.Behaviors>
         <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
@@ -15,7 +15,7 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Wallet">
-                    <Parameter Key="Filter" Value="{Binding Filter}" />
+                    <Parameter Key="Filter" Value="{Binding Value}" />
                 </NavigateAction>
             </ConditionAction>
             <ConditionAction>
@@ -25,7 +25,7 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Left" Route="ItemCollection">
-                    <Parameter Key="Filter" Value="{Binding Filter}" />
+                    <Parameter Key="Filter" Value="{Binding Value}" />
                     <Parameter Key="Transition" Value="FromRight" />
                     <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
                     <Parameter Key="ClearBackStack" Value="{x:True}" />
diff --git a/Wallet.Avalonia/StarredNavigationView.axaml b/Wallet.Avalonia/StarredNavigationView.axaml
index 7365659..ce76d48 100644
--- a/Wallet.Avalonia/StarredNavigationView.axaml
+++ b/Wallet.Avalonia/StarredNavigationView.axaml
@@ -15,7 +15,7 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Wallet">
-                    <Parameter Key="Filter" Value="{Binding Filter}" />
+                    <Parameter Key="Filter" Value="{Binding Value}" />
                 </NavigateAction>
             </ConditionAction>
             <ConditionAction>
@@ -25,7 +25,7 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Left" Route="ItemCollection">
-                    <Parameter Key="Filter" Value="{Binding Filter}" />
+                    <Parameter Key="Filter" Value="{Binding Value}" />
                     <Parameter Key="Transition" Value="FromRight" />
                     <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
                     <Parameter Key="ClearBackStack" Value="{x:True}" />
@@ -33,5 +33,8 @@
             </ConditionAction>
         </DataTriggerBehavior>
     </Interaction.Behaviors>
+    <NavigationViewItem.InfoBadge>
+        <InfoBadge Value="{Binding Key}" />
+    </NavigationViewItem.InfoBadge>
 </NavigationViewItem>
 
diff --git a/Wallet/AllNavigationViewModel.cs b/Wallet/AllNavigationViewModel.cs
index bdf6485..7427f5c 100644
--- a/Wallet/AllNavigationViewModel.cs
+++ b/Wallet/AllNavigationViewModel.cs
@@ -2,10 +2,20 @@
 
 namespace Wallet;
 
+[Notification(typeof(NotifyEventArgs<Item<int>>), "All")]
 public partial class AllNavigationViewModel(IServiceProvider provider,
-    IServiceFactory factory,
-    IMediator mediator,
-    IPublisher publisher,
-    ISubscription subscriber,
-    IDisposer disposer,
-    string filter) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, filter);
\ No newline at end of file
+    IServiceFactory factory, IMediator mediator,
+    IPublisher publisher, ISubscription subscriber, IDisposer disposer, int key, string value) :
+    FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, key, value),
+    INotificationHandler<NotifyEventArgs<Item<int>>>
+{
+    public Task Handle(NotifyEventArgs<Item<int>> args)
+    {
+        if (args.Sender is Item<int> item)
+        {
+            Key = item.Value;
+        }
+
+        return Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/Wallet/ArchiveEventArgs.cs b/Wallet/ArchiveEventArgs.cs
index a996d3c..10f93b5 100644
--- a/Wallet/ArchiveEventArgs.cs
+++ b/Wallet/ArchiveEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Wallet;
 
-public record ArchiveEventArgs<TValue>(TValue Value);
\ No newline at end of file
+public record ArchiveEventArgs<TSender>(TSender Sender);
\ No newline at end of file
diff --git a/Wallet/ArchiveItemHandler.cs b/Wallet/ArchiveItemHandler.cs
index 23fea10..7e6a4ca 100644
--- a/Wallet/ArchiveItemHandler.cs
+++ b/Wallet/ArchiveItemHandler.cs
@@ -4,7 +4,8 @@ namespace Wallet;
 
 public class ArchiveItemHandler(IDecoratorService<Item<(Guid, string)>> decoratorService,
     ICache<Item<(Guid, string)>> cache,
-    IMediator mediator) :
+    IMediator mediator,
+    IPublisher publisher) :
     INotificationHandler<ArchiveEventArgs<Item>>
 {
     public async Task Handle(ArchiveEventArgs<Item> args)
@@ -21,6 +22,7 @@ public class ArchiveItemHandler(IDecoratorService<Item<(Guid, string)>> decorato
                         bool>(new UpdateEventArgs<(Guid, int)>((id, 2)));
 
                     cache.Remove(item);
+                    publisher.Publish(Changed.As(item));
                 }
             } 
         }
diff --git a/Wallet/ArchiveNavigationViewModel.cs b/Wallet/ArchiveNavigationViewModel.cs
index c97f641..aaf5545 100644
--- a/Wallet/ArchiveNavigationViewModel.cs
+++ b/Wallet/ArchiveNavigationViewModel.cs
@@ -2,10 +2,24 @@
 
 namespace Wallet;
 
+[Notification(typeof(NotifyEventArgs<Item<int>>), "Archive")]
 public partial class ArchiveNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
     ISubscription subscriber,
     IDisposer disposer,
-    string name) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, name);
\ No newline at end of file
+    int key,
+    string value) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, key, value),
+    INotificationHandler<NotifyEventArgs<Item<int>>>
+{
+    public Task Handle(NotifyEventArgs<Item<int>> args)
+    {
+        if (args.Sender is Item<int> item)
+        {
+            Key = item.Value;
+        }
+
+        return Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/Wallet/CategoriesNavigationViewModel.cs b/Wallet/CategoriesNavigationViewModel.cs
index 7b772d3..310964d 100644
--- a/Wallet/CategoriesNavigationViewModel.cs
+++ b/Wallet/CategoriesNavigationViewModel.cs
@@ -9,7 +9,5 @@ public partial class CategoriesNavigationViewModel(IServiceProvider provider,
     IPublisher publisher,
     ISubscription subscriber,
     IDisposer disposer,
-    string name) : FilterNavigationViewModel<CategoryNavigationViewModel>(provider, factory, mediator, publisher, subscriber, disposer, name)
-{
-
-}
\ No newline at end of file
+    int key,
+    string value) : FilterNavigationViewModel<CategoryNavigationViewModel>(provider, factory, mediator, publisher, subscriber, disposer, key, value);
\ No newline at end of file
diff --git a/Wallet/CategoryNavigationViewModel.cs b/Wallet/CategoryNavigationViewModel.cs
index 479aec3..6159ac5 100644
--- a/Wallet/CategoryNavigationViewModel.cs
+++ b/Wallet/CategoryNavigationViewModel.cs
@@ -8,4 +8,4 @@ public partial class CategoryNavigationViewModel(IServiceProvider provider,
     IPublisher publisher,
     ISubscription subscriber,
     IDisposer disposer,
-    string filter) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, filter);
\ No newline at end of file
+    string value) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, 0, value);
\ No newline at end of file
diff --git a/Wallet/ConfirmCreateItemHandler.cs b/Wallet/ConfirmCreateItemHandler.cs
index a987ed7..bf2e035 100644
--- a/Wallet/ConfirmCreateItemHandler.cs
+++ b/Wallet/ConfirmCreateItemHandler.cs
@@ -13,15 +13,19 @@ public class ConfirmCreateItemHandler(IMediator mediator,
         if (itemHeaderConfiguration.Service is ItemHeaderConfiguration headerConfiguration &&
             itemConfigurationDecorator.Service is ItemConfiguration itemConfiguration)
         {
-            string? name = headerConfiguration?.Name;
-            if (name is not null)
+            if (headerConfiguration.Name is { Length: > 0 } name &&
+                headerConfiguration.Category is { Length: > 0 } category)
             {
                 Guid id = Guid.NewGuid();
-                publisher.Publish(Created.As(new Item<(Guid, string)>((id, name))));
+
+                Item<(Guid, string)> item = new((id, name));
+                publisher.Publish(Created.As(item));
 
                 await mediator.Handle<CreateEventArgs<(Guid, string, string,
                     ItemConfiguration)>, bool>(new CreateEventArgs<(Guid, string, string, 
-                    ItemConfiguration)>((id, name, "", itemConfiguration)));
+                    ItemConfiguration)>((id, name, category, itemConfiguration)));
+
+                publisher.Publish(Changed.As(item));
             }
         }
     }
diff --git a/Wallet/ConfirmUpdateItemHandler.cs b/Wallet/ConfirmUpdateItemHandler.cs
index 1791a2b..e834f3a 100644
--- a/Wallet/ConfirmUpdateItemHandler.cs
+++ b/Wallet/ConfirmUpdateItemHandler.cs
@@ -29,6 +29,8 @@ public class ConfirmUpdateItemHandler(IDecoratorService<Item<(Guid, string)>> it
 
                 await mediator.Handle<UpdateEventArgs<Item<(Guid, string, ItemConfiguration)>>, bool>(new UpdateEventArgs<Item<(Guid, string,
                     ItemConfiguration)>>(new Item<(Guid, string, ItemConfiguration)>((id, name, itemConfiguration))));
+
+                publisher.Publish(Changed.As(item));
             }
         }
     }
diff --git a/Wallet/CountCategoriesHandler.cs b/Wallet/CountCategoriesHandler.cs
new file mode 100644
index 0000000..46dfa59
--- /dev/null
+++ b/Wallet/CountCategoriesHandler.cs
@@ -0,0 +1,52 @@
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using Toolkit.Foundation;
+using Wallet.Data;
+
+namespace Wallet;
+
+public class CountCategoriesHandler(IDbContextFactory<WalletContext> dbContextFactory) : 
+    IHandler<CountEventArgs<ItemCategory>, IReadOnlyCollection<(string, int)>>
+{
+    public async Task<IReadOnlyCollection<(string, int)>> Handle(CountEventArgs<ItemCategory> args, 
+        CancellationToken cancellationToken)
+    {
+        using WalletContext context = await dbContextFactory.CreateDbContextAsync(cancellationToken);
+
+        var stateCounts = await context.Items
+            .GroupBy(i => i.State)
+            .Select(g => new
+            {
+                g.Key,
+                Count = g.Count()
+            })
+            .ToListAsync(cancellationToken: cancellationToken);
+
+        var categoryCounts = await context.Items.Where(x => !string.IsNullOrEmpty(x.Category))
+            .GroupBy(i => i.Category)
+            .Select(g => new
+            {
+                g.Key,
+                Count = g.Count()
+            })
+            .ToListAsync(cancellationToken: cancellationToken);
+
+        int allCount = stateCounts.Where(x => x.Key != 2).Sum(x => x.Count);
+        int favouritesCount = stateCounts.Where(x => x.Key == 1).Sum(x => x.Count);
+        int archiveCount = stateCounts.Where(x => x.Key == 2).Sum(x => x.Count);
+
+        List<(string, int)> combinedCounts =
+        [
+            new("Favourites", favouritesCount),
+            new("Archive", archiveCount),
+            new("All", allCount)
+        ];
+
+        foreach ((string key, int count) in categoryCounts.Select(x => (x.Key, x.Count)))
+        {
+            combinedCounts.Add((key, count));
+        }
+
+        return combinedCounts;
+    }
+}
diff --git a/Wallet/FavouriteEventArgs.cs b/Wallet/FavouriteEventArgs.cs
index c929ddb..0ce6902 100644
--- a/Wallet/FavouriteEventArgs.cs
+++ b/Wallet/FavouriteEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Wallet;
 
-public record FavouriteEventArgs<TValue>(TValue Value);
\ No newline at end of file
+public record FavouriteEventArgs<TSender>(TSender Sender);
\ No newline at end of file
diff --git a/Wallet/FavouriteItemHandler.cs b/Wallet/FavouriteItemHandler.cs
index 63f62ac..6723c91 100644
--- a/Wallet/FavouriteItemHandler.cs
+++ b/Wallet/FavouriteItemHandler.cs
@@ -3,7 +3,8 @@
 namespace Wallet;
 
 public class FavouriteItemHandler(IDecoratorService<Item<(Guid, string)>> decoratorService,
-    IMediator mediator) :
+    IMediator mediator,
+    IPublisher publisher) :
     INotificationHandler<FavouriteEventArgs<Item>>
 {
     public async Task Handle(FavouriteEventArgs<Item> args)
@@ -14,6 +15,8 @@ public class FavouriteItemHandler(IDecoratorService<Item<(Guid, string)>> decora
             {
                 (Guid id, string name) = item.Value;
                 await mediator.Handle<UpdateEventArgs<(Guid, int)>, bool>(new UpdateEventArgs<(Guid, int)>((id, 1)));
+
+                publisher.Publish(Changed.As(item));
             }
         }
         catch
diff --git a/Wallet/FilterNavigationViewModel.cs b/Wallet/FilterNavigationViewModel.cs
index 29e00a3..ec08dd8 100644
--- a/Wallet/FilterNavigationViewModel.cs
+++ b/Wallet/FilterNavigationViewModel.cs
@@ -4,7 +4,7 @@ using Toolkit.Foundation;
 namespace Wallet;
 
 public partial class FilterNavigationViewModel : 
-    ObservableCollection<IWalletNavigationViewModel>,
+    ObservableCollection<IWalletNavigationViewModel, int, string>,
     IWalletNavigationViewModel,
     INotificationHandler<ActivatedEventArgs<Wallet>>,
     INotificationHandler<DeactivatedEventArgs<Wallet>>
@@ -12,21 +12,19 @@ public partial class FilterNavigationViewModel :
     [ObservableProperty]
     private bool activated;
 
-    [ObservableProperty]
-    private string? filter;
-
     [ObservableProperty]
     private bool selected;
 
-    public FilterNavigationViewModel(IServiceProvider provider,
-        IServiceFactory factory,
-        IMediator mediator,
+    public FilterNavigationViewModel(IServiceProvider provider, 
+        IServiceFactory factory, 
+        IMediator mediator, 
         IPublisher publisher,
         ISubscription subscriber,
         IDisposer disposer,
-        string? filter = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
+        int key, 
+        string value) : base(provider, factory, mediator, publisher, subscriber, disposer, key, value)
     {
-        Filter = filter;
+
     }
 
     public Task Handle(DeactivatedEventArgs<Wallet> args) =>
@@ -37,7 +35,7 @@ public partial class FilterNavigationViewModel :
 }
 
 public partial class FilterNavigationViewModel<TWalletNavigation> :
-    ObservableCollection<TWalletNavigation>,
+    ObservableCollection<TWalletNavigation, int, string>,
     IWalletNavigationViewModel,
     INotificationHandler<ActivatedEventArgs<Wallet>>,
     INotificationHandler<DeactivatedEventArgs<Wallet>>
@@ -47,21 +45,19 @@ public partial class FilterNavigationViewModel<TWalletNavigation> :
     [ObservableProperty]
     private bool activated;
 
-    [ObservableProperty]
-    private string? filter;
-
     [ObservableProperty]
     private bool selected;
 
     public FilterNavigationViewModel(IServiceProvider provider,
         IServiceFactory factory,
-        IMediator mediator,
+        IMediator mediator, 
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscription subscriber, 
         IDisposer disposer,
-        string? filter = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
+        int key,
+        string value) : base(provider, factory, mediator, publisher, subscriber, disposer, key, value)
     {
-        Filter = filter;
+
     }
 
     public Task Handle(DeactivatedEventArgs<Wallet> args) =>
diff --git a/Wallet/ItemChangedHandler.cs b/Wallet/ItemChangedHandler.cs
new file mode 100644
index 0000000..213093c
--- /dev/null
+++ b/Wallet/ItemChangedHandler.cs
@@ -0,0 +1,22 @@
+using Toolkit.Foundation;
+
+namespace Wallet;
+
+public class ItemChangedHandler(IMediator mediator,
+    IPublisher publisher) : 
+    INotificationHandler<ChangedEventArgs<Item<(Guid, string)>>>
+{
+    public async Task Handle(ChangedEventArgs<Item<(Guid, string)>> args)
+    {
+        IReadOnlyCollection<(string, int)>? categoryCounts = await mediator.Handle<CountEventArgs<ItemCategory>, 
+            IReadOnlyCollection<(string, int)>>(Count.As<ItemCategory>());
+
+        if (categoryCounts is { Count: > 0  } ) 
+        {
+            foreach ((string key, int count) in categoryCounts)
+            {
+                publisher.Publish(Notify.As(new Item<int>(count)), key);
+            }
+        }
+    }
+}
diff --git a/Wallet/ItemHeaderConfiguration.cs b/Wallet/ItemHeaderConfiguration.cs
index 917e20b..65e8e00 100644
--- a/Wallet/ItemHeaderConfiguration.cs
+++ b/Wallet/ItemHeaderConfiguration.cs
@@ -3,4 +3,6 @@
 public class ItemHeaderConfiguration
 {
     public string? Name { get; set; }
+
+    public string? Category { get; set; }
 }
\ No newline at end of file
diff --git a/Wallet/ItemHeaderViewModel.cs b/Wallet/ItemHeaderViewModel.cs
index d03ff5e..45b1f39 100644
--- a/Wallet/ItemHeaderViewModel.cs
+++ b/Wallet/ItemHeaderViewModel.cs
@@ -70,6 +70,7 @@ public partial class ItemHeaderViewModel :
         if (args.Sender is ItemCategory<string> category)
         {
             Category = category.Value;
+            configuration.Category = category.Value;
         }
 
         return Task.CompletedTask;
diff --git a/Wallet/QueryWalletHandler.cs b/Wallet/QueryWalletHandler.cs
index 24fcc65..a196179 100644
--- a/Wallet/QueryWalletHandler.cs
+++ b/Wallet/QueryWalletHandler.cs
@@ -12,7 +12,7 @@ public class QueryWalletHandler(IDbContextFactory<WalletContext> dbContextFactor
         Handle(QueryEventArgs<Wallet<(string, string)>> args,CancellationToken cancellationToken)
     {
         List<(Guid Id, string? Name, string Category, bool Favourite, bool Archived)> items = [];
-        if (args.Value is Wallet<(string, string)> Wallet)
+        if (args.Sender is Wallet<(string, string)> Wallet)
         {
             (string filter, string text) = Wallet.Sender;
 
diff --git a/Wallet/StarredNavigationViewModel.cs b/Wallet/StarredNavigationViewModel.cs
index c342159..4df0c65 100644
--- a/Wallet/StarredNavigationViewModel.cs
+++ b/Wallet/StarredNavigationViewModel.cs
@@ -2,10 +2,24 @@
 
 namespace Wallet;
 
+[Notification(typeof(NotifyEventArgs<Item<int>>), "Favourites")]
 public partial class StarredNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
     ISubscription subscriber,
     IDisposer disposer,
-    string name) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, name);
\ No newline at end of file
+    int key,
+    string value) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, key, value),
+    INotificationHandler<NotifyEventArgs<Item<int>>>
+{
+    public Task Handle(NotifyEventArgs<Item<int>> args)
+    {
+        if (args.Sender is Item<int> item)
+        {
+            Key = item.Value;
+        }
+
+        return Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/Wallet/UnarchiveEventArgs.cs b/Wallet/UnarchiveEventArgs.cs
index 428c457..f37c0b6 100644
--- a/Wallet/UnarchiveEventArgs.cs
+++ b/Wallet/UnarchiveEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Wallet;
 
-public record UnarchiveEventArgs<TValue>(TValue Value);
\ No newline at end of file
+public record UnarchiveEventArgs<TSender>(TSender Sender);
\ No newline at end of file
diff --git a/Wallet/UnarchiveItemHandler.cs b/Wallet/UnarchiveItemHandler.cs
index 239f585..f0febe2 100644
--- a/Wallet/UnarchiveItemHandler.cs
+++ b/Wallet/UnarchiveItemHandler.cs
@@ -1,12 +1,11 @@
-using Wallet.Data;
-using Microsoft.EntityFrameworkCore;
-using System.Threading;
-using Toolkit.Foundation;
+using Toolkit.Foundation;
 
 namespace Wallet;
 
 public class UnarchiveItemHandler(IDecoratorService<Item<(Guid, string)>> decoratorService,
-    IDbContextFactory<WalletContext> dbContextFactory) :
+    ICache<Item<(Guid, string)>> cache,
+    IMediator mediator,
+    IPublisher publisher) :
     INotificationHandler<UnarchiveEventArgs<Item>>
 {
     public async Task Handle(UnarchiveEventArgs<Item> args)
@@ -17,12 +16,11 @@ public class UnarchiveItemHandler(IDecoratorService<Item<(Guid, string)>> decora
             {
                 (Guid id, string name) = item.Value;
 
-                using WalletContext context = await dbContextFactory.CreateDbContextAsync();
-                if (await context.FindAsync<ItemEntry>(id) is ItemEntry result)
-                {
-                    result.State = 0;
-                    await context.SaveChangesAsync();
-                }
+                await mediator.Handle<UpdateEventArgs<(Guid, int)>,
+                    bool>(new UpdateEventArgs<(Guid, int)>((id, 0)));
+
+                cache.Add(item);
+                publisher.Publish(Changed.As(item));
             }
         }
         catch
diff --git a/Wallet/UnfavouriteEventArgs.cs b/Wallet/UnfavouriteEventArgs.cs
index 2726426..8d38c35 100644
--- a/Wallet/UnfavouriteEventArgs.cs
+++ b/Wallet/UnfavouriteEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Wallet;
 
-public record UnfavouriteEventArgs<TValue>(TValue Value);
\ No newline at end of file
+public record UnfavouriteEventArgs<TSender>(TSender Sender);
\ No newline at end of file
diff --git a/Wallet/UnfavouriteItemHandler.cs b/Wallet/UnfavouriteItemHandler.cs
index 70e309e..876d417 100644
--- a/Wallet/UnfavouriteItemHandler.cs
+++ b/Wallet/UnfavouriteItemHandler.cs
@@ -1,8 +1,10 @@
 using Toolkit.Foundation;
 
 namespace Wallet;
+
 public class UnfavouriteItemHandler(IDecoratorService<Item<(Guid, string)>> decoratorService,
-    IMediator mediator) :
+    IMediator mediator,
+    IPublisher publisher) :
     INotificationHandler<UnfavouriteEventArgs<Item>>
 {
     public async Task Handle(UnfavouriteEventArgs<Item> args)
@@ -13,6 +15,8 @@ public class UnfavouriteItemHandler(IDecoratorService<Item<(Guid, string)>> deco
             {
                 (Guid id, string name) = item.Value;
                 await mediator.Handle<UpdateEventArgs<(Guid, int)>, bool>(new UpdateEventArgs<(Guid, int)>((id, 0)));
+
+                publisher.Publish(Changed.As(item));
             }
         }
         catch
diff --git a/Wallet/UpdateItemStateHandler.cs b/Wallet/UpdateItemStateHandler.cs
index 5cf35ab..9ef4641 100644
--- a/Wallet/UpdateItemStateHandler.cs
+++ b/Wallet/UpdateItemStateHandler.cs
@@ -12,15 +12,12 @@ public class UpdateItemStateHandler(IDbContextFactory<WalletContext> dbContextFa
     {
         if (args.Value is (Guid id, int state))
         {
-            await Task.Run(async () =>
+            using WalletContext context = await dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (await context.FindAsync<ItemEntry>(id) is ItemEntry result)
             {
-                using WalletContext context = await dbContextFactory.CreateDbContextAsync(cancellationToken);
-                if (await context.FindAsync<ItemEntry>(id) is ItemEntry result)
-                {
-                    result.State = state;
-                    await context.SaveChangesAsync();
-                }
-            }, cancellationToken);
+                result.State = state;
+                await context.SaveChangesAsync(cancellationToken);
+            }
         }
 
         return false;
diff --git a/Wallet/WalletNavigationViewModel.cs b/Wallet/WalletNavigationViewModel.cs
index 8b5d2f0..9e5e64e 100644
--- a/Wallet/WalletNavigationViewModel.cs
+++ b/Wallet/WalletNavigationViewModel.cs
@@ -46,10 +46,10 @@ public partial class WalletNavigationViewModel :
 
     public Task Handle(OpenedEventArgs<Wallet> args)
     {
-        Add<AllNavigationViewModel>("All");
-        Add<StarredNavigationViewModel>("Starred");
-        Add<ArchiveNavigationViewModel>("Archive");
-        Add<CategoriesNavigationViewModel>("Categories");
+        Add<AllNavigationViewModel>("All", 0);
+        Add<StarredNavigationViewModel>("Starred", 0);
+        Add<ArchiveNavigationViewModel>("Archive", 0);
+        Add<CategoriesNavigationViewModel>("Categories", 0);
 
         Opened = true;
         return Task.CompletedTask;