diff --git a/src/ScriptRunner/ScriptRunner.GUI/Parameters/ParamsPanelFactory.cs b/src/ScriptRunner/ScriptRunner.GUI/Parameters/ParamsPanelFactory.cs
index f7d66a7..d7e6e79 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Parameters/ParamsPanelFactory.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/Parameters/ParamsPanelFactory.cs
@@ -84,16 +84,15 @@ public ParamsPanel Create(ScriptConfig action, Dictionary<string, string> values
                 bool _isResizing = false;
                 Point _lastPointerPosition = default;
                 
-                // Create toolbar
+                // Create toolbar for expand button only
                 var toolbar = new StackPanel()
                 {
                     Orientation = Orientation.Horizontal,
                     Height = 24,
                     HorizontalAlignment = HorizontalAlignment.Right,
-                    //Background = new SolidColorBrush(Color.FromArgb(50, 128, 128, 128)),
                     Spacing = 5,
                     ZIndex = 1,
-                    Margin = new Thickness(0,-25,0,0),
+                    Margin = new Thickness(0,0,10,-35),
                 };
                 
                 // Expand button to open overlay
@@ -133,15 +132,21 @@ public ParamsPanel Create(ScriptConfig action, Dictionary<string, string> values
                     }
                 };
                 
-                // Resize handle
+                toolbar.Children.Add(expandButton);
+
+                // Create a grid to overlay the resize handle on the editor
+                var grid = new Grid();
+                grid.Children.Add(controlRecord.Control);
+                
+                // Resize handle positioned at bottom right of editor
                 var resizeHandle = new Border()
                 {
-                    Width = 24,
-                    Height = 24,
                     Background = Brushes.Transparent,
                     Cursor = new Cursor(StandardCursorType.BottomRightCorner),
-                    VerticalAlignment = VerticalAlignment.Center,
-                    Margin = new Thickness(2,5,0,0),
+                    VerticalAlignment = VerticalAlignment.Bottom,
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    Margin = new Thickness(0,0,5,0),
+                    ZIndex = 10
                 };
                 
                 var resizeIcon = new Icon()
@@ -186,15 +191,14 @@ public ParamsPanel Create(ScriptConfig action, Dictionary<string, string> values
                     _isResizing = false;
                 };
 
-                toolbar.Children.Add(expandButton);
-                toolbar.Children.Add(resizeHandle);
+                grid.Children.Add(resizeHandle);
 
                 var panel = new StackPanel()
                 {
                     Orientation = Orientation.Vertical
                 };
-                panel.Children.Add(controlRecord.Control);
                 panel.Children.Add(toolbar);
+                panel.Children.Add(grid);
                 controlForEdit = panel;
 
 
@@ -535,35 +539,19 @@ private IControlRecord CreateControlRecord(ScriptParam p, string? value, int ind
                     UncheckedValue =  p.GetPromptSettings("uncheckedValue", out var uncheckedValue)? uncheckedValue: defaultUnchecked,
                 };
             case PromptType.Multilinetext:
-                if (p.GetPromptSettings("syntax", out var syntax) && !string.IsNullOrWhiteSpace(syntax))
-                {
-                    return new TextControl
-                    {
-                        Control = CreateAvaloniaEdit(value, index, syntax)
-                    };
-                }
-
-                // Use regular TextBox without syntax highlighting
+                p.GetPromptSettings("syntax", out var syntax);
+                syntax ??= "txt";
                 return new TextControl
                 {
-                    Control = new TextBox
-                    {
-                        TextWrapping = TextWrapping.Wrap,
-                        AcceptsReturn = true,
-                        Height = 100,
-                        Text = value,
-                        TabIndex = index,
-                        IsTabStop = true,
-                        Width = 500,
-                    }
+                    Control = CreateAvaloniaEdit(value, index, syntax)
                 };
+               
             case PromptType.FileContent:
                 if (string.IsNullOrWhiteSpace(value) == false && Path.IsPathRooted(value) == false)
                 {
                     value = Path.GetFullPath(value, scriptConfig.WorkingDirectory);
                 }
                 
-                
                 var templateText  = p.GetPromptSettings("templateText", out var rawTemplate)? rawTemplate: "";
                 var textForControl = File.Exists(value) ? File.ReadAllText(value) : templateText;
 
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
index 7dc6e8c..ade8658 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
@@ -216,20 +216,22 @@ public MainWindowViewModel(ParamsPanelFactory paramsPanelFactory, VaultProvider
         this._configRepositoryUpdater = new ConfigRepositoryUpdater(new CliRepositoryClient(command =>
         {
             var tcs = new TaskCompletionSource<CliCommandOutputs>();
-            
-            var job = new RunningJobViewModel
+            Dispatcher.UIThread.Post(() =>
             {
-                Tile = $"Update repository",
-                ExecutedCommand = $"{command.Command} {command.Parameters}",
-            };
-            this.RunningJobs.Add(job);
-            SelectedRunningJob = job;
+                var job = new RunningJobViewModel
+                {
+                    Tile = $"Update repository",
+                    ExecutedCommand = $"{command.Command} {command.Parameters}",
+                };
+                this.RunningJobs.Add(job);
+                SelectedRunningJob = job;
 
-            job.ExecutionCompleted += (sender, args) =>
-            {
-                tcs.SetResult(new(job.RawOutput, job.RawErrorOutput));
-            };        
-            job.RunJob(command.Command, command.Parameters, command.WorkingDirectory, Array.Empty<InteractiveInputDescription>(), Array.Empty<TroubleshootingItem>());
+                job.ExecutionCompleted += (sender, args) =>
+                {
+                    tcs.SetResult(new(job.RawOutput, job.RawErrorOutput));
+                };        
+                job.RunJob(command.Command, command.Parameters, command.WorkingDirectory, Array.Empty<InteractiveInputDescription>(), Array.Empty<TroubleshootingItem>());
+            }); 
             return tcs.Task;
         }));
         IsScriptListVisible = true;
@@ -478,6 +480,10 @@ public void DismissNewVersionAvailable()
         ShowNewVersionAvailable = false;
     }
 
+    public void DismissOutdatedRepositories()
+    {
+        OutOfDateConfigRepositories.Clear();
+    }
     private IEnumerable<IControlRecord> _controlRecords;
 
     //private ActionsConfig config;
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/NotificationSection.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/NotificationSection.axaml
index 34bdd3d..a28bbe7 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/NotificationSection.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/NotificationSection.axaml
@@ -7,43 +7,170 @@
              xmlns:viewModels="clr-namespace:ScriptRunner.GUI.ViewModels"
              xmlns:converters="clr-namespace:ScriptRunner.GUI.Converters"
              xmlns:avalonia="clr-namespace:LoadingIndicators.Avalonia;assembly=LoadingIndicators.Avalonia"
+             xmlns:icons="https://github.com/projektanker/icons.avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="viewModels:MainWindowViewModel"
              x:Class="ScriptRunner.GUI.Views.NotificationSection">
     <UserControl.Resources>
         <converters:CountToVisibilityConverter x:Key="CountToVisibilityConverter"/>
     </UserControl.Resources>
-    <StackPanel Orientation="Vertical">
-        <StackPanel IsVisible="{Binding ShowNewVersionAvailable}" Height="75">
-            <Border BorderBrush="#FF0000" BorderThickness="1"  >
-                <StackPanel  Orientation="Horizontal" Margin="20" VerticalAlignment="Center">
-                    <TextBlock VerticalAlignment="Center" Text="A newer version is available"></TextBlock>
-                    <Button Margin="20,0,0,0" VerticalAlignment="Center" Command="{Binding CheckForUpdates}">Check release log</Button>
-                    <Button Margin="20,0,0,0" VerticalAlignment="Center" Command="{Binding InstallUpdate}">Install update</Button>
-                    <Button Margin="20,0,0,0" VerticalAlignment="Center" Command="{Binding DismissNewVersionAvailable}">Dismiss</Button>
+    <StackPanel Orientation="Vertical" Margin="10,5">
+        <!-- New Version Available Notification -->
+        <Border IsVisible="{Binding ShowNewVersionAvailable}" 
+                Background="#2B2B2B" 
+                BorderBrush="#3baced" 
+                BorderThickness="1" 
+                CornerRadius="5"
+                Padding="15,12"
+                Margin="0,5">
+            <Grid ColumnDefinitions="Auto,Auto,Auto,*">
+                <Border Grid.Column="0"
+                        Background="#3baced" 
+                        CornerRadius="3" 
+                        Width="32" 
+                        Height="32" 
+                        Margin="0,0,12,0"
+                        VerticalAlignment="Center">
+                    <icons:Icon Value="fas fa-download" 
+                                FontSize="16" 
+                                Foreground="White"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"/>
+                </Border>
+                <StackPanel Grid.Column="1" 
+                            VerticalAlignment="Center" 
+                            Margin="0,0,15,0">
+                    <TextBlock Text="A newer version is available" 
+                               FontWeight="SemiBold" 
+                               FontSize="14"/>
+                    <TextBlock Text="Update to get the latest features and improvements" 
+                               FontSize="12" 
+                               Foreground="#B0B0B0" 
+                               Margin="0,2,0,0"/>
                 </StackPanel>
-            </Border>
-        </StackPanel>
-        <StackPanel IsVisible="{Binding OutOfDateConfigRepositories.Count, Converter={StaticResource CountToVisibilityConverter}}">
-            <Border BorderBrush="#FF0000" BorderThickness="1"  >
-                <StackPanel  Orientation="Vertical" Margin="20" VerticalAlignment="Center">
-                    <TextBlock VerticalAlignment="Center" Text="You have some outdated repositories with script configuration files:"></TextBlock>
-                    <ItemsControl ItemsSource="{Binding OutOfDateConfigRepositories}">
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate x:DataType="backgroundTasks:OutdatedRepositoryModel">
-                                <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
-                                    <TextBlock VerticalAlignment="Center" Text="{Binding Path}"></TextBlock>
-                                    <TextBlock VerticalAlignment="Center" Margin="5,0" Text="{Binding BranchName, StringFormat='(branch: {0})'}"></TextBlock>
-                                    <Button  Margin="20,0,0,0" VerticalAlignment="Center"  IsEnabled="{Binding !IsPulling}"
-                                            Command="{Binding DataContext.PullRepoChanges, RelativeSource={RelativeSource AncestorType={x:Type views:MainWindow}}}"
-                                            CommandParameter="{Binding}">Pull</Button>
-                                    <avalonia:LoadingIndicator  IsActive="{Binding IsPulling}" Mode="Arc" SpeedRatio="1.2" />
-                                </StackPanel>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
+                <StackPanel Grid.Column="2" 
+                            Orientation="Horizontal" 
+                            VerticalAlignment="Center">
+                    <Button Classes="primary" 
+                            Margin="0,0,8,0" 
+                            Command="{Binding InstallUpdate}"
+                            ToolTip.Tip="Download and install the update">
+                        <StackPanel Orientation="Horizontal">
+                            <icons:Icon Value="fas fa-rocket" FontSize="12" Margin="0,0,5,0"/>
+                            <TextBlock Text="Install Update"/>
+                        </StackPanel>
+                    </Button>
+                    <Button Margin="0,0,8,0" 
+                            Command="{Binding CheckForUpdates}"
+                            ToolTip.Tip="View the release notes">
+                        <StackPanel Orientation="Horizontal">
+                            <icons:Icon Value="fas fa-file-alt" FontSize="12" Margin="0,0,5,0"/>
+                            <TextBlock Text="Release Notes"/>
+                        </StackPanel>
+                    </Button>
+                    <Button Command="{Binding DismissNewVersionAvailable}"
+                            ToolTip.Tip="Dismiss this notification">
+                        <TextBlock Text="Dismiss"/>
+                    </Button>
                 </StackPanel>
-            </Border>
-        </StackPanel>
+            </Grid>
+        </Border>
+
+        <!-- Outdated Repositories Notification -->
+        <Border IsVisible="{Binding OutOfDateConfigRepositories.Count, Converter={StaticResource CountToVisibilityConverter}}"
+                Background="#2B2B2B" 
+                BorderBrush="#FF9800" 
+                BorderThickness="1" 
+                CornerRadius="5"
+                Padding="15,12"
+                Margin="0,5">
+            <StackPanel Orientation="Vertical">
+                <!-- Header -->
+                <Grid ColumnDefinitions="Auto,Auto,Auto,*" Margin="0,0,0,10">
+                    <Border Grid.Column="0"
+                            Background="#FF9800" 
+                            CornerRadius="3" 
+                            Width="32" 
+                            Height="32" 
+                            Margin="0,0,12,0"
+                            VerticalAlignment="Center">
+                        <icons:Icon Value="fas fa-exclamation-triangle" 
+                                    FontSize="16" 
+                                    Foreground="White"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"/>
+                    </Border>
+                    <StackPanel Grid.Column="1" 
+                                VerticalAlignment="Center" 
+                                Margin="0,0,15,0">
+                        <TextBlock Text="Outdated Script Repositories" 
+                                   FontWeight="SemiBold" 
+                                   FontSize="14"/>
+                        <TextBlock Text="Updates are available for your script configuration repositories" 
+                                   FontSize="12" 
+                                   Foreground="#B0B0B0" 
+                                   Margin="0,2,0,0"/>
+                    </StackPanel>
+                    <Button Grid.Column="2"
+                            VerticalAlignment="Center"
+                            Command="{Binding DismissOutdatedRepositories}"
+                            ToolTip.Tip="Dismiss all outdated repository notifications">
+                        <TextBlock Text="Dismiss"/>
+                    </Button>
+                </Grid>
+                
+                <!-- Repository List -->
+                <ItemsControl ItemsSource="{Binding OutOfDateConfigRepositories}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate x:DataType="backgroundTasks:OutdatedRepositoryModel">
+                            <Border Background="#1e1f22" 
+                                    BorderBrush="#4E4E4E" 
+                                    BorderThickness="1" 
+                                    CornerRadius="3"
+                                    Padding="12,10"
+                                    Margin="0,0,0,8">
+                                <Grid ColumnDefinitions="Auto,*,Auto">
+                                    <icons:Icon Grid.Column="0" 
+                                                Value="fab fa-git-alt" 
+                                                FontSize="20" 
+                                                Foreground="#FF9800"
+                                                VerticalAlignment="Center"
+                                                Margin="0,0,12,0"/>
+                                    <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                                        <TextBlock Text="{Binding Path}" 
+                                                   FontWeight="Medium" 
+                                                   FontSize="13"/>
+                                        <TextBlock Text="{Binding BranchName, StringFormat='Branch: {0}'}" 
+                                                   FontSize="11" 
+                                                   Foreground="#B0B0B0" 
+                                                   Margin="0,2,0,0"/>
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="2" 
+                                                Orientation="Horizontal" 
+                                                VerticalAlignment="Center">
+                                        <Button Classes="primary"
+                                                IsEnabled="{Binding !IsPulling}"
+                                                Command="{Binding DataContext.PullRepoChanges, RelativeSource={RelativeSource AncestorType={x:Type views:MainWindow}}}"
+                                                CommandParameter="{Binding}"
+                                                ToolTip.Tip="Pull the latest changes from this repository">
+                                            <StackPanel Orientation="Horizontal">
+                                                <icons:Icon Value="fas fa-sync-alt" FontSize="12" Margin="0,0,5,0"/>
+                                                <TextBlock Text="Pull Changes"/>
+                                            </StackPanel>
+                                        </Button>
+                                        <avalonia:LoadingIndicator IsActive="{Binding IsPulling}" 
+                                                                   Mode="Arc" 
+                                                                   SpeedRatio="1.2" 
+                                                                   Width="24"
+                                                                   Height="24"
+                                                                   Margin="8,0,0,0"/>
+                                    </StackPanel>
+                                </Grid>
+                            </Border>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </StackPanel>
+        </Border>
     </StackPanel>
 </UserControl>
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/PredefinedParameterSaveWindow.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/PredefinedParameterSaveWindow.axaml
index 313b697..0264bd9 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/PredefinedParameterSaveWindow.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/PredefinedParameterSaveWindow.axaml
@@ -3,35 +3,132 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:views="clr-namespace:ScriptRunner.GUI.Views"
-        mc:Ignorable="d" Width="500" Height="250"
+        xmlns:avalonia="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
+        mc:Ignorable="d" 
+        Width="550" 
+        Height="470"
         x:Class="ScriptRunner.GUI.Views.PredefinedParameterSaveWindow"
-        Title="Save argument values as..."
+        Title="Save Argument Values"
         WindowStartupLocation="CenterOwner"
-        >
-  <Grid Margin="10, 10, 20, 10" x:DataType="views:SavePredefinedParameterVM">
-      <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="Auto"></ColumnDefinition>
-          <ColumnDefinition Width="*"></ColumnDefinition>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-          <RowDefinition Height="Auto"></RowDefinition>
-          <RowDefinition Height="Auto"></RowDefinition>
-          <RowDefinition Height="Auto"></RowDefinition>
-          <RowDefinition Height="Auto"></RowDefinition>
-      </Grid.RowDefinitions>
-      
-      <RadioButton IsChecked="{Binding UseDefault}" Grid.Row="0" Grid.Column="0" GroupName="Source" VerticalAlignment="Center" Margin="20,10" >Default set</RadioButton>
-      
-    <RadioButton IsChecked="{Binding UseNew}" Grid.Row="1" Grid.Column="0" GroupName="Source" VerticalAlignment="Center" Margin="20,10" >New set:</RadioButton>
-    <TextBox HorizontalAlignment="Stretch" IsEnabled="{Binding UseNew}" Text="{Binding NewName}" Margin="0,10" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"></TextBox>
- 
-      
-    <RadioButton IsChecked="{Binding UseExisting}" Grid.Row="2" Grid.Column="0" GroupName="Source" VerticalAlignment="Center" Margin="20, 10">Existing set:</RadioButton>
-    <ComboBox HorizontalAlignment="Stretch" ItemsSource="{Binding ExistingSets}" SelectedItem="{Binding SelectedExisting}" IsEnabled="{Binding UseExisting}" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"></ComboBox>
-    <Button Click="Save" Padding="30,10" Margin="0,30" Grid.Row="3" Grid.ColumnSpan="2" HorizontalAlignment="Center" >Save</Button>
+        Background="#212222"
+        FontFamily="Segoe UI Variable">
+    
+    <Grid x:DataType="views:SavePredefinedParameterVM">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+        </Grid.RowDefinitions>
         
-
-
-
-  </Grid>
+        <!-- Content Section -->
+        <Border Grid.Row="0" Margin="15,15,15,10" Padding="20" 
+                BorderThickness="1" BorderBrush="#4E4E4E" 
+                Background="#2B2B2B" CornerRadius="3">
+            <StackPanel Spacing="15">
+                <StackPanel Orientation="Horizontal" Spacing="8">
+                    <avalonia:Icon Value="fas fa-save" FontSize="16" Foreground="#85DFFF" VerticalAlignment="Center"/>
+                    <TextBlock Text="Choose where to save the argument values" 
+                               FontSize="15" 
+                               FontWeight="SemiBold" 
+                               VerticalAlignment="Center"/>
+                </StackPanel>
+                
+                <!-- Default Set Option -->
+                <Border BorderThickness="1" BorderBrush="#4E4E4E" 
+                        Background="#252525" CornerRadius="3" Padding="12">
+                    <RadioButton IsChecked="{Binding UseDefault}" 
+                                 GroupName="Source" 
+                                 VerticalAlignment="Center">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <avalonia:Icon Value="fas fa-star" FontSize="14" Foreground="#FFD700" VerticalAlignment="Center"/>
+                            <TextBlock Text="Default set" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </RadioButton>
+                </Border>
+                
+                <!-- New Set Option -->
+                <Border BorderThickness="1" BorderBrush="#4E4E4E" 
+                        Background="#252525" CornerRadius="3" Padding="12">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"></RowDefinition>
+                            <RowDefinition Height="Auto"></RowDefinition>
+                        </Grid.RowDefinitions>
+                        
+                        <RadioButton Grid.Row="0" 
+                                     IsChecked="{Binding UseNew}" 
+                                     GroupName="Source" 
+                                     VerticalAlignment="Center"
+                                     Margin="0,0,0,10">
+                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                <avalonia:Icon Value="fas fa-plus-circle" FontSize="14" Foreground="#85DFFF" VerticalAlignment="Center"/>
+                                <TextBlock Text="New set" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </RadioButton>
+                        
+                        <TextBox Grid.Row="1" 
+                                 HorizontalAlignment="Stretch" 
+                                 IsEnabled="{Binding UseNew}" 
+                                 Text="{Binding NewName}" 
+                                 Watermark="Enter new set name"
+                                 Background="#1e1e1e"
+                                 MinHeight="32"
+                                 Margin="25,0,0,0"/>
+                    </Grid>
+                </Border>
+                
+                <!-- Existing Set Option -->
+                <Border BorderThickness="1" BorderBrush="#4E4E4E" 
+                        Background="#252525" CornerRadius="3" Padding="12">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"></RowDefinition>
+                            <RowDefinition Height="Auto"></RowDefinition>
+                        </Grid.RowDefinitions>
+                        
+                        <RadioButton Grid.Row="0" 
+                                     IsChecked="{Binding UseExisting}" 
+                                     GroupName="Source" 
+                                     VerticalAlignment="Center"
+                                     Margin="0,0,0,10">
+                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                <avalonia:Icon Value="fas fa-folder" FontSize="14" Foreground="#85DFFF" VerticalAlignment="Center"/>
+                                <TextBlock Text="Existing set" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </RadioButton>
+                        
+                        <ComboBox Grid.Row="1" 
+                                  HorizontalAlignment="Stretch" 
+                                  ItemsSource="{Binding ExistingSets}" 
+                                  SelectedItem="{Binding SelectedExisting}" 
+                                  IsEnabled="{Binding UseExisting}"
+                                  Background="#1e1e1e"
+                                  MinHeight="32"
+                                  Margin="25,0,0,0"/>
+                    </Grid>
+                </Border>
+            </StackPanel>
+        </Border>
+        
+        <!-- Bottom Action Bar -->
+        <Border Grid.Row="1" BorderThickness="0,1,0,0" BorderBrush="#4E4E4E" 
+                Background="#252525" Padding="15">
+            <Button Click="Save" 
+                    Padding="30,10" 
+                    MinWidth="140"
+                    HorizontalAlignment="Center"
+                    HorizontalContentAlignment="Center"
+                    Background="#1a5c3a"
+                    Classes="primary">
+                <Button.Styles>
+                    <Style Selector="Button:pointerover /template/ ContentPresenter">
+                        <Setter Property="Background" Value="#1a7c4a" />
+                    </Style>
+                </Button.Styles>
+                <StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Center">
+                    <avalonia:Icon Value="fas fa-save" FontSize="14"/>
+                    <TextBlock Text="Save" FontWeight="SemiBold"/>
+                </StackPanel>
+            </Button>
+        </Border>
+    </Grid>
 </Window>
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/Vault.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/Vault.axaml
index c9330ee..40651fc 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/Vault.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/Vault.axaml
@@ -4,70 +4,157 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:viewModels="clr-namespace:ScriptRunner.GUI.ViewModels"
         xmlns:avalonia="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="650"
-        Width="800"
+        mc:Ignorable="d" d:DesignWidth="900" d:DesignHeight="650"
+        Width="900"
         Height="650"
         x:Class="ScriptRunner.GUI.Views.Vault"
         WindowStartupLocation="CenterOwner"
-        Title="Vault">
+        Title="Vault - Secure Key-Value Storage"
+        Background="#212222"
+        FontFamily="Segoe UI Variable"
+        KeyboardNavigation.TabNavigation="Cycle">
     <Design.DataContext>
         <viewModels:VaultViewModel />
     </Design.DataContext>
 
-  <Grid x:Name="MainGrid">
+    <Grid x:Name="MainGrid" KeyboardNavigation.TabNavigation="Local">
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
             <RowDefinition Height="Auto"></RowDefinition>
         </Grid.RowDefinitions>
-      <ScrollViewer >
-          <ItemsRepeater ItemsSource="{Binding FilteredEntries}">
-              <ItemsRepeater.ItemTemplate>
-                  <DataTemplate x:DataType="viewModels:VaultEntry">
-                      <Grid Margin="10,10,10,0">
-                          <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"></ColumnDefinition>
-                              <ColumnDefinition Width="0.5*"></ColumnDefinition>
-                              <ColumnDefinition Width="Auto"></ColumnDefinition>
-                              <ColumnDefinition Width="0.5*"></ColumnDefinition>
-                              <ColumnDefinition Width="Auto"></ColumnDefinition>
-                          </Grid.ColumnDefinitions>
-                          <Label Margin="0,0,10,0" Height="23"  VerticalAlignment="Center">Key</Label>
-                          <TextBox Grid.Column="1" Height="23" Text="{Binding Name, Mode=TwoWay}"></TextBox>
-                          <Label Grid.Column="2" Margin="10,0,10,0" Height="23"  VerticalAlignment="Center">Value</Label>
-                          <TextBox  PasswordChar="*" Height="23"  Grid.Column="3" Text="{Binding Secret, Mode=TwoWay}" ></TextBox>
-                          <Button  
-                              Grid.Column="4" 
-                              avalonia:Attached.Icon="fas fa-trash" 
-                              Margin="10,5,15,5"
-                              Height="30" 
-                              Width="30" 
-                              FontSize="18" 
-                              Command="{Binding ElementName=MainGrid, Path=DataContext.RemoveVaultEntryCommand}" 
-                              CommandParameter="{Binding }" 
-                              ToolTip.Tip="Remove entry"/>
-
-                      </Grid>
-                  </DataTemplate>
-              </ItemsRepeater.ItemTemplate>
-              <ItemsRepeater.Styles>
-                  <Style Selector="ItemsPresenter">
-                      <Setter Property="(KeyboardNavigation.TabNavigation)" Value="Continue" />
-                  </Style>
-              </ItemsRepeater.Styles>
-          </ItemsRepeater>
-      </ScrollViewer>
-    <DockPanel  Grid.Row="1" >
-      <Button  Command="{Binding AddNewVaultEntry}" Margin="20">
-        <StackPanel Orientation="Horizontal">
-          <avalonia:Icon Value="fa fa-plus" Margin="4,0"/>
-          <TextBlock Text="Add new vault entry"></TextBlock>
-        </StackPanel>
-      </Button>
-
-      <Button Margin="10" Click="CloseVaultDialog" HorizontalAlignment="Right"> Close</Button>
-
-    </DockPanel>
+        
+        <!-- Header Section -->
+        <Border Grid.Row="0" Padding="15" Margin="15,15,15,10" 
+                BorderThickness="1" CornerRadius="3" BorderBrush="#85DFFF"
+                Background="#2B2B2B"
+                IsTabStop="False">
+            <StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="0,0,0,5">
+                    <avalonia:Icon Value="fas fa-key" FontSize="20" Margin="0,0,10,0" Foreground="#85DFFF"/>
+                    <TextBlock Classes="h2" Text="Vault Entries" VerticalAlignment="Center"/>
+                </StackPanel>
+                <TextBlock TextWrapping="Wrap" Foreground="#B0B0B0" FontSize="13"
+                           Text="Store and manage sensitive data securely. Keys and values are encrypted and protected."/>
+            </StackPanel>
+        </Border>
 
+        <!-- Vault Entries List -->
+        <ScrollViewer Grid.Row="1" Margin="10,0,10,10" 
+                      IsTabStop="False"
+                      TabIndex="0">
+            <ItemsRepeater ItemsSource="{Binding FilteredEntries}">
+                <ItemsRepeater.ItemTemplate>
+                    <DataTemplate x:DataType="viewModels:VaultEntry">
+                        <Border Margin="10,5,10,5" Padding="15" 
+                                BorderThickness="1" BorderBrush="#4E4E4E" 
+                                Background="#2B2B2B" CornerRadius="3"
+                                IsTabStop="False">
+                            <Grid KeyboardNavigation.TabNavigation="Local">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" MinWidth="80"></ColumnDefinition>
+                                    <ColumnDefinition Width="*" MinWidth="200"></ColumnDefinition>
+                                    <ColumnDefinition Width="15"></ColumnDefinition>
+                                    <ColumnDefinition Width="Auto" MinWidth="80"></ColumnDefinition>
+                                    <ColumnDefinition Width="*" MinWidth="200"></ColumnDefinition>
+                                    <ColumnDefinition Width="Auto"></ColumnDefinition>
+                                </Grid.ColumnDefinitions>
+                                
+                                <!-- Key Label and Input -->
+                                <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" IsTabStop="False">
+                                    <avalonia:Icon Value="fas fa-tag" FontSize="14" Margin="0,0,8,0" Foreground="#85DFFF"/>
+                                    <TextBlock Text="Key" VerticalAlignment="Center" FontWeight="SemiBold"/>
+                                </StackPanel>
+                                <TextBox Grid.Column="1" 
+                                         Text="{Binding Name, Mode=TwoWay}" 
+                                         Watermark="Enter key name"
+                                         Background="#1e1e1e"
+                                         VerticalAlignment="Center"
+                                         TabIndex="0"/>
+                                
+                                <!-- Spacer -->
+                                
+                                <!-- Value Label and Input -->
+                                <StackPanel Grid.Column="3" Orientation="Horizontal" VerticalAlignment="Center" IsTabStop="False">
+                                    <avalonia:Icon Value="fas fa-lock" FontSize="14" Margin="0,0,8,0" Foreground="#85DFFF"/>
+                                    <TextBlock Text="Value" VerticalAlignment="Center" FontWeight="SemiBold"/>
+                                </StackPanel>
+                                <TextBox Grid.Column="4" 
+                                         PasswordChar="●" 
+                                         Text="{Binding Secret, Mode=TwoWay}" 
+                                         Watermark="Enter secret value"
+                                         Background="#1e1e1e"
+                                         VerticalAlignment="Center"
+                                         TabIndex="1"/>
+                                
+                                <!-- Delete Button -->
+                                <Button Grid.Column="5" 
+                                        avalonia:Attached.Icon="fas fa-trash" 
+                                        Margin="15,0,0,0"
+                                        Height="32" 
+                                        Width="32"
+                                        Padding="0"
+                                        FontSize="14"
+                                        Background="#3D1F1F"
+                                        Command="{Binding ElementName=MainGrid, Path=DataContext.RemoveVaultEntryCommand}" 
+                                        CommandParameter="{Binding }" 
+                                        ToolTip.Tip="Remove entry"
+                                        IsTabStop="False">
+                                    <Button.Styles>
+                                        <Style Selector="Button:pointerover /template/ ContentPresenter">
+                                            <Setter Property="Background" Value="#7D1F1F" />
+                                        </Style>
+                                    </Button.Styles>
+                                </Button>
+                            </Grid>
+                        </Border>
+                    </DataTemplate>
+                </ItemsRepeater.ItemTemplate>
+                <ItemsRepeater.Styles>
+                    <Style Selector="ItemsPresenter">
+                        <Setter Property="(KeyboardNavigation.TabNavigation)" Value="Continue" />
+                    </Style>
+                </ItemsRepeater.Styles>
+            </ItemsRepeater>
+        </ScrollViewer>
         
-   </Grid>
+        <!-- Bottom Action Bar -->
+        <Border Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="#4E4E4E" 
+                Background="#252525" Padding="15"
+                IsTabStop="False">
+            <Grid KeyboardNavigation.TabNavigation="Local">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                
+                <Button Grid.Column="0" 
+                        Command="{Binding AddNewVaultEntry}" 
+                        HorizontalAlignment="Left"
+                        Padding="15,8"
+                        Background="#1a5c3a"
+                        Classes="primary"
+                        TabIndex="1000">
+                    <Button.Styles>
+                        <Style Selector="Button:pointerover /template/ ContentPresenter">
+                            <Setter Property="Background" Value="#1a7c4a" />
+                        </Style>
+                    </Button.Styles>
+                    <StackPanel Orientation="Horizontal">
+                        <avalonia:Icon Value="fa fa-plus" FontSize="16" Margin="0,0,8,0"/>
+                        <TextBlock Text="Add New Entry" FontWeight="SemiBold"/>
+                    </StackPanel>
+                </Button>
+
+                <Button Grid.Column="1" 
+                        Click="CloseVaultDialog" 
+                        HorizontalAlignment="Right"
+                        Padding="20,8"
+                        MinWidth="100"
+                        TabIndex="1001" HorizontalContentAlignment="Center">
+                    <TextBlock Text="Close"/>
+                </Button>
+            </Grid>
+        </Border>
+    </Grid>
 </Window>
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/VaultPicker.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/VaultPicker.axaml
index 4198131..0b1e67c 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/VaultPicker.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/VaultPicker.axaml
@@ -3,25 +3,86 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:vm="clr-namespace:ScriptRunner.GUI.Views"
-        mc:Ignorable="d" Width="400"
-        SizeToContent="WidthAndHeight"
+        xmlns:avalonia="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
+        mc:Ignorable="d" 
+        Width="500"
+        Height="300"
         x:Class="ScriptRunner.GUI.Views.VaultPicker"
         WindowStartupLocation="CenterOwner"
-        Title="Pick secret">
+        Title="Select Vault Secret"
+        Background="#212222"
+        FontFamily="Segoe UI Variable">
     <Design.DataContext>
       <vm:VaultPickerViewModel />
     </Design.DataContext>
-    <Border BorderBrush="#A1A1A1" BorderThickness="1">
-        <StackPanel Margin="40, 40, 40, 20" >
-            <ComboBox Name="SecretsCombo" ItemsSource="{Binding Entries}" SelectedItem="{Binding SelectedEntry, Mode=TwoWay}"  HorizontalAlignment="Center" Margin="10,0,0,20" Width="300">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Name}"  />
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-            <CheckBox Name="Remember" Margin="0,0,0,20">Remember binding</CheckBox>
-            <Button HorizontalAlignment="Center" Click="Accept">Use selected secret</Button>
-        </StackPanel>
-    </Border>
-  </Window>
+    
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+        </Grid.RowDefinitions>
+        
+        <!-- Content Section -->
+        <Border Grid.Row="0" Margin="15,15,15,10" Padding="20" 
+                BorderThickness="1" BorderBrush="#4E4E4E" 
+                Background="#2B2B2B" CornerRadius="3">
+            <StackPanel Spacing="15">
+                <!-- Secret Selection -->
+                <StackPanel Spacing="8">
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                        <avalonia:Icon Value="fas fa-lock" FontSize="14" Foreground="#85DFFF" VerticalAlignment="Center"/>
+                        <TextBlock Text="Secret Key" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                    </StackPanel>
+                    <ComboBox Name="SecretsCombo" 
+                              ItemsSource="{Binding Entries}" 
+                              SelectedItem="{Binding SelectedEntry, Mode=TwoWay}"
+                              HorizontalAlignment="Stretch"
+                              Background="#1e1e1e"
+                              MinHeight="32">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Name}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                </StackPanel>
+                
+                <!-- Remember Binding Option -->
+                <Border BorderThickness="1" BorderBrush="#4E4E4E" 
+                        Background="#252525" CornerRadius="3" Padding="12">
+                    <StackPanel Orientation="Horizontal" Spacing="10">
+                        <CheckBox Name="Remember" VerticalAlignment="Center"/>
+                        <StackPanel Spacing="2">
+                            <TextBlock Text="Remember this binding" FontWeight="SemiBold"/>
+                            <TextBlock Text="This secret will be automatically selected next time" 
+                                       FontSize="12" 
+                                       Foreground="#B0B0B0"/>
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+            </StackPanel>
+        </Border>
+        
+        <!-- Bottom Action Bar -->
+        <Border Grid.Row="1" BorderThickness="0,1,0,0" BorderBrush="#4E4E4E" 
+                Background="#252525" Padding="15">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10">
+                <Button Click="Accept"
+                        Padding="20,8"
+                        MinWidth="120"
+                        Background="#007BFF"
+                        Classes="primary">
+                    <Button.Styles>
+                        <Style Selector="Button:pointerover /template/ ContentPresenter">
+                            <Setter Property="Background" Value="#0056D2" />
+                        </Style>
+                    </Button.Styles>
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                        <avalonia:Icon Value="fas fa-check" FontSize="14"/>
+                        <TextBlock Text="Use Secret" FontWeight="SemiBold"/>
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>