diff --git a/src/KeyKeeper/SettingsWindow.cs b/src/KeyKeeper/SettingsWindow.cs
index 6f38710..7009de0 100644
--- a/src/KeyKeeper/SettingsWindow.cs
+++ b/src/KeyKeeper/SettingsWindow.cs
@@ -30,6 +30,7 @@ public class SettingsWindow : Window
         var titleText = new TextBlock
         {
             Text = "App Settings",
+            Foreground = this.FindResource("KeyKeeperHeadingTextBrush") as IBrush,
             FontSize = 20,
             FontWeight = FontWeight.Bold,
             Margin = new Thickness(0, 0, 0, 10)
diff --git a/src/KeyKeeper/Styles/AppTheme.axaml b/src/KeyKeeper/Styles/AppTheme.axaml
index 78dd1f0..1660fba 100644
--- a/src/KeyKeeper/Styles/AppTheme.axaml
+++ b/src/KeyKeeper/Styles/AppTheme.axaml
@@ -16,6 +16,7 @@
             <Color x:Key="KeyKeeperForeground">#00000000</Color>
             <Color x:Key="KeyKeeperBackground">#FFFFFFFF</Color>
 
+            <SolidColorBrush x:Key="KeyKeeperHeadingTextBrush" Color="{DynamicResource KeyKeeperAccentColor}" />
             <SolidColorBrush x:Key="KeyKeeperAboutWindowBackgroundBrush" Color="{DynamicResource KeyKeeperAccentColor}" />
             <SolidColorBrush x:Key="KeyKeeperAboutWindowForegroundBrush" Color="#FFFFFFFF" />
           </ResourceDictionary>
@@ -35,6 +36,10 @@
         <Setter Property="Background" Value="#444444" />
         <Setter Property="Foreground" Value="#ffffff" />
     </Style>
+    <Style Selector="Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="#d7d7d7" />
+        <Setter Property="Foreground" Value="#777777" />
+    </Style>
     <Style Selector="Button.accentSidebarButton /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Background" Value="#00000000" />
         <Setter Property="Foreground" Value="white" />
diff --git a/src/KeyKeeper/Views/EntryEditWindow.axaml b/src/KeyKeeper/Views/EntryEditWindow.axaml
index a513870..b84fe60 100644
--- a/src/KeyKeeper/Views/EntryEditWindow.axaml
+++ b/src/KeyKeeper/Views/EntryEditWindow.axaml
@@ -5,17 +5,19 @@
         x:Class="KeyKeeper.Views.EntryEditWindow"
         x:DataType="vm:EntryEditViewModel"
         Title="Add Entry"
-        CanResize="False"
-        Width="450"
+        CanResize="True"
+        MinWidth="560"
+        MinHeight="400"
+        Width="560"
         Height="400"
         Background="White">
 
     <ScrollViewer>
-        <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*" ColumnDefinitions="1*,3*" Margin="5">
+        <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*" ColumnDefinitions="3*,8*" Margin="5">
             <TextBlock Text="Add New Password Entry" FontSize="20" HorizontalAlignment="Center"
                     Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,0,20"/>
 
-            <TextBlock Text="Entry name:" HorizontalAlignment="Right"
+            <TextBlock Text="Label:" HorizontalAlignment="Right"
                     Grid.Row="1" Grid.Column="0" Margin="5" />
             <TextBox Name="EntryNameEdit" Text="{Binding EntryName}" Grid.Row="1" Grid.Column="1" Margin="5" />