diff --git a/Desktop/Desktop.csproj b/Desktop/Desktop.csproj
index 8fc1c663..775fb140 100644
--- a/Desktop/Desktop.csproj
+++ b/Desktop/Desktop.csproj
@@ -42,7 +42,7 @@
 
 
   <ItemGroup>
-	<PackageReference Include="Avalonia.Desktop" Version="11.1.0-beta2" />
+	<PackageReference Include="Avalonia.Desktop" Version="11.1.0-rc2" />
   </ItemGroup>
 
   	
diff --git a/KeyVaultExplorer/Exceptions/KvExceptions.cs b/KeyVaultExplorer/Exceptions/KvExceptions.cs
index 88a5577b..8e7fa132 100644
--- a/KeyVaultExplorer/Exceptions/KvExceptions.cs
+++ b/KeyVaultExplorer/Exceptions/KvExceptions.cs
@@ -17,4 +17,38 @@ public KeyVaultItemNotFoundException(string message, Exception inner)
         : base(message, inner)
     {
     }
+}
+
+public class KeyVaultItemNotFailedToUpdate : Exception
+{
+    public KeyVaultItemNotFailedToUpdate()
+    {
+    }
+
+    public KeyVaultItemNotFailedToUpdate(string message)
+        : base(message)
+    {
+    }
+
+    public KeyVaultItemNotFailedToUpdate(string message, Exception inner)
+        : base(message, inner)
+    {
+    }
+}
+
+public class KeyVaultInSufficientPrivileges : Exception
+{
+    public KeyVaultInSufficientPrivileges()
+    {
+    }
+
+    public KeyVaultInSufficientPrivileges(string message)
+        : base(message)
+    {
+    }
+
+    public KeyVaultInSufficientPrivileges(string message, Exception inner)
+        : base(message, inner)
+    {
+    }
 }
\ No newline at end of file
diff --git a/KeyVaultExplorer/KeyVaultExplorer.csproj b/KeyVaultExplorer/KeyVaultExplorer.csproj
index 74a60f77..30c65270 100644
--- a/KeyVaultExplorer/KeyVaultExplorer.csproj
+++ b/KeyVaultExplorer/KeyVaultExplorer.csproj
@@ -42,16 +42,16 @@
 
 
   <ItemGroup>
-	<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.0-beta2" />
-    <PackageReference Include="Avalonia.Svg.Skia" Version="11.1.0-beta1" />
+	<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.0-rc2" />
+    <PackageReference Include="Avalonia.Svg.Skia" Version="11.1.0-rc1" />
     <PackageReference Include="DeviceId" Version="6.6.0" />
-    <PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview5" />
+    <PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview6" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-beta2" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.4.24266.19" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.0-preview.4.24267.1" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-rc2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.5.24306.7" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.0-preview.5.24306.3" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.4.24266.19" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.5.24306.7" />
     <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.61.3" />
     <PackageReference Include="Azure.ResourceManager.KeyVault" Version="1.2.3" />
     <PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.6.0" />
@@ -93,5 +93,11 @@
 	  </AvaloniaResource>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Compile Update="Views\Pages\PropertiesDialogs\CreateNewSecretVersion.axaml.cs">
+	    <DependentUpon>CreateNewSecretVersion.axaml</DependentUpon>
+	  </Compile>
+	</ItemGroup>
+
 
 </Project>
diff --git a/KeyVaultExplorer/Models/AppSettings.cs b/KeyVaultExplorer/Models/AppSettings.cs
index 81fd6acf..b480cf2b 100644
--- a/KeyVaultExplorer/Models/AppSettings.cs
+++ b/KeyVaultExplorer/Models/AppSettings.cs
@@ -12,4 +12,6 @@ public class AppSettings
 
     [AllowedValues("Inline", "Overlay")]
     public string SplitViewDisplayMode { get; set; } = "Inline";
+    public string PanePlacement { get; set; } = "Left";
+
 }
\ No newline at end of file
diff --git a/KeyVaultExplorer/Models/KeyVaultValuesAmalgamation.cs b/KeyVaultExplorer/Models/KeyVaultValuesAmalgamation.cs
index 4e9bdf80..e487d4a5 100644
--- a/KeyVaultExplorer/Models/KeyVaultValuesAmalgamation.cs
+++ b/KeyVaultExplorer/Models/KeyVaultValuesAmalgamation.cs
@@ -29,8 +29,8 @@ public class KeyVaultContentsAmalgamation
 
     public DateTimeOffset? LastModifiedDate => UpdatedOn.HasValue ? UpdatedOn.Value.ToLocalTime() : CreatedOn!.Value.ToLocalTime();
 
-    public string? WhenLastModified => GetRelativeDateString(LastModifiedDate!.Value.UtcDateTime, true);
-    public string? WhenExpires => ExpiresOn.HasValue ? GetRelativeDateString(ExpiresOn!.Value.UtcDateTime) : "";
+    public string? WhenLastModified => GetRelativeDateString(LastModifiedDate!.Value, true);
+    public string? WhenExpires => ExpiresOn.HasValue ? GetRelativeDateString(ExpiresOn!.Value) : "";
 
     public SecretProperties SecretProperties { get; set; } = null!;
     public KeyProperties KeyProperties { get; set; } = null!;
@@ -45,9 +45,16 @@ public class KeyVaultContentsAmalgamation
     public string TagValuesString => string.Join(", ", Tags?.Values ?? []);
 
 
-    private string? GetRelativeDateString(DateTime dateTime, bool isPast = false)
+    private string? GetRelativeDateString(DateTimeOffset dateTimeOffset, bool isPast = false)
     {
-        TimeSpan timeSpan = isPast ? DateTime.Now.Subtract(dateTime) : dateTime.Subtract(DateTime.Now);
+        DateTimeOffset now = DateTimeOffset.Now;
+
+        if (dateTimeOffset < now && !isPast)
+        {
+            return "Expired";
+        }
+
+        TimeSpan timeSpan = isPast ? now.Subtract(dateTimeOffset) : dateTimeOffset.Subtract(now);
         int dayDifference = (int)timeSpan.TotalDays;
         int secondDifference = (int)timeSpan.TotalSeconds;
         var weeks = Math.Ceiling((double)dayDifference / 7);
@@ -68,10 +75,11 @@ public class KeyVaultContentsAmalgamation
             (1, _) when !isPast => "tomorrow",
             ( < 7, _) => $"{(isPast ? "" : "in ")}{dayDifference} days{(isPast ? " ago" : "")}",
             ( < 30, _) => $"{(isPast ? "" : "in ")}{weeks} {(weeks == 1 ? "week" : "weeks")}{(isPast ? " ago" : "")}",
-            ( < 366, _) =>   $"{(isPast ? "" : "in ")}{months} {(months == 1 ? "month" : "months")}{(isPast ? " ago" : "")}",
+            ( < 366, _) => $"{(isPast ? "" : "in ")}{months} {(months == 1 ? "month" : "months")}{(isPast ? " ago" : "")}",
             (_, _) => $"{(isPast ? "" : "in ")}{years} {(years == 1 ? "year" : "years")}{(isPast ? " ago" : "")}"
         };
     }
+
 }
 
 public enum KeyVaultItemType
diff --git a/KeyVaultExplorer/Resources/Resources.axaml b/KeyVaultExplorer/Resources/Resources.axaml
index 0464c7d1..49ddddc7 100644
--- a/KeyVaultExplorer/Resources/Resources.axaml
+++ b/KeyVaultExplorer/Resources/Resources.axaml
@@ -4,7 +4,10 @@
     xmlns:ui="using:FluentAvalonia.UI.Controls">
 
 
-    <SolidColorBrush x:Key="DynamicActiveBackgroundFAColor" Color="{DynamicResource SolidBackgroundFillColorBase}" />
+
+
+
+	<SolidColorBrush x:Key="DynamicActiveBackgroundFAColor" Color="{DynamicResource SolidBackgroundFillColorBase}" />
     <!--<StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SelectedTabViewColorKv" />
     <SolidColorBrush x:Key="SelectedTabViewColorKv" Color="Transparent" />-->
 
diff --git a/KeyVaultExplorer/Resources/Styles.axaml b/KeyVaultExplorer/Resources/Styles.axaml
index b0910296..08f75a67 100644
--- a/KeyVaultExplorer/Resources/Styles.axaml
+++ b/KeyVaultExplorer/Resources/Styles.axaml
@@ -5,7 +5,7 @@
     xmlns:uip="using:FluentAvalonia.UI.Controls.Primitives">
     <Design.PreviewWith />
 
-    <Style Selector="TextBox">
+    <Style Selector="TextBox.IsSmall">
         <Setter Property="MinHeight" Value="30" />
         <Setter Property="MaxHeight" Value="30" />
         <Setter Property="Height" Value="30" />
@@ -13,6 +13,13 @@
         <Setter Property="Padding" Value="8,2,2,2" />
     </Style>
 
+    <Style Selector="TextBox.isCompact">
+        <Setter Property="MinHeight" Value="25" />
+        <Setter Property="Padding" Value="5,0,0,0" />
+        <Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+    </Style>
+
     <Style Selector="ui|CommandBarFlyoutCommandBar /template/ Border#LayoutRoot">
         <Setter Property="Margin" Value="10" />
         <Setter Property="BoxShadow" Value="0 4 10 0 #34000000" />
diff --git a/KeyVaultExplorer/Services/VaultService.cs b/KeyVaultExplorer/Services/VaultService.cs
index cad86195..be19242c 100644
--- a/KeyVaultExplorer/Services/VaultService.cs
+++ b/KeyVaultExplorer/Services/VaultService.cs
@@ -185,6 +185,7 @@ public async IAsyncEnumerable<KeyVaultResource> GetKeyVaultResources()
             }
         }
     }
+
     public async IAsyncEnumerable<KeyVaultResource> GetKeyVaultsByResourceGroup(ResourceGroupResource resource)
     {
         var armClient = new ArmClient(new CustomTokenCredential(await _authService.GetAzureArmTokenSilent()));
@@ -230,12 +231,16 @@ public async Task<KeyVaultSecret> GetSecret(Uri kvUri, string secretName)
         {
             throw new KeyVaultItemNotFoundException(ex.Message, ex);
         }
+        catch (Exception ex) when (ex.Message.Contains("403"))
+        {
+            throw new KeyVaultInSufficientPrivileges(ex.Message, ex);
+        }
     }
 
-    public async Task<List<SecretProperties>> GetSecretProperties(Uri kvUri, string name)
+    public async Task<List<SecretProperties>> GetSecretProperties(Uri keyVaultUri, string name)
     {
         var token = new CustomTokenCredential(await _authService.GetAzureKeyVaultTokenSilent());
-        var client = new SecretClient(kvUri, token);
+        var client = new SecretClient(keyVaultUri, token);
         List<SecretProperties> list = new();
         try
         {
@@ -269,6 +274,7 @@ public async Task<Dictionary<string, KeyVaultResource>> GetStoredSelectedSubscri
     }
 
     public record SubscriptionResourceWithNextPageToken(SubscriptionResource SubscriptionResource, string ContinuationToken);
+
     public async IAsyncEnumerable<CertificateProperties> GetVaultAssociatedCertificates(Uri kvUri)
     {
         var token = new CustomTokenCredential(await _authService.GetAzureKeyVaultTokenSilent());
@@ -309,4 +315,21 @@ public async IAsyncEnumerable<KeyVaultResource> GetWithKeyVaultsBySubscriptionAs
             yield return kvResource;
         }
     }
+
+    public async Task<KeyVaultSecret> CreateSecret(KeyVaultSecret keyVaultSecret, Uri KeyVaultUri)
+    {
+            var token = new CustomTokenCredential(await _authService.GetAzureKeyVaultTokenSilent());
+            SecretClient client = new SecretClient(KeyVaultUri, token);
+            return await client.SetSecretAsync(keyVaultSecret);
+       
+    }
+
+    public async Task<SecretProperties> UpdateSecret(SecretProperties secretProperties, Uri KeyVaultUri)
+    {
+        var token = new CustomTokenCredential(await _authService.GetAzureKeyVaultTokenSilent());
+
+                SecretClient client = new SecretClient(KeyVaultUri, token);
+
+              return  await client.UpdateSecretPropertiesAsync(secretProperties);
+    }
 }
\ No newline at end of file
diff --git a/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs b/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
new file mode 100644
index 00000000..58be9de7
--- /dev/null
+++ b/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
@@ -0,0 +1,90 @@
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using KeyVaultExplorer.Views;
+using KeyVaultExplorer.Services;
+using System.Threading.Tasks;
+using System.Threading;
+using System.Linq;
+using Azure.Security.KeyVault.Secrets;
+using System;
+
+namespace KeyVaultExplorer.ViewModels;
+
+public partial class CreateNewSecretVersionViewModel : ViewModelBase
+{
+    [ObservableProperty]
+    private bool isBusy = false;
+
+    [ObservableProperty]
+    private bool isEdit = false;
+
+    public bool HasActivationDate => KeyVaultSecretModel is not null && KeyVaultSecretModel.NotBefore.HasValue;
+    public bool HasExpirationDate => KeyVaultSecretModel is not null && KeyVaultSecretModel.ExpiresOn.HasValue;
+
+    [ObservableProperty]
+    private string secretValue;
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(Location))]
+    [NotifyPropertyChangedFor(nameof(HasActivationDate))]
+    [NotifyPropertyChangedFor(nameof(HasExpirationDate))]
+    private SecretProperties keyVaultSecretModel;
+
+    [ObservableProperty]
+    private TimeSpan? expiresOnTimespan;
+
+    [ObservableProperty]
+    private TimeSpan? notBeforeTimespan;
+
+    public string? Location => KeyVaultSecretModel?.VaultUri.ToString();
+    public string? Identifier => KeyVaultSecretModel?.Id.ToString();
+
+    private readonly AuthService _authService;
+    private readonly VaultService _vaultService;
+    private NotificationViewModel _notificationViewModel;
+
+    public CreateNewSecretVersionViewModel()
+    {
+        _authService = Defaults.Locator.GetRequiredService<AuthService>();
+        _vaultService = Defaults.Locator.GetRequiredService<VaultService>();
+        _notificationViewModel = Defaults.Locator.GetRequiredService<NotificationViewModel>();
+    }
+
+    [RelayCommand]
+    public async Task EditDetails()
+    {
+        if (KeyVaultSecretModel.NotBefore.HasValue)
+            KeyVaultSecretModel.NotBefore = KeyVaultSecretModel.NotBefore.Value.Date + (NotBeforeTimespan.HasValue ? NotBeforeTimespan.Value : TimeSpan.Zero);
+
+        if (KeyVaultSecretModel.ExpiresOn.HasValue)
+            KeyVaultSecretModel.ExpiresOn = KeyVaultSecretModel.ExpiresOn.Value.Date + (ExpiresOnTimespan.HasValue ? ExpiresOnTimespan.Value : TimeSpan.Zero);
+
+        var updatedProps = await _vaultService.UpdateSecret(KeyVaultSecretModel, KeyVaultSecretModel.VaultUri);
+        KeyVaultSecretModel = updatedProps;
+    }
+
+    [RelayCommand]
+    public async Task NewVersion()
+    {
+        var newSecret = new KeyVaultSecret(KeyVaultSecretModel.Name, SecretValue);
+        if (KeyVaultSecretModel.NotBefore.HasValue)
+            newSecret.Properties.NotBefore = KeyVaultSecretModel.NotBefore.Value.Date + (NotBeforeTimespan.HasValue ? NotBeforeTimespan.Value : TimeSpan.Zero);
+
+        if (KeyVaultSecretModel.ExpiresOn.HasValue)
+            newSecret.Properties.ExpiresOn = KeyVaultSecretModel.ExpiresOn.Value.Date + (ExpiresOnTimespan.HasValue ? ExpiresOnTimespan.Value : TimeSpan.Zero);
+
+        newSecret.Properties.ContentType = KeyVaultSecretModel.ContentType;
+
+        var newVersion = await _vaultService.CreateSecret(newSecret, KeyVaultSecretModel.VaultUri);
+        var properties = (await _vaultService.GetSecretProperties(newVersion.Properties.VaultUri, newVersion.Name)).First();
+        KeyVaultSecretModel = properties;
+    }
+
+    partial void OnKeyVaultSecretModelChanging(SecretProperties model)
+    {
+        ExpiresOnTimespan = model is not null && model.ExpiresOn.HasValue ? model?.ExpiresOn.Value.LocalDateTime.TimeOfDay : null;
+        NotBeforeTimespan = model is not null && model.NotBefore.HasValue ? model?.NotBefore.Value.LocalDateTime.TimeOfDay : null;
+    }
+}
\ No newline at end of file
diff --git a/KeyVaultExplorer/ViewModels/NotificationViewModel.cs b/KeyVaultExplorer/ViewModels/NotificationViewModel.cs
index 16378fcf..cf988757 100644
--- a/KeyVaultExplorer/ViewModels/NotificationViewModel.cs
+++ b/KeyVaultExplorer/ViewModels/NotificationViewModel.cs
@@ -1,7 +1,10 @@
-using Avalonia.Controls;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
 using FluentAvalonia.UI.Controls;
-using System;
+using FluentAvalonia.UI.Windowing;
+using System.Linq;
 
 namespace KeyVaultExplorer.ViewModels;
 
@@ -16,21 +19,19 @@ public void AddMessage(Notification notification)
 
     public async void ShowErrorPopup(Notification notification)
     {
-        // Declaring a TaskDialog from C#:
         var td = new TaskDialog
         {
-            // Title property only applies on Windowed dialogs
             Title = notification.Title,
             Header = notification.Title,
             Content = notification.Message,
-            //IconSource = new SymbolIconSource { Symbol = Symbol.clos },
-            FooterVisibility = TaskDialogFooterVisibility.Auto,
-            //Footer = new CheckBox { Content = "Never show me this again" },
+            FooterVisibility = TaskDialogFooterVisibility.Always,
+            IsFooterExpanded = false,
+            Buttons = { TaskDialogButton.CloseButton },
 
-            Buttons = { TaskDialogButton.CloseButton }
         };
-        td.XamlRoot = App.Current.GetTopLevel();
-
-        var result = await td.ShowAsync();
+          //Avalonia.Application.Current.GetTopLevel() as AppWindow;
+        var lifetime = App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+        td.XamlRoot = lifetime.Windows.Last() as AppWindow;
+        await td.ShowAsync(true);
     }
 }
\ No newline at end of file
diff --git a/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs b/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
index 6669f06a..8d61196a 100644
--- a/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
+++ b/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
@@ -1,4 +1,5 @@
-using Avalonia.Input;
+using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
@@ -7,6 +8,7 @@
 using Azure.Security.KeyVault.Secrets;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using FluentAvalonia.UI.Controls;
 using KeyVaultExplorer.Exceptions;
 using KeyVaultExplorer.Models;
 using KeyVaultExplorer.Services;
@@ -14,6 +16,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading.Tasks;
@@ -26,6 +29,13 @@ public partial class PropertiesPageViewModel : ViewModelBase
     private readonly AuthService _authService;
     private readonly IClipboard _clipboardService;
     private readonly IStorageProvider _storageService;
+    private readonly NotificationViewModel _notificationViewModel;
+
+    [ObservableProperty]
+    private bool isManaged = false;
+
+    [ObservableProperty]
+    private bool isEnabled = false;
 
     [ObservableProperty]
     private bool isSecret = false;
@@ -78,7 +88,7 @@ public PropertiesPageViewModel(KeyVaultContentsAmalgamation model)
         _settingsPageViewModel = Defaults.Locator.GetRequiredService<SettingsPageViewModel>();
         _clipboardService = Defaults.Locator.GetRequiredService<IClipboard>();
         _storageService = Defaults.Locator.GetRequiredService<IStorageProvider>();
-
+        _notificationViewModel = new NotificationViewModel();// Defaults.Locator.GetRequiredService<NotificationViewModel>();
         OpenedItem = model;
         Dispatcher.UIThread.InvokeAsync(async () =>
         {
@@ -93,18 +103,22 @@ private async Task GetPropertiesForKeyVaultValue(KeyVaultContentsAmalgamation mo
             case KeyVaultItemType.Certificate:
                 var certificateProperties = await _vaultService.GetCertificateProperties(model.VaultUri, model.Name);
                 CertificatePropertiesList = new ObservableCollection<CertificateProperties>(certificateProperties);
+                IsEnabled = certificateProperties.First().Enabled ?? false;
                 IsCertificate = true;
                 break;
 
             case KeyVaultItemType.Key:
                 var keyPropertiesList = new ObservableCollection<KeyProperties>(await _vaultService.GetKeyProperties(model.VaultUri, model.Name));
-
+                IsManaged = keyPropertiesList.First().Managed;
+                IsEnabled = keyPropertiesList.First().Enabled ?? false;
                 KeyPropertiesList = new ObservableCollection<KeyProperties>(keyPropertiesList);
                 IsKey = true;
                 break;
 
             case KeyVaultItemType.Secret:
                 var secretPropertiesList = new ObservableCollection<SecretProperties>(await _vaultService.GetSecretProperties(model.VaultUri, model.Name));
+                IsManaged = secretPropertiesList.First().Managed;
+                IsEnabled = secretPropertiesList.First().Enabled ?? false;
                 SecretPropertiesList = new ObservableCollection<SecretProperties>(secretPropertiesList);
                 IsSecret = true;
                 break;
@@ -121,7 +135,7 @@ private async Task GetPropertiesForKeyVaultValue(KeyVaultContentsAmalgamation mo
     [RelayCommand]
     private async Task ShouldShowValue(bool val)
     {
-        if (IsSecret && val)
+        if (IsSecret && val && IsEnabled)
         {
             var s = await _vaultService.GetSecret(kvUri: OpenedItem.SecretProperties.VaultUri, secretName: OpenedItem.SecretProperties.Name).ConfigureAwait(false);
             SecretPlainText = s.Value;
@@ -164,6 +178,97 @@ private async Task Copy()
         }
     }
 
+    [RelayCommand]
+    private async Task NewVersion()
+    {
+        try
+        {
+            var dialog = new ContentDialog()
+            {
+                Title = "New Version",
+                PrimaryButtonText = "Create Version",
+                IsPrimaryButtonEnabled = true,
+                CloseButtonText = "Cancel",
+            };
+            var currentItem = SecretPropertiesList.OrderByDescending(x => x.CreatedOn).First();
+            var newVersion = new SecretProperties(currentItem.Id)
+            {
+                Enabled = true,
+            };
+           
+            var viewModel = new CreateNewSecretVersionViewModel();
+            viewModel.KeyVaultSecretModel = newVersion;
+
+            dialog.PrimaryButtonClick += async (sender, args) =>
+            {
+                var def = args.GetDeferral();
+                await viewModel.NewVersionCommand.ExecuteAsync(null);
+                def.Complete();
+            };
+
+            dialog.Content = new CreateNewSecretVersion() { DataContext = viewModel };
+
+            var result = await dialog.ShowAsync();
+        }
+        catch (KeyVaultItemNotFoundException ex)
+        {
+        }
+        catch (KeyVaultInSufficientPrivileges ex)
+        {
+            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Rights" });
+        }
+    }
+
+    private async void OnPrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+    {
+        var def = args.GetDeferral();
+        def.Complete();
+    }
+
+    [RelayCommand]
+    private async Task EditVersion()
+    {
+        try
+        {
+            var dialog = new ContentDialog()
+            {
+                Title = "Edit Secret",
+                IsPrimaryButtonEnabled = true,
+                PrimaryButtonText = "Apply Changes",
+                CloseButtonText = "Cancel",
+            };
+
+            var currentItem = SecretPropertiesList.OrderByDescending(x => x.CreatedOn).First();
+            var viewModel = new CreateNewSecretVersionViewModel();
+            bool? isEnabledSecret = currentItem.Enabled;
+            if (isEnabledSecret is not null && isEnabledSecret is true)
+                await ShouldShowValue(true);
+            viewModel.KeyVaultSecretModel = currentItem;
+            viewModel.IsEdit = true;
+            dialog.PrimaryButtonClick += async (sender, args) =>
+            {
+                var def = args.GetDeferral();
+                await viewModel.EditDetailsCommand.ExecuteAsync(null);
+                def.Complete();
+            };
+
+            // In our case the Content is a UserControl, but can be anything.
+            dialog.Content = new CreateNewSecretVersion()
+            {
+                DataContext = viewModel
+            };
+
+            var result = await dialog.ShowAsync();
+        }
+        catch (KeyVaultItemNotFoundException ex)
+        {
+        }
+        catch (KeyVaultInSufficientPrivileges ex)
+        {
+            _notificationViewModel.ShowErrorPopup(new Avalonia.Controls.Notifications.Notification { Message = ex.Message, Title = "Insufficient Rights" });
+        }
+    }
+
     public async Task ClearClipboardAsync()
     {
         await Task.Delay(_settingsPageViewModel.ClearClipboardTimeout * 1000); // convert to seconds
diff --git a/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs b/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs
index e00efad1..2dbd3f84 100644
--- a/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs
+++ b/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs
@@ -396,18 +396,18 @@ private void ShowProperties(KeyVaultContentsAmalgamation model)
             Icon = BitmapImage,
             SizeToContent = SizeToContent.Manual,
             WindowStartupLocation = WindowStartupLocation.CenterOwner,
-            ShowAsDialog = false,
+            ShowAsDialog = true,
             CanResize = true,
             Content = new PropertiesPage { DataContext = new PropertiesPageViewModel(model) },
-            Width = 620,
-            Height = 480,
-            MinWidth = 300,
+            Width = 820,
+            Height = 680,
+            Topmost = false,
             ExtendClientAreaToDecorationsHint = true,
             // TransparencyLevelHint = new List<WindowTransparencyLevel>() { WindowTransparencyLevel.Mica, WindowTransparencyLevel.AcrylicBlur },
             // Background = null,
         };
 
         var topLevel = Avalonia.Application.Current.GetTopLevel() as AppWindow;
-        taskDialog.Show(topLevel);
+        taskDialog.ShowDialog(topLevel);
     }
 }
\ No newline at end of file
diff --git a/KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml b/KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml
index 65c7183f..a66b91e6 100644
--- a/KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml
+++ b/KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml
@@ -135,6 +135,7 @@
                 HorizontalAlignment="Stretch"
                 VerticalContentAlignment="Center"
                 AcceptsReturn="False"
+                Classes.IsSmall="True"
                 Classes.clearButton="True"
                 FontSize="{StaticResource FontSizeSmall}"
                 IsEnabled="{Binding !IsBusy}"
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml
new file mode 100644
index 00000000..6bf29ca3
--- /dev/null
+++ b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml
@@ -0,0 +1,126 @@
+<UserControl
+    x:Class="KeyVaultExplorer.CreateNewSecretVersion"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:KeyVaultExplorer.ViewModels"
+    d:DesignHeight="450"
+    d:DesignWidth="600"
+    x:DataType="vm:CreateNewSecretVersionViewModel"
+    mc:Ignorable="d">
+
+
+    <ScrollViewer>
+        <StackPanel MinWidth="400" Margin="10">
+
+            <Grid ColumnDefinitions="*" RowDefinitions="*,*,*,*,*,*,*,*,*,*">
+                <!--      <StackPanel Grid.Row="0" Orientation="Vertical">
+                    <TextBlock
+                        Margin="0,0,10,0"
+                        VerticalAlignment="Center"
+                        Text="Secret Name" />
+                    <TextBox IsEnabled="{Binding Identifier, Converter={x:Static ObjectConverters.IsNull}}" Text="{Binding KeyVaultSecretModel.Name}" />
+                </StackPanel>
+
+
+                <StackPanel Grid.Row="2" Orientation="Vertical">
+                    <TextBlock
+                        Margin="0,0,10,0"
+                        VerticalAlignment="Center"
+                        Text="Secret Identifier" />
+                    <TextBox IsEnabled="{Binding Identifier, Converter={x:Static ObjectConverters.IsNull}}" Text="{Binding Identifier}" />
+                </StackPanel>
+
+
+                <StackPanel Grid.Row="1" Orientation="Vertical">
+                    <TextBlock
+                        Margin="0,0,10,0"
+                        VerticalAlignment="Center"
+                        Text="Vault Location:" />
+                    <TextBox IsEnabled="{Binding Identifier, Converter={x:Static ObjectConverters.IsNull}}" Text="{Binding Location}" />
+                </StackPanel>-->
+
+
+                <StackPanel Grid.Row="0">
+                    <CheckBox
+                        Name="SetActivationDateCheckbox"
+                        IsChecked="{Binding HasActivationDate}"
+                        ToolTip.Tip="Sets when this resource will become active. This sets the 'nbf' property on the resource. A new current but inactive version will still be created after this operation.">
+                        Set Activation Date
+                    </CheckBox>
+                    <StackPanel
+                        IsVisible="{Binding #SetActivationDateCheckbox.IsChecked}"
+                        Orientation="Vertical"
+                        Spacing="5">
+                        <DatePicker
+                            MinWidth="400"
+                            HorizontalAlignment="Left"
+                            SelectedDate="{Binding KeyVaultSecretModel.NotBefore}" />
+                        <TimePicker MinWidth="400" SelectedTime="{Binding NotBeforeTimespan}" />
+                    </StackPanel>
+                    <CheckBox
+                        Name="SetExpirationDateCheckbox"
+                        IsChecked="{Binding HasExpirationDate}"
+                        ToolTip.Tip="Sets when this resource will become inactive. This sets the 'exp' property on the resource.">
+                        Set Expiration Date
+                    </CheckBox>
+                    <StackPanel
+                        IsVisible="{Binding #SetExpirationDateCheckbox.IsChecked}"
+                        Orientation="Vertical"
+                        Spacing="5">
+                        <DatePicker MinWidth="400" SelectedDate="{Binding KeyVaultSecretModel.ExpiresOn}" />
+                        <TimePicker MinWidth="400" SelectedTime="{Binding ExpiresOnTimespan, Mode=TwoWay}" />
+                    </StackPanel>
+                </StackPanel>
+
+
+                <StackPanel
+                    Grid.Row="2"
+                    Orientation="Horizontal"
+                    Spacing="5">
+                    <TextBlock
+                        Margin="0,4,0,0"
+                        VerticalAlignment="Center"
+                        Text="Enabled" />
+                    <ToggleSwitch
+                        IsChecked="{Binding KeyVaultSecretModel.Enabled}"
+                        OffContent="No"
+                        OnContent="Yes" />
+                </StackPanel>
+
+
+
+                <StackPanel
+                    Grid.Row="3"
+                    Orientation="Vertical"
+                    Spacing="5">
+                    <TextBlock VerticalAlignment="Center" Text="Secret Content type (optional)" />
+                    <TextBox Classes.IsSmall="True" Text="{Binding KeyVaultSecretModel.ContentType}" />
+                </StackPanel>
+
+
+                <StackPanel
+                    Grid.Row="4"
+                    Orientation="Vertical"
+                    Spacing="5">
+                    <TextBlock VerticalAlignment="Center" Text="Secret Value" />
+
+                    <TextBox
+                        Height="100"
+                        AcceptsReturn="True"
+                        AcceptsTab="True"
+                        IsEnabled="{Binding !IsEdit}"
+                        RevealPassword="True"
+                        Text="{Binding SecretValue}"
+                        TextWrapping="Wrap"
+                        Watermark="Enter the secret" />
+
+                </StackPanel>
+
+            </Grid>
+
+        </StackPanel>
+    </ScrollViewer>
+
+</UserControl>
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml.cs b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml.cs
new file mode 100644
index 00000000..9325640a
--- /dev/null
+++ b/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml.cs
@@ -0,0 +1,27 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Threading;
+using KeyVaultExplorer.ViewModels;
+namespace KeyVaultExplorer;
+
+public partial class CreateNewSecretVersion : UserControl
+{
+    public CreateNewSecretVersion()
+    {
+        InitializeComponent();
+        DataContext = new CreateNewSecretVersionViewModel();
+    }
+
+    private void InputField_OnAttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
+    {
+        // We will set the focus into our input field just after it got attached to the visual tree.
+        if (sender is InputElement inputElement)
+        {
+            Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                inputElement.Focus(NavigationMethod.Unspecified, KeyModifiers.None);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml b/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml
index a8aadc2e..b0de10d6 100644
--- a/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml
+++ b/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml
@@ -28,6 +28,17 @@
                     <Setter Property="VerticalAlignment" Value="Bottom" />
                 </Style>
             </Style>
+
+            <Style Selector="Border.isInput">
+                <Setter Property="Background" Value="{DynamicResource LayerFillColorDefaultBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
+                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="CornerRadius" Value="4" />
+                <Style Selector="^ SelectableTextBlock">
+                    <Setter Property="Margin" Value="5,0" />
+                </Style>
+            </Style>
+
         </Styles>
     </UserControl.Styles>
 
@@ -57,13 +68,34 @@
                     ToolTip.VerticalOffset="10" />
                 <ui:CommandBarButton
                     Height="40"
+                    VerticalContentAlignment="Center"
                     Command="{Binding CopyCommand}"
                     IconSource="Copy"
                     IsVisible="{Binding !IsCertificate}"
                     Label="Copy"
+                    ToolTip.Tip="Copy Value (cleared after configured seconds)"
+                    ToolTip.VerticalOffset="10" />
+
+                <ui:CommandBarButton
+                    Height="40"
                     VerticalContentAlignment="Center"
-                    ToolTip.Tip="Copy Value (cleared after 30 seconds) "
+                    Command="{Binding EditVersionCommand}"
+                    IconSource="Edit"
+                    IsEnabled="{Binding !IsManaged}"
+                    Label="Edit"
+                    ToolTip.Tip="Edit Current Version"
                     ToolTip.VerticalOffset="10" />
+
+                <ui:CommandBarButton
+                    Height="40"
+                    VerticalContentAlignment="Center"
+                    Command="{Binding NewVersionCommand}"
+                    IconSource="Add"
+                    IsEnabled="{Binding !IsManaged}"
+                    Label="New Version"
+                    ToolTip.Tip="Create New Version"
+                    ToolTip.VerticalOffset="10" />
+
                 <ui:CommandBarButton
                     Height="40"
                     Command="{Binding DownloadCommand}"
@@ -130,7 +162,7 @@
                                     FontSize="20"
                                     IsChecked="{Binding ShowValue}"
                                     RenderOptions.TextRenderingMode="Antialias"
-                                    Theme="{StaticResource TransparentButton}"
+                                    Theme="{StaticResource TransparentToggleButton}"
                                     ToolTip.Tip="Show/Hide"
                                     ToolTip.VerticalOffset="10"
                                     ZIndex="1" />
@@ -154,12 +186,13 @@
                             BorderThickness="1"
                             CornerRadius="4">
                             <ScrollViewer VerticalScrollBarVisibility="Visible">
-                                <StackPanel MaxHeight="300" VerticalAlignment="Stretch">
+                                <StackPanel  VerticalAlignment="Stretch">
                                     <TextBlock Text="Properties" Theme="{StaticResource BodyStrongTextBlockStyle}" />
                                     <Grid
                                         HorizontalAlignment="Stretch"
-                                        ColumnDefinitions="100,*"
-                                        RowDefinitions="*,*,*,*">
+                                        VerticalAlignment="Stretch"
+                                        ColumnDefinitions="250,*"
+                                        RowDefinitions="*,*,*,*,*,*,*">
                                         <Grid.Styles>
                                             <Style Selector="TextBlock">
                                                 <Setter Property="Theme" Value="{StaticResource CaptionTextBlockStyle}" />
@@ -168,39 +201,73 @@
                                         <TextBlock
                                             Grid.Row="0"
                                             Grid.Column="0"
-                                            Text="Created:" />
+                                            Text="Name:" />
+                                        <SelectableTextBlock
+                                            Grid.Row="0"
+                                            Grid.Column="1"
+                                            xml:space="preserve"
+                                            Text="{Binding OpenedItem.Name}" />
+
                                         <TextBlock
                                             Grid.Row="1"
                                             Grid.Column="0"
-                                            Text="Updated:" />
+                                            Text="Location:" />
+                                        <SelectableTextBlock
+                                            Grid.Row="1"
+                                            Grid.Column="1"
+                                            xml:space="preserve"
+                                            Text="{Binding OpenedItem.VaultUri}" />
+
                                         <TextBlock
                                             Grid.Row="2"
                                             Grid.Column="0"
                                             Text="Identifier:" />
+                                        <SelectableTextBlock
+                                            Grid.Row="2"
+                                            Grid.Column="1"
+                                            xml:space="preserve"
+                                            Text="{Binding OpenedItem.Id}" />
+
                                         <TextBlock
                                             Grid.Row="3"
                                             Grid.Column="0"
-                                            Text="Expires:" />
+                                            Text="Activation:" />
                                         <SelectableTextBlock
-                                            Grid.Row="0"
+                                            Grid.Row="3"
                                             Grid.Column="1"
                                             xml:space="preserve"
-                                            Text="{Binding OpenedItem.CreatedOn}" />
+                                            Text="{Binding OpenedItem.NotBefore}" />
+
+                                        <TextBlock
+                                            Grid.Row="4"
+                                            Grid.Column="0"
+                                            Text="Expiration:" />
                                         <SelectableTextBlock
-                                            Grid.Row="1"
+                                            Grid.Row="4"
                                             Grid.Column="1"
                                             xml:space="preserve"
-                                            Text="{Binding OpenedItem.UpdatedOn}" />
+                                            Text="{Binding OpenedItem.ExpiresOn}" />
+
+                                        <TextBlock
+                                            Grid.Row="5"
+                                            Grid.Column="0"
+                                            Text="Created:" />
                                         <SelectableTextBlock
-                                            Grid.Row="2"
+                                            Grid.Row="5"
                                             Grid.Column="1"
                                             xml:space="preserve"
-                                            Text="{Binding OpenedItem.Id}" />
+                                            Text="{Binding OpenedItem.CreatedOn}" />
+
+                                        <TextBlock
+                                            Grid.Row="6"
+                                            Grid.Column="0"
+                                            Text="Updated:" />
                                         <SelectableTextBlock
-                                            Grid.Row="3"
+                                            Grid.Row="6"
                                             Grid.Column="1"
                                             xml:space="preserve"
-                                            Text="{Binding OpenedItem.ExpiresOn}" />
+                                            Text="{Binding OpenedItem.UpdatedOn}" />
+
                                     </Grid>
 
 
diff --git a/KeyVaultExplorer/Views/Pages/TabViewPage.axaml b/KeyVaultExplorer/Views/Pages/TabViewPage.axaml
index 707c147e..828a5e22 100644
--- a/KeyVaultExplorer/Views/Pages/TabViewPage.axaml
+++ b/KeyVaultExplorer/Views/Pages/TabViewPage.axaml
@@ -27,6 +27,8 @@
             </Style>
         </Styles>
     </UserControl.Styles>
+    <!--  PanePlacement="Right"  -->
+
     <SplitView
         Name="VaultListSplitView"
         VerticalAlignment="Stretch"
diff --git a/KeyVaultExplorer/Views/Pages/VaultPage.axaml b/KeyVaultExplorer/Views/Pages/VaultPage.axaml
index 2823a90f..2b1ba64a 100644
--- a/KeyVaultExplorer/Views/Pages/VaultPage.axaml
+++ b/KeyVaultExplorer/Views/Pages/VaultPage.axaml
@@ -122,6 +122,7 @@
                     HorizontalAlignment="Stretch"
                     VerticalContentAlignment="Center"
                     AcceptsReturn="False"
+                    Classes.IsSmall="True"
                     Classes.clearButton="True"
                     ClipToBounds="True"
                     DockPanel.Dock="Right"