diff --git a/Dashboard/AddServerDialog.xaml b/Dashboard/AddServerDialog.xaml
index 5d39a23f..84d3e5f1 100644
--- a/Dashboard/AddServerDialog.xaml
+++ b/Dashboard/AddServerDialog.xaml
@@ -2,29 +2,15 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Add SQL Server"
-        Height="550" Width="500"
+        SizeToContent="Height" Width="450" MaxHeight="700"
         WindowStartupLocation="CenterOwner"
         ResizeMode="NoResize"
         Background="{DynamicResource BackgroundBrush}"
         Foreground="{DynamicResource ForegroundBrush}">
-    <Window.Resources>
-        <Style TargetType="TextBox">
-            <Setter Property="Background" Value="{DynamicResource BackgroundLightBrush}"/>
-            <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
-            <Setter Property="CaretBrush" Value="{DynamicResource ForegroundBrush}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        </Style>
-        <Style TargetType="PasswordBox">
-            <Setter Property="Background" Value="{DynamicResource BackgroundLightBrush}"/>
-            <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
-            <Setter Property="CaretBrush" Value="{DynamicResource ForegroundBrush}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        </Style>
-    </Window.Resources>
     <Grid Margin="20">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
@@ -34,97 +20,93 @@
                    Foreground="{DynamicResource ForegroundBrush}"/>
 
         <!-- Form Fields -->
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
-            <StackPanel>
-                <!-- Display Name -->
-                <TextBlock Text="Display Name:" FontWeight="Bold" Margin="0,0,0,5"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
-                <TextBox x:Name="DisplayNameTextBox" Height="25" Margin="0,0,0,15"
-                         ToolTip="Friendly name to display in the server list"/>
+        <StackPanel Grid.Row="1">
+            <!-- Server Name/Address -->
+            <TextBlock Text="Server Name/Address:" FontWeight="Bold" Margin="0,0,0,4"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <TextBox x:Name="ServerNameTextBox" Margin="0,0,0,12"
+                     ToolTip="e.g., localhost, server.domain.com, 192.168.1.100, server\instance"/>
 
-                <!-- Server Name/Address -->
-                <TextBlock Text="Server Name/Address:" FontWeight="Bold" Margin="0,0,0,5"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
-                <TextBox x:Name="ServerNameTextBox" Height="25" Margin="0,0,0,15"
-                         ToolTip="e.g., localhost, server.domain.com, 192.168.1.100, server\instance"/>
+            <!-- Display Name -->
+            <TextBlock Text="Display Name (optional):" FontWeight="Bold" Margin="0,0,0,4"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <TextBox x:Name="DisplayNameTextBox" Margin="0,0,0,12"
+                     ToolTip="Friendly name to display in the server list"/>
+
+            <!-- Authentication Type -->
+            <TextBlock Text="Authentication:" FontWeight="Bold" Margin="0,0,0,4"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <StackPanel Margin="0,0,0,12">
+                <RadioButton x:Name="WindowsAuthRadio" Content="Windows Authentication"
+                             GroupName="Auth" IsChecked="True"
+                             Foreground="{DynamicResource ForegroundBrush}"
+                             Checked="AuthType_Changed" Margin="0,0,0,4"/>
+                <RadioButton x:Name="SqlAuthRadio" Content="SQL Server Authentication"
+                             GroupName="Auth"
+                             Foreground="{DynamicResource ForegroundBrush}"
+                             Checked="AuthType_Changed" Margin="0,0,0,4"/>
+                <RadioButton x:Name="EntraMfaAuthRadio" Content="Microsoft Entra MFA"
+                             GroupName="Auth"
+                             Foreground="{DynamicResource ForegroundBrush}"
+                             Checked="AuthType_Changed"
+                             ToolTip="Interactive authentication with MFA for Azure SQL Database."/>
+            </StackPanel>
 
-                <!-- Authentication Type -->
-                <TextBlock Text="Authentication:" FontWeight="Bold" Margin="0,0,0,5"
+            <!-- SQL Authentication Fields -->
+            <StackPanel x:Name="SqlAuthPanel" Visibility="Collapsed" Margin="0,0,0,12">
+                <TextBlock Text="Username:" Margin="0,0,0,4"
                            Foreground="{DynamicResource ForegroundBrush}"/>
-                <StackPanel Margin="0,0,0,15">
-                    <RadioButton x:Name="WindowsAuthRadio" Content="Windows Authentication"
-                                 GroupName="Auth" IsChecked="True"
-                                 Foreground="{DynamicResource ForegroundBrush}"
-                                 Checked="AuthType_Changed" Margin="0,0,0,4"/>
-                    <RadioButton x:Name="SqlAuthRadio" Content="SQL Server Authentication"
-                                 GroupName="Auth"
-                                 Foreground="{DynamicResource ForegroundBrush}"
-                                 Checked="AuthType_Changed" Margin="0,0,0,4"/>
-                    <RadioButton x:Name="EntraMfaAuthRadio" Content="Microsoft Entra MFA"
-                                 GroupName="Auth"
-                                 Foreground="{DynamicResource ForegroundBrush}"
-                                 Checked="AuthType_Changed"
-                                 ToolTip="Interactive authentication with MFA for Azure SQL Database."/>
-                </StackPanel>
+                <TextBox x:Name="UsernameTextBox" Margin="0,0,0,8"/>
 
-                <!-- SQL Authentication Fields -->
-                <StackPanel x:Name="SqlAuthPanel" Visibility="Collapsed" Margin="0,0,0,15">
-                    <TextBlock Text="Username:" FontWeight="Bold" Margin="0,0,0,5"
-                               Foreground="{DynamicResource ForegroundBrush}"/>
-                    <TextBox x:Name="UsernameTextBox" Height="25" Margin="0,0,0,15"/>
+                <TextBlock Text="Password:" Margin="0,0,0,4"
+                           Foreground="{DynamicResource ForegroundBrush}"/>
+                <PasswordBox x:Name="PasswordBox"/>
+            </StackPanel>
 
-                    <TextBlock Text="Password:" FontWeight="Bold" Margin="0,0,0,5"
-                               Foreground="{DynamicResource ForegroundBrush}"/>
-                    <PasswordBox x:Name="PasswordBox" Height="25" Margin="0,0,0,0"/>
-                </StackPanel>
+            <!-- Microsoft Entra MFA Fields -->
+            <StackPanel x:Name="EntraMfaPanel" Visibility="Collapsed" Margin="0,0,0,12">
+                <TextBlock Text="Username (optional):" Margin="0,0,0,4"
+                           Foreground="{DynamicResource ForegroundBrush}"/>
+                <TextBox x:Name="EntraMfaUsernameBox"
+                         ToolTip="Optional: Pre-populate the authentication dialog with this email address"/>
+            </StackPanel>
 
-                <!-- Microsoft Entra MFA Fields -->
-                <StackPanel x:Name="EntraMfaPanel" Visibility="Collapsed" Margin="0,0,0,15">
-                    <TextBlock Text="Username (optional):" FontWeight="Bold" Margin="0,0,0,5"
+            <!-- Connection Options -->
+            <TextBlock Text="Connection Options:" FontWeight="Bold" Margin="0,0,0,4"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <StackPanel Margin="0,0,0,12">
+                <!-- Encryption Mode -->
+                <StackPanel Orientation="Horizontal" Margin="0,0,0,6">
+                    <TextBlock Text="Encryption:" Width="80" VerticalAlignment="Center"
                                Foreground="{DynamicResource ForegroundBrush}"/>
-                    <TextBox x:Name="EntraMfaUsernameBox" Height="25" Margin="0,0,0,0"
-                             ToolTip="Optional: Pre-populate the authentication dialog with this email address"/>
+                    <ComboBox x:Name="EncryptModeComboBox" Width="150"
+                              SelectedIndex="1"
+                              ToolTip="Optional: Encrypt if server supports it&#x0a;Mandatory: Always encrypt (fails if not supported)&#x0a;Strict: Full validation required">
+                        <ComboBoxItem Content="Optional"/>
+                        <ComboBoxItem Content="Mandatory"/>
+                        <ComboBoxItem Content="Strict"/>
+                    </ComboBox>
                 </StackPanel>
 
-                <!-- Description -->
-                <TextBlock Text="Description (optional):" FontWeight="Bold" Margin="0,0,0,5"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
-                <TextBox x:Name="DescriptionTextBox" Height="60" TextWrapping="Wrap"
-                         AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Margin="0,0,0,15"/>
+                <!-- Trust Server Certificate -->
+                <CheckBox x:Name="TrustServerCertificateCheckBox"
+                          Content="Trust server certificate (skip certificate validation)"
+                          IsChecked="False"
+                          Foreground="{DynamicResource ForegroundBrush}"
+                          ToolTip="When checked, accepts any server certificate without validation.&#x0a;Uncheck for stricter security (requires valid certificate)."
+                          Margin="0,0,0,6"/>
 
                 <!-- Is Favorite -->
-                <CheckBox x:Name="IsFavoriteCheckBox" Content="Mark as favorite (appears at top of list)" Margin="0,0,0,15"
-                          Foreground="{DynamicResource ForegroundBrush}"/>
+                <CheckBox x:Name="IsFavoriteCheckBox" Content="Mark as favorite (appears at top of list)"
+                          Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,6"/>
 
-                <!-- Connection Security Settings -->
-                <TextBlock Text="Connection Security:" FontWeight="Bold" Margin="0,0,0,5"
+                <!-- Description -->
+                <TextBlock Text="Description (optional):" Margin="0,4,0,4"
                            Foreground="{DynamicResource ForegroundBrush}"/>
-                <Border BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="10" Margin="0,0,0,15"
-                        Background="{DynamicResource BackgroundLightBrush}">
-                    <StackPanel>
-                        <!-- Encryption Mode -->
-                        <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
-                            <TextBlock Text="Encryption:" Width="140" VerticalAlignment="Center"
-                                       Foreground="{DynamicResource ForegroundBrush}"/>
-                            <ComboBox x:Name="EncryptModeComboBox" Width="150"
-                                      SelectedIndex="1"
-                                      ToolTip="Optional: Encrypt if server supports it&#x0a;Mandatory: Always encrypt (fails if not supported)&#x0a;Strict: Full validation required">
-                                <ComboBoxItem Content="Optional"/>
-                                <ComboBoxItem Content="Mandatory"/>
-                                <ComboBoxItem Content="Strict"/>
-                            </ComboBox>
-                        </StackPanel>
-
-                        <!-- Trust Server Certificate -->
-                        <CheckBox x:Name="TrustServerCertificateCheckBox"
-                                  Content="Trust Server Certificate (skip certificate validation)"
-                                  IsChecked="False"
-                                  Foreground="{DynamicResource ForegroundBrush}"
-                                  ToolTip="When checked, accepts any server certificate without validation.&#x0a;Uncheck for stricter security (requires valid certificate)."/>
-                    </StackPanel>
-                </Border>
+                <TextBox x:Name="DescriptionTextBox" Height="60" TextWrapping="Wrap"
+                         AcceptsReturn="True" VerticalScrollBarVisibility="Auto"/>
             </StackPanel>
-        </ScrollViewer>
+        </StackPanel>
 
         <!-- Status -->
         <TextBlock x:Name="StatusText" Grid.Row="2"
@@ -133,8 +115,8 @@
 
         <!-- Buttons -->
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,15,0,0">
-            <Button x:Name="TestConnectionButton" Content="Test Connection" Width="120" Height="30" Margin="0,0,10,0" Click="TestConnection_Click"/>
-            <Button x:Name="SaveButton" Content="Save" Width="80" Height="30" Margin="0,0,10,0" Click="Save_Click" IsDefault="True"/>
+            <Button x:Name="TestConnectionButton" Content="Test Connection" Margin="0,0,8,0" Click="TestConnection_Click"/>
+            <Button x:Name="SaveButton" Content="Save" Width="80" Height="30" Margin="0,0,10,0" Click="Save_Click" IsDefault="True" Style="{StaticResource AccentButton}"/>
             <Button Content="Cancel" Width="80" Height="30" Click="Cancel_Click" IsCancel="True"/>
         </StackPanel>
     </Grid>
diff --git a/Dashboard/Themes/CoolBreezeTheme.xaml b/Dashboard/Themes/CoolBreezeTheme.xaml
index af296540..71b7078b 100644
--- a/Dashboard/Themes/CoolBreezeTheme.xaml
+++ b/Dashboard/Themes/CoolBreezeTheme.xaml
@@ -450,6 +450,41 @@
         </Setter>
     </Style>
 
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!-- ============================================ -->
     <!-- ComboBox Style                               -->
     <!-- ============================================ -->
diff --git a/Dashboard/Themes/DarkTheme.xaml b/Dashboard/Themes/DarkTheme.xaml
index f3d7c3ae..47165f04 100644
--- a/Dashboard/Themes/DarkTheme.xaml
+++ b/Dashboard/Themes/DarkTheme.xaml
@@ -449,6 +449,41 @@
         </Setter>
     </Style>
 
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!-- ============================================ -->
     <!-- ComboBox Style                               -->
     <!-- ============================================ -->
diff --git a/Dashboard/Themes/LightTheme.xaml b/Dashboard/Themes/LightTheme.xaml
index ea442a0d..497b1428 100644
--- a/Dashboard/Themes/LightTheme.xaml
+++ b/Dashboard/Themes/LightTheme.xaml
@@ -450,6 +450,41 @@
         </Setter>
     </Style>
 
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!-- ============================================ -->
     <!-- ComboBox Style                               -->
     <!-- ============================================ -->
diff --git a/Lite/Themes/CoolBreezeTheme.xaml b/Lite/Themes/CoolBreezeTheme.xaml
index 6f4a80cd..6bd705db 100644
--- a/Lite/Themes/CoolBreezeTheme.xaml
+++ b/Lite/Themes/CoolBreezeTheme.xaml
@@ -401,6 +401,41 @@
         </Setter>
     </Style>
 
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!-- ============================================ -->
     <!-- ComboBox Style                               -->
     <!-- ============================================ -->
diff --git a/Lite/Themes/DarkTheme.xaml b/Lite/Themes/DarkTheme.xaml
index abb73127..2160b01a 100644
--- a/Lite/Themes/DarkTheme.xaml
+++ b/Lite/Themes/DarkTheme.xaml
@@ -401,6 +401,41 @@
         </Setter>
     </Style>
 
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!-- ============================================ -->
     <!-- ComboBox Style                               -->
     <!-- ============================================ -->
diff --git a/Lite/Themes/LightTheme.xaml b/Lite/Themes/LightTheme.xaml
index 3faa40ed..dc2dab74 100644
--- a/Lite/Themes/LightTheme.xaml
+++ b/Lite/Themes/LightTheme.xaml
@@ -401,6 +401,41 @@
         </Setter>
     </Style>
 
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!-- ============================================ -->
     <!-- ComboBox Style                               -->
     <!-- ============================================ -->
diff --git a/Lite/Windows/AddServerDialog.xaml b/Lite/Windows/AddServerDialog.xaml
index c804dca2..d02d51dd 100644
--- a/Lite/Windows/AddServerDialog.xaml
+++ b/Lite/Windows/AddServerDialog.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="PerformanceMonitorLite.Windows.AddServerDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Add Server"
+        Title="Add SQL Server"
         SizeToContent="Height" Width="450"
         WindowStartupLocation="CenterOwner"
         ResizeMode="NoResize"
@@ -20,19 +20,24 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
+        <!-- Header -->
+        <TextBlock Grid.Row="0" Text="Add SQL Server Connection" FontSize="18" FontWeight="Bold" Margin="0,0,0,15"
+                   Foreground="{DynamicResource ForegroundBrush}"/>
+
         <!-- Server Name -->
-        <TextBlock Grid.Row="0" Text="Server Name / Address" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <TextBox Grid.Row="1" x:Name="ServerNameBox" Margin="0,0,0,12"/>
+        <TextBlock Grid.Row="1" Text="Server Name / Address" FontWeight="Bold" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <TextBox Grid.Row="2" x:Name="ServerNameBox" Margin="0,0,0,12"/>
 
         <!-- Display Name -->
-        <TextBlock Grid.Row="2" Text="Display Name (optional)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <TextBox Grid.Row="3" x:Name="DisplayNameBox" Margin="0,0,0,12"/>
+        <TextBlock Grid.Row="3" Text="Display Name (optional)" FontWeight="Bold" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <TextBox Grid.Row="4" x:Name="DisplayNameBox" Margin="0,0,0,12"/>
 
         <!-- Authentication -->
-        <TextBlock Grid.Row="4" Text="Authentication" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <StackPanel Grid.Row="5" Margin="0,0,0,12">
+        <TextBlock Grid.Row="5" Text="Authentication" FontWeight="Bold" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <StackPanel Grid.Row="6" Margin="0,0,0,12">
             <RadioButton x:Name="WindowsAuthRadio" Content="Windows Authentication" Foreground="{DynamicResource ForegroundBrush}"
                          IsChecked="True" Checked="AuthMode_Changed" Margin="0,0,0,4"/>
             <RadioButton x:Name="SqlAuthRadio" Content="SQL Server Authentication" Foreground="{DynamicResource ForegroundBrush}"
@@ -43,25 +48,23 @@
         </StackPanel>
 
         <!-- SQL Auth Credentials -->
-        <StackPanel Grid.Row="6" x:Name="SqlCredentialsPanel" Visibility="Collapsed" Margin="0,0,0,12">
+        <StackPanel Grid.Row="7" x:Name="SqlCredentialsPanel" Visibility="Collapsed" Margin="0,0,0,12">
             <TextBlock Text="Username" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
             <TextBox x:Name="UsernameBox" Margin="0,0,0,8"/>
             <TextBlock Text="Password" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-            <PasswordBox x:Name="PasswordBox" Background="{DynamicResource BackgroundLightBrush}"
-                         Foreground="{DynamicResource ForegroundBrush}" BorderBrush="{DynamicResource BorderBrush}"
-                         Padding="6,4"/>
+            <PasswordBox x:Name="PasswordBox"/>
         </StackPanel>
 
         <!-- Entra MFA Credentials -->
-        <StackPanel Grid.Row="6" x:Name="EntraMfaPanel" Visibility="Collapsed" Margin="0,0,0,12">
+        <StackPanel Grid.Row="7" x:Name="EntraMfaPanel" Visibility="Collapsed" Margin="0,0,0,12">
             <TextBlock Text="Username (optional)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
             <TextBox x:Name="EntraMfaUsernameBox" Margin="0,0,0,8"
                      ToolTip="Optional: Pre-populate the authentication dialog with this email"/>
         </StackPanel>
 
         <!-- Connection Options -->
-        <TextBlock Grid.Row="7" Text="Connection Options" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <StackPanel Grid.Row="8" Margin="0,0,0,12">
+        <TextBlock Grid.Row="8" Text="Connection Options" FontWeight="Bold" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <StackPanel Grid.Row="9" Margin="0,0,0,12">
             <StackPanel Orientation="Horizontal" Margin="0,0,0,6">
                 <TextBlock Text="Encryption:" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center" Width="80"/>
                 <ComboBox x:Name="EncryptModeComboBox" Width="150" SelectedIndex="1">
@@ -70,11 +73,11 @@
                     <ComboBoxItem Content="Strict"/>
                 </ComboBox>
             </StackPanel>
-            <CheckBox x:Name="TrustCertCheckBox" Content="Trust server certificate"
+            <CheckBox x:Name="TrustCertCheckBox" Content="Trust server certificate (skip certificate validation)"
                       Foreground="{DynamicResource ForegroundBrush}" IsChecked="False"/>
             <CheckBox x:Name="EnabledCheckBox" Content="Enable data collection for this server"
                       Foreground="{DynamicResource ForegroundBrush}" IsChecked="True" Margin="0,6,0,0"/>
-            <CheckBox x:Name="FavoriteCheckBox" Content="Mark as favorite"
+            <CheckBox x:Name="FavoriteCheckBox" Content="Mark as favorite (appears at top of list)"
                       Foreground="{DynamicResource ForegroundBrush}" Margin="0,6,0,0"/>
             <StackPanel Orientation="Horizontal" Margin="0,6,0,0">
                 <TextBlock Text="Description:" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center" Width="80"/>
@@ -88,14 +91,14 @@
         </StackPanel>
 
         <!-- Status -->
-        <TextBlock Grid.Row="9" x:Name="StatusText" Foreground="{DynamicResource ForegroundMutedBrush}"
+        <TextBlock Grid.Row="10" x:Name="StatusText" Foreground="{DynamicResource ForegroundMutedBrush}"
                    TextWrapping="Wrap" VerticalAlignment="Bottom" Margin="0,0,0,8"/>
 
         <!-- Buttons -->
-        <StackPanel Grid.Row="10" Orientation="Horizontal" HorizontalAlignment="Right">
+        <StackPanel Grid.Row="11" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button x:Name="TestButton" Content="Test Connection" Click="TestButton_Click" Margin="0,0,8,0"/>
-            <Button x:Name="SaveButton" Content="Save" Click="SaveButton_Click" Style="{StaticResource AccentButton}" Margin="0,0,8,0"/>
-            <Button Content="Cancel" Click="CancelButton_Click"/>
+            <Button x:Name="SaveButton" Content="Save" Width="80" Height="30" Click="SaveButton_Click" Style="{StaticResource AccentButton}" Margin="0,0,8,0"/>
+            <Button Content="Cancel" Width="80" Height="30" Click="CancelButton_Click"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/Lite/Windows/AddServerDialog.xaml.cs b/Lite/Windows/AddServerDialog.xaml.cs
index 3e70d8af..84fa183f 100644
--- a/Lite/Windows/AddServerDialog.xaml.cs
+++ b/Lite/Windows/AddServerDialog.xaml.cs
@@ -43,7 +43,7 @@ public AddServerDialog(ServerManager serverManager)
     /// </summary>
     public AddServerDialog(ServerManager serverManager, ServerConnection existing) : this(serverManager)
     {
-        Title = "Edit Server";
+        Title = "Edit SQL Server";
         ServerNameBox.Text = existing.ServerName;
         DisplayNameBox.Text = existing.DisplayName;
         EnabledCheckBox.IsChecked = existing.IsEnabled;
@@ -330,7 +330,7 @@ private async void SaveButton_Click(object sender, RoutedEventArgs e)
 
         try
         {
-            if (AddedServer != null && Title == "Edit Server")
+            if (AddedServer != null && Title == "Edit SQL Server")
             {
                 /* Editing existing server */
                 AddedServer.ServerName = serverName;