diff --git a/Window-Switcher.sln.DotSettings.user b/Window-Switcher.sln.DotSettings.user
index 438ae4d..845d225 100644
--- a/Window-Switcher.sln.DotSettings.user
+++ b/Window-Switcher.sln.DotSettings.user
@@ -25,6 +25,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStatusExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa3d6f6d21bb44f64b5c221ff8bd23529d0f28_003Fff_003Fb2895a8c_003FStatusExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStyledElement_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4497571965434e45976e31ec490bbe4b1e2200_003Fee_003F9dadf947_003FStyledElement_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStyledElement_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fb06c2ce0981bf6e5989cda2e3e737e53c2d54ee6ae7e7ce318d378f52e5f66_003FStyledElement_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATemplatedControl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2026_002E1_003Fresharper_002Dhost_003FSourcesCache_003F5870b23e8f5c079e1ec3c9a7d7e386d9a5248cf45a324cc44d371b4f627d2d8_003FTemplatedControl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc7102cd0ffb8973777e61b1942c3fffac7e14016a511d055c3adf73ff91748_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc7da56581ee7b20208f09e80b735961e4d5d7b9e5562bfdec94a75c57b391_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AWin32DispatcherImpl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F81cd416261cea43f67fa36858fae091bcf630c94bb8d415fa3b99486ca923a_003FWin32DispatcherImpl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
diff --git a/src/WindowSwitcher.Lib/Data/Platform/WindowAccess/Accessors/WindowsWinAccessor.cs b/src/WindowSwitcher.Lib/Data/Platform/WindowAccess/Accessors/WindowsWinAccessor.cs
index 7ed52ed..f5bab64 100644
--- a/src/WindowSwitcher.Lib/Data/Platform/WindowAccess/Accessors/WindowsWinAccessor.cs
+++ b/src/WindowSwitcher.Lib/Data/Platform/WindowAccess/Accessors/WindowsWinAccessor.cs
@@ -145,10 +145,9 @@ private static void BringWindowToFront(IntPtr windowHandle)
         if (windowHandle == IntPtr.Zero)
             return;
 
-        _ = User32Functions.ShowWindow(
-            windowHandle,
-            User32Functions.IsIconic(windowHandle) ? SwRestore : SwShow
-        );
+        bool isMinimized = User32Functions.IsIconic(windowHandle);
+        if (isMinimized)
+            _ = User32Functions.ShowWindow(windowHandle, SwRestore);
 
         IntPtr foregroundWindowHandle = User32Functions.GetForegroundWindow();
         uint currentThreadId = Kernel32Functions.GetCurrentThreadId();
@@ -186,9 +185,9 @@ private static void BringWindowToFront(IntPtr windowHandle)
             }
 
             _ = User32Functions.BringWindowToTop(windowHandle);
-            _ = User32Functions.SetActiveWindow(windowHandle);
             _ = User32Functions.SetForegroundWindow(windowHandle);
-            _ = User32Functions.ShowWindow(windowHandle, SwRestore);
+            if (!isMinimized)
+                _ = User32Functions.ShowWindow(windowHandle, SwShow);
         }
         finally
         {
diff --git a/src/WindowSwitcher/Theming/AppTheme.axaml b/src/WindowSwitcher/Theming/AppTheme.axaml
index f7e38db..7e2b6be 100644
--- a/src/WindowSwitcher/Theming/AppTheme.axaml
+++ b/src/WindowSwitcher/Theming/AppTheme.axaml
@@ -1,15 +1,20 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Styles.Resources>
+        <SolidColorBrush x:Key="BackgroundBrush" Color="#1F2326" />
         <SolidColorBrush x:Key="SettingsSectionBorderBrush" Color="#3A3A3A" />
         <SolidColorBrush x:Key="MutedTextBrush" Color="Gray" />
         <SolidColorBrush x:Key="ErrorTextBrush" Color="Tomato" />
         <SolidColorBrush x:Key="FloatingWindowBackgroundBrush" Color="Black" />
         <SolidColorBrush x:Key="FloatingWindowLabelBrush" Color="Fuchsia" />
     </Styles.Resources>
+    
+    <Style Selector="Window">
+        <Setter Property="Background" Value="{StaticResource BackgroundBrush}" />
+    </Style>
 
     <Style Selector="TextBlock.window-section-title">
         <Setter Property="FontSize" Value="15" />
         <Setter Property="FontWeight" Value="SemiBold" />
     </Style>
-</Styles>
+</Styles>
\ No newline at end of file
diff --git a/src/WindowSwitcher/Windows/FiltersWindow.axaml b/src/WindowSwitcher/Windows/FiltersWindow.axaml
index 1c41d88..f52b347 100644
--- a/src/WindowSwitcher/Windows/FiltersWindow.axaml
+++ b/src/WindowSwitcher/Windows/FiltersWindow.axaml
@@ -36,9 +36,20 @@
                             Content="Add"
                             Click="AddWhitelistClick" />
                 </Grid>
-                <ListBox Name="WhitelistListBox"
-                         Grid.Row="1"
-                         SelectionChanged="WhitelistListBoxSelectionChanged" />
+                <StackPanel Grid.Row="1" Orientation="Vertical" Margin="0 8 0 0" Spacing="0">
+                    <ListBox Name="WhitelistListBox"
+                             Grid.Row="1"
+                             SelectionChanged="WhitelistListBoxSelectionChanged">
+                        <ListBox.Styles>
+                            <Style Selector="ListBoxItem">
+                                <Setter Property="Height" Value="22" />
+                                <Setter Property="FontSize" Value="14" />
+                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                                <Setter Property="Padding" Value="8, 2" />
+                            </Style>
+                        </ListBox.Styles>
+                    </ListBox>
+                </StackPanel>
             </Grid>
         </TabItem>
         <TabItem Header="Blacklist">
@@ -56,9 +67,20 @@
                             Content="Add"
                             Click="AddBlacklistClick" />
                 </Grid>
-                <ListBox Name="BlacklistListBox"
-                         Grid.Row="1"
-                         SelectionChanged="BlacklistListBoxSelectionChanged" />
+                <StackPanel Grid.Row="1" Orientation="Vertical" Margin="0 8 0 0" Spacing="0">
+                    <ListBox Name="BlacklistListBox"
+                             Grid.Row="1"
+                             SelectionChanged="BlacklistListBoxSelectionChanged">
+                        <ListBox.Styles>
+                            <Style Selector="ListBoxItem">
+                                <Setter Property="Height" Value="22" />
+                                <Setter Property="FontSize" Value="14" />
+                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                                <Setter Property="Padding" Value="8, 2" />
+                            </Style>
+                        </ListBox.Styles>
+                    </ListBox>
+                </StackPanel>
             </Grid>
         </TabItem>
     </TabControl>
diff --git a/src/WindowSwitcher/Windows/FloatingWindow.axaml b/src/WindowSwitcher/Windows/FloatingWindow.axaml
index 1aa2b30..0c176ab 100644
--- a/src/WindowSwitcher/Windows/FloatingWindow.axaml
+++ b/src/WindowSwitcher/Windows/FloatingWindow.axaml
@@ -6,6 +6,8 @@
         xmlns:windows="clr-namespace:WindowSwitcher.Windows"
         Icon="/Assets/WS_logo.ico"
         ShowInTaskbar="False"
+        CanMinimize="False"
+        CanMaximize="False"
         ShowActivated="False"
         mc:Ignorable="d"
         x:Class="WindowSwitcher.Windows.FloatingWindow"