diff --git a/DomainModel/Profile/FloatingPanel.cs b/DomainModel/Profile/FloatingPanel.cs
index 8c91a7a..2a6767e 100644
--- a/DomainModel/Profile/FloatingPanel.cs
+++ b/DomainModel/Profile/FloatingPanel.cs
@@ -8,7 +8,7 @@ namespace MSFSPopoutPanelManager.DomainModel.Profile
     {
         public FloatingPanel()
         {
-            PropertyChanged += FloatingPanel_PropertyChanged; ;
+            PropertyChanged += FloatingPanel_PropertyChanged;
         }
 
         private void FloatingPanel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
diff --git a/DomainModel/Profile/SwitchWindowConfig.cs b/DomainModel/Profile/SwitchWindowConfig.cs
index 82d1057..cbc0aa5 100644
--- a/DomainModel/Profile/SwitchWindowConfig.cs
+++ b/DomainModel/Profile/SwitchWindowConfig.cs
@@ -1,9 +1,19 @@
-using MSFSPopoutPanelManager.Shared;
+using System.Collections.Generic;
+using MSFSPopoutPanelManager.Shared;
 
 namespace MSFSPopoutPanelManager.DomainModel.Profile
 {
     public class SwitchWindowConfig : ObservableObject
     {
         public bool IsEnabled { get; set; } = false;
+
+        public List<SwitchWindowPanel> Panels { get; set; }
+    }
+
+    public class SwitchWindowPanel
+    {
+        public string DisplayName { get; set; }
+
+        public string PanelCaption { get; set; }
     }
 }
\ No newline at end of file
diff --git a/MainApp/AppUserControl/ProfileCard.xaml b/MainApp/AppUserControl/ProfileCard.xaml
index 7974c6f..1e0db90 100644
--- a/MainApp/AppUserControl/ProfileCard.xaml
+++ b/MainApp/AppUserControl/ProfileCard.xaml
@@ -267,7 +267,7 @@
                                 <TextBlock Style="{StaticResource TxtBlockDisableWhenLocked}" ToolTip="Add a virtual keyboard NumPad to the game that has MSFS focused before sending key command">Add a virtual keyboard NumPad</TextBlock>
                             </WrapPanel>
 
-                            <WrapPanel Name="wrapPanelSwitchWindow" Margin="0,8,0,0">
+                            <WrapPanel Name="WrapPanelSwitchWindow" Margin="0,8,0,0">
                                 <ToggleButton
                                     IsChecked="{Binding ActiveProfile.ProfileSetting.SwitchWindowConfig.IsEnabled, Mode=TwoWay, NotifyOnTargetUpdated=True}"
                                     IsHitTestVisible="{c:Binding '!ActiveProfile.IsLocked',
diff --git a/MainApp/AppUserControl/ProfileCard.xaml.cs b/MainApp/AppUserControl/ProfileCard.xaml.cs
index bd3b175..7c67341 100644
--- a/MainApp/AppUserControl/ProfileCard.xaml.cs
+++ b/MainApp/AppUserControl/ProfileCard.xaml.cs
@@ -24,10 +24,10 @@ namespace MSFSPopoutPanelManager.MainApp.AppUserControl
             _viewModel = App.AppHost.Services.GetRequiredService<ProfileCardViewModel>();
             Loaded += (_, _) => { DataContext = _viewModel; };
 
-#if LOCAL
-            this.wrapPanelSwitchWindow.Visibility = Visibility.Visible;
+#if LOCAL || DEBUG
+            this.WrapPanelSwitchWindow.Visibility = Visibility.Visible;
 #else
-            this.wrapPanelSwitchWindow.Visibility = Visibility.Collapsed;
+            this.WrapPanelSwitchWindow.Visibility = Visibility.Collapsed;
 #endif
         }
 
diff --git a/MainApp/AppWindow/SwitchWindow.xaml b/MainApp/AppWindow/SwitchWindow.xaml
index 28e5ba1..fb20a8f 100644
--- a/MainApp/AppWindow/SwitchWindow.xaml
+++ b/MainApp/AppWindow/SwitchWindow.xaml
@@ -26,27 +26,7 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="30" />
             </Grid.ColumnDefinitions>
-            <WrapPanel Grid.Column="0" VerticalAlignment="Center">
-                <Button
-                    Width="Auto"
-                    Height="Auto"
-                    Margin="5,0"
-                    Command="{Binding ButtonCommand}"
-                    CommandParameter="VerticalPanel"
-                    Content="Main"
-                    FontSize="28"
-                    Foreground="White"
-                    Style="{StaticResource MaterialDesignOutlinedButton}" />
-                <Button
-                    Width="Auto"
-                    Height="Auto"
-                    Margin="5,0"
-                    Command="{Binding ButtonCommand}"
-                    CommandParameter="OverheadPanel"
-                    Content="Overhead"
-                    FontSize="28"
-                    Foreground="White"
-                    Style="{StaticResource MaterialDesignOutlinedButton}" />
+            <WrapPanel Grid.Column="0" VerticalAlignment="Center" Name="WrapPanelCustomButtons">
             </WrapPanel>
             <WrapPanel
                 Grid.Column="1"
diff --git a/MainApp/AppWindow/SwitchWindow.xaml.cs b/MainApp/AppWindow/SwitchWindow.xaml.cs
index ded57ff..60e9138 100644
--- a/MainApp/AppWindow/SwitchWindow.xaml.cs
+++ b/MainApp/AppWindow/SwitchWindow.xaml.cs
@@ -3,14 +3,13 @@ using MSFSPopoutPanelManager.MainApp.ViewModel;
 using System;
 using System.ComponentModel;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
+using System.Windows.Media;
 
 namespace MSFSPopoutPanelManager.MainApp.AppWindow
 {
-    /// <summary>
-    /// Interaction logic for SwitchWindow.xaml
-    /// </summary>
     public partial class SwitchWindow : Window
     {
         private readonly SwitchWindowViewModel _viewModel;
@@ -37,7 +36,7 @@ namespace MSFSPopoutPanelManager.MainApp.AppWindow
                 if (initialWidth == 0 && initialHeight == 0)
                 {
                     this.Width = 410;
-                    this.Height = 75;
+                    this.Height = 60;
                     _viewModel.PanelConfig.Width = Convert.ToInt16(this.Width);
                     _viewModel.PanelConfig.Height = Convert.ToInt32(this.Height);
                 }
@@ -50,6 +49,28 @@ namespace MSFSPopoutPanelManager.MainApp.AppWindow
 
             this.MouseLeftButtonDown += SwitchWindow_MouseLeftButtonDown;
             this.Topmost = true;
+
+            if (_viewModel.ProfileData.ActiveProfile.ProfileSetting.SwitchWindowConfig.Panels != null)
+            {
+                var style = Application.Current.TryFindResource("MaterialDesignOutlinedButton") as Style;
+
+                WrapPanelCustomButtons.Children.Clear();
+
+                foreach (var panel in _viewModel.ProfileData.ActiveProfile.ProfileSetting.SwitchWindowConfig.Panels)
+                {
+                    WrapPanelCustomButtons.Children.Add(new Button()
+                    {
+                        Height = 45,
+                        Margin = new Thickness(5, 5, 5, 5),
+                        Content = panel.DisplayName,
+                        Foreground = new SolidColorBrush(Colors.White),
+                        FontSize = 28,
+                        Style = style,
+                        Command = _viewModel.ButtonCommand,
+                        CommandParameter = panel.PanelCaption
+                    });
+                }
+            }
         }
 
         private void SwitchWindow_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
diff --git a/MainApp/ViewModel/ProfileCardViewModel.cs b/MainApp/ViewModel/ProfileCardViewModel.cs
index 1084705..6bfbf1e 100644
--- a/MainApp/ViewModel/ProfileCardViewModel.cs
+++ b/MainApp/ViewModel/ProfileCardViewModel.cs
@@ -248,7 +248,6 @@ namespace MSFSPopoutPanelManager.MainApp.ViewModel
             if (ActiveProfile == null)
                 return;
 
-
             if (ActiveProfile.ProfileSetting.SwitchWindowConfig.IsEnabled)
             {
                 if (ActiveProfile.PanelConfigs.Any(p => p.PanelType == PanelType.SwitchWindow))
@@ -268,8 +267,8 @@ namespace MSFSPopoutPanelManager.MainApp.ViewModel
             else
             {
                 ActiveProfile.PanelConfigs.RemoveAll(p => p.PanelType == PanelType.SwitchWindow);
+                ActiveProfile.ProfileSetting.SwitchWindowConfig.Panels = null;
             }
-
         }
 
         private void OnRefocusDisplayUpdated()
diff --git a/MainApp/ViewModel/SwitchWindowViewModel.cs b/MainApp/ViewModel/SwitchWindowViewModel.cs
index ad8a58c..9bd8e76 100644
--- a/MainApp/ViewModel/SwitchWindowViewModel.cs
+++ b/MainApp/ViewModel/SwitchWindowViewModel.cs
@@ -23,15 +23,10 @@ namespace MSFSPopoutPanelManager.MainApp.ViewModel
 
         private void OnButtonActivated(string commandParameter)
         {
-            switch (commandParameter)
-            {
-                case "VerticalPanel":
-                    PInvoke.SwitchToThisWindow(PInvoke.GetWindowHandle("737 Instruments Vertical"), true);
-                    break;
-                case "OverheadPanel":
-                    PInvoke.SwitchToThisWindow(PInvoke.GetWindowHandle("737 Instruments Overhead"), true);
-                    break;
-            }
+            var handle = PInvoke.GetWindowHandle(commandParameter);
+
+            if(handle != IntPtr.Zero) 
+                PInvoke.SwitchToThisWindow(handle, true);
         }
     }
 }