diff --git a/KeyVaultExplorer/App.axaml.cs b/KeyVaultExplorer/App.axaml.cs
index 6a6c9c7..9a1cd2c 100644
--- a/KeyVaultExplorer/App.axaml.cs
+++ b/KeyVaultExplorer/App.axaml.cs
@@ -35,13 +35,14 @@ public static void CreateDesktopResources()
         if (!dbPassExists)
             DatabaseEncryptedPasswordManager.SetSecret($"keyvaultexplorer_{System.Guid.NewGuid().ToString()[..6]}");
 
-        Dispatcher.UIThread.Post(async () =>
+
+        Task.Run(async () =>
         {
             await KvExplorerDb.OpenSqlConnection();
 
             if (!dbExists)
                 KvExplorerDb.InitializeDatabase();
-        }, DispatcherPriority.Loaded);
+        });
 
         string settingsPath = Path.Combine(Constants.LocalAppDataFolder, "settings.json");
         if (!File.Exists(settingsPath))
diff --git a/KeyVaultExplorer/KeyVaultExplorer.csproj b/KeyVaultExplorer/KeyVaultExplorer.csproj
index 1a6849e..1b39b50 100644
--- a/KeyVaultExplorer/KeyVaultExplorer.csproj
+++ b/KeyVaultExplorer/KeyVaultExplorer.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
     <!-- <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">$(TargetFrameworks);net8.0-macos</TargetFrameworks> -->
     <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>preview</LangVersion>
    	<Version>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)\\..\\VERSION"))</Version>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
diff --git a/KeyVaultExplorer/Models/Constants.cs b/KeyVaultExplorer/Models/Constants.cs
index 2f0e71b..133bcae 100644
--- a/KeyVaultExplorer/Models/Constants.cs
+++ b/KeyVaultExplorer/Models/Constants.cs
@@ -29,9 +29,9 @@ public static class Constants
     // Cache settings
     public const string CacheFileName = "keyvaultexplorer_msal_cache.txt";
 
-    public static readonly string LocalAppDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\keyvaultexplorerforazure";
+    public static readonly string LocalAppDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\KeyVaultExplorerForAzure";
 
-    public static readonly string DatabaseFilePath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\keyvaultexplorerforazure\\keyvaultexplorerforazure.db";
+    public static readonly string DatabaseFilePath = LocalAppDataFolder+ "\\KeyVaultExplorerForAzure.db";
 
     public const string KeyChainServiceName = "keyvaultexplorerforazure_msal_service";
     public const string KeyChainAccountName = "keyvaultexplorerforazure_msal_account";
diff --git a/KeyVaultExplorer/Resources/Styles.axaml b/KeyVaultExplorer/Resources/Styles.axaml
index 80da99e..60f1c61 100644
--- a/KeyVaultExplorer/Resources/Styles.axaml
+++ b/KeyVaultExplorer/Resources/Styles.axaml
@@ -208,7 +208,7 @@
                 <Canvas
                     Width="14"
                     Height="14"
-                    Margin="4,0,1,0"
+                    Margin="4,0,2,0"
                     Background="Transparent">
                     <Canvas.Styles>
                         <!--<Style Selector="ToolTip">
diff --git a/KeyVaultExplorer/Services/AuthService.cs b/KeyVaultExplorer/Services/AuthService.cs
index 84411e7..1803e96 100644
--- a/KeyVaultExplorer/Services/AuthService.cs
+++ b/KeyVaultExplorer/Services/AuthService.cs
@@ -42,7 +42,7 @@ public async Task<AuthenticationResult> LoginAsync(CancellationToken cancellatio
         {
             var options = new SystemWebViewOptions()
             {
-                HtmlMessageError = "<p> An error occured: {0}. Details {1}</p>",
+                HtmlMessageError = "<p> An error occurred: {0}. Details {1}</p>",
                 BrowserRedirectSuccess = new Uri("https://www.microsoft.com")
             };
             //.WithPrompt(Prompt.ForceLogin) //This is optional. If provided, on each execution, the username and the password must be entered.
diff --git a/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs b/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
index a808565..cdd1e02 100644
--- a/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
+++ b/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
@@ -96,10 +96,6 @@ public async Task EditDetails()
         else
             KeyVaultSecretModel.ExpiresOn = null;
 
-
-        //foreach (var tag in KeyVaultSecretModel.Tags)
-        //    KeyVaultSecretModel.Properties.Tags.Add(tag.Key, tag.Value);
-
         var updatedProps = await _vaultService.UpdateSecret(KeyVaultSecretModel, KeyVaultSecretModel.VaultUri);
         KeyVaultSecretModel = updatedProps;
     }
@@ -137,7 +133,6 @@ partial void OnKeyVaultSecretModelChanging(SecretProperties value)
         NotBeforeTimespan = value is not null && value.NotBefore.HasValue ? value?.NotBefore.Value.LocalDateTime.TimeOfDay : null;
     }
 
-
     partial void OnHasActivationDateCheckedChanged(bool oldValue, bool newValue)
     {
         if (newValue is false)
diff --git a/KeyVaultExplorer/ViewModels/KeyVaultTreeListViewModel.cs b/KeyVaultExplorer/ViewModels/KeyVaultTreeListViewModel.cs
index f30b791..113ea49 100644
--- a/KeyVaultExplorer/ViewModels/KeyVaultTreeListViewModel.cs
+++ b/KeyVaultExplorer/ViewModels/KeyVaultTreeListViewModel.cs
@@ -129,7 +129,7 @@ await DelaySetIsBusy(async () =>
                 catch (Exception ex)
                 {
                     Debug.Write(ex);
-                    _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+                    _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
                 }
             });
         }, DispatcherPriority.Background);
diff --git a/KeyVaultExplorer/ViewModels/NotificationViewModel.cs b/KeyVaultExplorer/ViewModels/NotificationViewModel.cs
index cf98875..49683e2 100644
--- a/KeyVaultExplorer/ViewModels/NotificationViewModel.cs
+++ b/KeyVaultExplorer/ViewModels/NotificationViewModel.cs
@@ -17,7 +17,7 @@ public void AddMessage(Notification notification)
         NotificationManager?.Show(notification);
     }
 
-    public async void ShowErrorPopup(Notification notification)
+    public async void ShowPopup(Notification notification)
     {
         var td = new TaskDialog
         {
diff --git a/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs b/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
index 3487dca..dbd45d9 100644
--- a/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
+++ b/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
@@ -137,11 +137,11 @@ private async Task Copy()
         }
         catch (KeyVaultInsufficientPrivilegesException ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
         }
         catch (Exception ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
         }
     }
 
@@ -181,11 +181,11 @@ private async Task Download(string exportType)
         }
         catch (KeyVaultInsufficientPrivilegesException ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
         }
         catch (Exception ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
         }
     }
 
@@ -218,14 +218,16 @@ private async Task EditVersion()
                     try
                     {
                         await viewModel.EditDetailsCommand.ExecuteAsync(null);
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification("Success", "The properties have been updated."));
+
                     }
                     catch (KeyVaultInsufficientPrivilegesException ex)
                     {
-                        _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
                     }
                     catch (Exception ex)
                     {
-                        _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
                     }
                     finally
                     {
@@ -245,7 +247,7 @@ private async Task EditVersion()
         }
         catch (KeyVaultInsufficientPrivilegesException ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
         }
     }
 
@@ -325,15 +327,15 @@ private async Task NewVersion()
                     try
                     {
                         await vm.NewVersionCommand.ExecuteAsync(null);
-                        _notificationViewModel.AddMessage(new Avalonia.Controls.Notifications.Notification("New Version", "Your value has been created.", Avalonia.Controls.Notifications.NotificationType.Success));
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification("Success", "The secret version has been created."));
                     }
                     catch (KeyVaultInsufficientPrivilegesException ex)
                     {
-                        _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
                     }
                     catch (Exception ex)
                     {
-                        _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+                        _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
                     }
                     finally
                     {
@@ -351,7 +353,7 @@ private async Task NewVersion()
         }
         catch (KeyVaultInsufficientPrivilegesException ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
         }
     }
 
@@ -399,11 +401,11 @@ await Dispatcher.UIThread.InvokeAsync(async () =>
         }
         catch (KeyVaultInsufficientPrivilegesException ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
         }
         catch (Exception ex)
         {
-            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+            _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
         }
     }
 }
\ No newline at end of file
diff --git a/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs b/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs
index 6dc2855..7dd4fcd 100644
--- a/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs
+++ b/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs
@@ -15,7 +15,9 @@
 using KeyVaultExplorer.Exceptions;
 using KeyVaultExplorer.Models;
 using KeyVaultExplorer.Services;
+using Microsoft.VisualBasic;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
@@ -51,6 +53,7 @@ public partial class VaultPageViewModel : ViewModelBase
 
     [ObservableProperty]
     private bool isBusy = false;
+
     [ObservableProperty]
     private string searchQuery;
 
@@ -65,6 +68,7 @@ public partial class VaultPageViewModel : ViewModelBase
 
     [ObservableProperty]
     private Uri vaultUri;
+
     public VaultPageViewModel()
     {
         _vaultService = Defaults.Locator.GetRequiredService<VaultService>();
@@ -115,7 +119,7 @@ public VaultPageViewModel()
     }
 
     public Dictionary<KeyVaultItemType, bool> LoadedItemTypes { get; set; } = new() { };
-    private IEnumerable<KeyVaultContentsAmalgamation> _vaultContents { get; set; }
+    private IEnumerable<KeyVaultContentsAmalgamation> _vaultContents { get; set; } = [];
 
     public async Task ClearClipboardAsync()
     {
@@ -127,6 +131,8 @@ public async Task FilterAndLoadVaultValueType(KeyVaultItemType item)
     {
         try
         {
+            HasAuthorizationError = false;
+
             if (!LoadedItemTypes.ContainsKey(item))
             {
                 IsBusy = true;
@@ -134,26 +140,26 @@ public async Task FilterAndLoadVaultValueType(KeyVaultItemType item)
                 switch (item)
                 {
                     case KeyVaultItemType.Certificate:
-                        await GetCertificatesForVault(VaultUri);
-                        LoadedItemTypes.TryAdd(item, true);
+                        await LoadAndMarkAsLoaded(GetCertificatesForVault, KeyVaultItemType.Certificate);
                         break;
 
                     case KeyVaultItemType.Key:
-                        await GetKeysForVault(VaultUri);
-                        LoadedItemTypes.TryAdd(item, true);
+                        await LoadAndMarkAsLoaded(GetKeysForVault, KeyVaultItemType.Key);
                         break;
 
                     case KeyVaultItemType.Secret:
-                        await GetSecretsForVault(VaultUri);
-                        LoadedItemTypes.TryAdd(item, true);
+                        await LoadAndMarkAsLoaded(GetSecretsForVault, KeyVaultItemType.Secret);
                         break;
 
                     case KeyVaultItemType.All:
                         VaultContents.Clear();
-                        await Task.WhenAny(GetSecretsForVault(VaultUri), GetKeysForVault(VaultUri), GetCertificatesForVault(VaultUri));
-                        LoadedItemTypes.TryAdd(KeyVaultItemType.Secret, true);
-                        LoadedItemTypes.TryAdd(KeyVaultItemType.Key, true);
-                        LoadedItemTypes.TryAdd(KeyVaultItemType.Certificate, true);
+                        var loadTasks = new List<Task>
+                            {
+                                LoadAndMarkAsLoaded(GetSecretsForVault, KeyVaultItemType.Secret),
+                                LoadAndMarkAsLoaded(GetKeysForVault, KeyVaultItemType.Key),
+                                LoadAndMarkAsLoaded(GetCertificatesForVault, KeyVaultItemType.Certificate)
+                            };
+                        await Task.WhenAny(loadTasks);
                         LoadedItemTypes.TryAdd(KeyVaultItemType.All, true);
                         break;
 
@@ -161,26 +167,28 @@ public async Task FilterAndLoadVaultValueType(KeyVaultItemType item)
                         break;
                 }
             }
-            if (item == KeyVaultItemType.All)
-                VaultContents = new ObservableCollection<KeyVaultContentsAmalgamation>(_vaultContents.Where(v => v.Name.Contains(SearchQuery ?? "", StringComparison.OrdinalIgnoreCase)));
-            else
-                VaultContents = new ObservableCollection<KeyVaultContentsAmalgamation>(_vaultContents.Where(v => item == v.Type && v.Name.Contains(SearchQuery ?? "", StringComparison.OrdinalIgnoreCase)));
         }
         catch (Exception ex) when (ex.Message.Contains("403"))
         {
-            _notificationViewModel.AddMessage(new Avalonia.Controls.Notifications.Notification
+            //_notificationViewModel.AddMessage(new Avalonia.Controls.Notifications.Notification
+            //{
+            //    Message = string.Concat(ex.Message.AsSpan(0, 90), "..."),
+            //    Title = $"Insufficient Privileges on type '{item}'",
+            //    Type = NotificationType.Error,
+            //});
+            if (!item.HasFlag(KeyVaultItemType.All))
             {
-                Message = string.Concat(ex.Message.AsSpan(0, 90), "..."),
-                Title = $"Insufficient Privileges on type '{item}'",
-                Expiration = TimeSpan.Zero,
-                Type = NotificationType.Error,
-            });
-            Debug.WriteLine(ex.Message);
-            HasAuthorizationError = true;
-            AuthorizationMessage = ex.Message;
+                HasAuthorizationError = true;
+                AuthorizationMessage = ex.Message;
+            }
         }
+        catch { }
         finally
         {
+            var contents = item == KeyVaultItemType.All ? _vaultContents : _vaultContents.Where(x => item == x.Type);
+
+             VaultContents = KeyVaultFilterHelper.FilterByQuery( contents, SearchQuery, item => item.Name, item => item.Tags);
+
             await DelaySetIsBusy(false);
         }
     }
@@ -270,6 +278,7 @@ public async Task GetSecretsForVault(Uri kvUri)
 
     [RelayCommand]
     private void CloseError() => HasAuthorizationError = false;
+
     [RelayCommand]
     private async Task Copy(KeyVaultContentsAmalgamation keyVaultItem)
     {
@@ -342,6 +351,12 @@ private async Task DelaySetIsBusy(bool val)
         IsBusy = val;
     }
 
+    private async Task LoadAndMarkAsLoaded(Func<Uri, Task> loadFunction, KeyVaultItemType type)
+    {
+        await loadFunction(VaultUri);
+        LoadedItemTypes.TryAdd(type, true);
+    }
+
     partial void OnSearchQueryChanged(string value)
     {
         var isValidEnum = Enum.TryParse(SelectedTab?.Name.ToString(), true, out KeyVaultItemType parsedEnumValue) && Enum.IsDefined(typeof(KeyVaultItemType), parsedEnumValue);
@@ -357,18 +372,14 @@ partial void OnSearchQueryChanged(string value)
             VaultContents = new ObservableCollection<KeyVaultContentsAmalgamation>(contents);
             return;
         }
-        //var toFilter = CheckedBoxes.Where(v => v.Value == true).Select(s => s.Key).ToList();
-        //       && toFilter.Contains(v.Type)
 
-        var list = _vaultContents.Where(v => v.Name.Contains(query, StringComparison.OrdinalIgnoreCase)
-                || (v.Tags is not null
-                && v.Tags.Any(x => x.Value.Contains(query, StringComparison.OrdinalIgnoreCase)
-                || x.Key.Contains(query, StringComparison.OrdinalIgnoreCase))
-              ));
+        var list = _vaultContents;
 
         if (item != KeyVaultItemType.All)
             list = list.Where(k => k.Type == item);
-        VaultContents = new ObservableCollection<KeyVaultContentsAmalgamation>(list);
+
+        VaultContents = KeyVaultFilterHelper.FilterByQuery(list, value, item => item.Name, item => item.Tags);
+
     }
 
     [RelayCommand]
@@ -385,7 +396,11 @@ private async Task Refresh()
         var isValidEnum = Enum.TryParse(SelectedTab?.Name, true, out KeyVaultItemType parsedEnumValue) && Enum.IsDefined(typeof(KeyVaultItemType), parsedEnumValue);
         var item = isValidEnum ? parsedEnumValue : KeyVaultItemType.Secret;
         LoadedItemTypes.Remove(item);
-        VaultContents = new ObservableCollection<KeyVaultContentsAmalgamation>(_vaultContents.Where(v => v.Type != item));
+        if (item.HasFlag(KeyVaultItemType.All))
+            _vaultContents = [];
+
+        VaultContents = KeyVaultFilterHelper.FilterByQuery(_vaultContents.Where(v => v.Type != item), SearchQuery, item => item.Name, item => item.Tags);
+
         await FilterAndLoadVaultValueType(item);
     }
 
@@ -442,4 +457,27 @@ private void ShowProperties(KeyVaultContentsAmalgamation model)
         var topLevel = Avalonia.Application.Current.GetTopLevel() as AppWindow;
         taskDialog.Show(topLevel);
     }
+
+    public static class KeyVaultFilterHelper
+    {
+        public static ObservableCollection<T> FilterByQuery<T>(
+            IEnumerable<T> source,
+            string query,
+            Func<T, string> nameSelector,
+            Func<T, IDictionary<string, string>> tagsSelector)
+        {
+            if (string.IsNullOrEmpty(query))
+            {
+                return new ObservableCollection<T>(source);
+            }
+
+            var filteredItems = source.Where(item =>
+                nameSelector(item).AsSpan().Contains(query.AsSpan(), StringComparison.OrdinalIgnoreCase)
+                || (tagsSelector(item)?.Any(tag =>
+                    tag.Key.AsSpan().Contains(query.AsSpan(), StringComparison.OrdinalIgnoreCase)
+                    || tag.Value.AsSpan().Contains(query.AsSpan(), StringComparison.OrdinalIgnoreCase)) ?? false));
+
+            return new ObservableCollection<T>(filteredItems);
+        }
+    }
 }
\ No newline at end of file
diff --git a/KeyVaultExplorer/Views/MainView.axaml b/KeyVaultExplorer/Views/MainView.axaml
index 5d8a75b..8fc8ee9 100644
--- a/KeyVaultExplorer/Views/MainView.axaml
+++ b/KeyVaultExplorer/Views/MainView.axaml
@@ -53,6 +53,7 @@
                 Margin="12,12,0,4"
                 DockPanel.Dock="Left"
                 IsHitTestVisible="False"
+                IsVisible="False"
                 RenderOptions.BitmapInterpolationMode="HighQuality"
                 Source="/Assets/kv-orange.ico">
                 <Image.IsVisible>
diff --git a/KeyVaultExplorer/Views/Pages/VaultPage.axaml.cs b/KeyVaultExplorer/Views/Pages/VaultPage.axaml.cs
index 688f9eb..5c35f86 100644
--- a/KeyVaultExplorer/Views/Pages/VaultPage.axaml.cs
+++ b/KeyVaultExplorer/Views/Pages/VaultPage.axaml.cs
@@ -24,7 +24,6 @@ namespace KeyVaultExplorer.Views.Pages;
 public partial class VaultPage : UserControl
 {
     private const string DatGridElementName = "VaultContentDataGrid";
-    private readonly VaultPageViewModel vaultPageViewModel;
     private readonly NotificationViewModel _notificationViewModel;
 
     public VaultPage()
@@ -32,7 +31,6 @@ public VaultPage()
         InitializeComponent();
         var model = new VaultPageViewModel();
         DataContext = model;
-        vaultPageViewModel = model;
         ValuesDataGrid = this.FindControl<DataGrid>(DatGridElementName);
         ValuesDataGrid.ContextRequested += OnDataGridRowContextRequested;
         KeyUp += Control_KeyUp;
@@ -46,7 +44,6 @@ public VaultPage(Uri kvUri)
         InitializeComponent();
         var model = new VaultPageViewModel();
         DataContext = model;
-        vaultPageViewModel = model;
         model.VaultUri = kvUri;
         ValuesDataGrid = this.FindControl<DataGrid>(DatGridElementName);
         ValuesDataGrid.ContextRequested += OnDataGridRowContextRequested;
@@ -62,7 +59,7 @@ protected void DataGrid_CopyingRowClipboardContent(object sender, DataGridRowCli
     {
         Dispatcher.UIThread.InvokeAsync(async () =>
         {
-            await vaultPageViewModel.CopyCommand.ExecuteAsync((KeyVaultContentsAmalgamation)e.Item);
+            await (DataContext as VaultPageViewModel).CopyCommand.ExecuteAsync((KeyVaultContentsAmalgamation)e.Item);
         });
     }
 
@@ -75,18 +72,7 @@ private void Control_KeyUp(object sender, KeyEventArgs e)
         }
         if (e.Key == Avalonia.Input.Key.F5)
         {
-            Dispatcher.UIThread.Post(async () =>
-            {
-                await vaultPageViewModel.RefreshCommand.ExecuteAsync(null);
-                if (TabHost.SelectedIndex > 2)
-                {
-                    ValuesDataGrid.ItemsSource = new DataGridCollectionView(ValuesDataGrid.ItemsSource)
-                    {
-                        GroupDescriptions = { new DataGridPathGroupDescription("Type") }
-                    };
-                }
-            }, DispatcherPriority.Background);
-            e.Handled = true;
+            RefreshButton_OnClick(sender, e);
         }
     }
 
@@ -105,18 +91,16 @@ private void OnDataGridRowContextRequested(object sender, ContextRequestedEventA
 
     private void OnDoubleTapped(object sender, TappedEventArgs e)
     {
-        // Do something when double tapped
         var dg = (DataGrid)sender;
         var model = dg.SelectedItem as KeyVaultContentsAmalgamation;
         (DataContext as VaultPageViewModel).ShowPropertiesCommand.Execute(model);
-        //Debug.Write(model.Name);
     }
 
     public void RefreshButton_OnClick(object sender, RoutedEventArgs args)
     {
         Dispatcher.UIThread.Post(async () =>
         {
-            await vaultPageViewModel.RefreshCommand.ExecuteAsync(null);
+            await (DataContext as VaultPageViewModel).RefreshCommand.ExecuteAsync(null);
             if (TabHost.SelectedIndex > 2)
             {
                 ValuesDataGrid.ItemsSource = new DataGridCollectionView(ValuesDataGrid.ItemsSource)
@@ -124,7 +108,7 @@ public void RefreshButton_OnClick(object sender, RoutedEventArgs args)
                     GroupDescriptions = { new DataGridPathGroupDescription("Type") }
                 };
             }
-        }, DispatcherPriority.MaxValue);
+        }, DispatcherPriority.Send);
     }
 
     private void SearchBoxChanges(object sender, TextChangedEventArgs e)
@@ -164,16 +148,18 @@ private async void TabHostSelectionChanged(object sender, SelectionChangedEventA
             2 => KeyVaultItemType.Key,
             _ => KeyVaultItemType.All
         };
-
         await vm.FilterAndLoadVaultValueType(item);
 
-        if (item == KeyVaultItemType.All)
+        await Dispatcher.UIThread.InvokeAsync(async () =>
         {
-            ValuesDataGrid.ItemsSource = new DataGridCollectionView(ValuesDataGrid.ItemsSource)
+            if (item == KeyVaultItemType.All)
             {
-                GroupDescriptions = { new DataGridPathGroupDescription("Type") }
-            };
-        }
+                ValuesDataGrid.ItemsSource = new DataGridCollectionView(ValuesDataGrid.ItemsSource)
+                {
+                    GroupDescriptions = { new DataGridPathGroupDescription("Type") }
+                };
+            }
+        }, DispatcherPriority.Input);
     }
 
     private void CreateSecret_Clicked(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
@@ -225,11 +211,11 @@ private async Task CreateNewSecret()
             }
             catch (KeyVaultInsufficientPrivilegesException ex)
             {
-                _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
+                _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Privileges" });
             }
             catch (Exception ex)
             {
-                _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
+                _notificationViewModel.ShowPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Error" });
             }
         };