diff --git a/src/blackgui/components/audiocomponent.ui b/src/blackgui/components/audiocomponent.ui
new file mode 100644
index 000000000..6c175dcd1
--- /dev/null
+++ b/src/blackgui/components/audiocomponent.ui
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CAudioComponent</class>
+ <widget class="QFrame" name="CAudioComponent">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Audio</string>
+  </property>
+  <property name="frameShape">
+   <enum>QFrame::StyledPanel</enum>
+  </property>
+  <property name="frameShadow">
+   <enum>QFrame::Raised</enum>
+  </property>
+  <layout class="QVBoxLayout" name="vl_AudioComponent">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QScrollArea" name="sa_AudioSetup">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="saAudioSetupInner">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>396</width>
+        <height>296</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="vl_ScrollAreaInner">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="BlackGui::Components::CAudioSetup" name="comp_AudioSetup">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BlackGui::Components::CAudioSetup</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/audiosetup.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/blackgui/components/audiosetup.ui b/src/blackgui/components/audiosetup.ui
new file mode 100644
index 000000000..62cc12991
--- /dev/null
+++ b/src/blackgui/components/audiosetup.ui
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CAudioSetup</class>
+ <widget class="QFrame" name="CAudioSetup">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Frame</string>
+  </property>
+  <property name="frameShape">
+   <enum>QFrame::StyledPanel</enum>
+  </property>
+  <property name="frameShadow">
+   <enum>QFrame::Raised</enum>
+  </property>
+  <layout class="QVBoxLayout" name="vl_AudioSetup">
+   <property name="spacing">
+    <number>3</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QFormLayout" name="fl_SetupAudio">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+     </property>
+     <property name="leftMargin">
+      <number>2</number>
+     </property>
+     <property name="topMargin">
+      <number>4</number>
+     </property>
+     <property name="rightMargin">
+      <number>2</number>
+     </property>
+     <property name="bottomMargin">
+      <number>2</number>
+     </property>
+     <item row="0" column="0">
+      <widget class="QLabel" name="lbl_SetupAudioInputDevice">
+       <property name="text">
+        <string>In</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="cb_SetupAudioInputDevice"/>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="lbl_SetupAudioOutputDevice">
+       <property name="text">
+        <string>Out</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="cb_SetupAudioOutputDevice"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="lbl_SetupAudioVoiceTests">
+       <property name="text">
+        <string>Tests</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QWidget" name="wi_SetupAudioTests" native="true">
+       <layout class="QHBoxLayout" name="hl_SetupAudioTestsTop">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <layout class="QHBoxLayout" name="hl_SetupAudioTests">
+          <item>
+           <widget class="QPushButton" name="pb_SetupAudioSquelchTest">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="autoFillBackground">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Squelch test</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pb_SetupAudioMicrophoneTest">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Mic. test</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="lbl_SetupAudioTestActionAndResult">
+       <property name="text">
+        <string>Result</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QPlainTextEdit" name="pte_SetupAudioTestActionAndResult">
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>40</height>
+        </size>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QProgressBar" name="prb_SetupAudioTestProgress">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="value">
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0" colspan="2">
+      <widget class="QLabel" name="lbl_SetupAudioNotificationSounds">
+       <property name="text">
+        <string>Notification sounds</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QCheckBox" name="cb_SetupAudioPlayNotificationSounds">
+       <property name="text">
+        <string>play notification sounds</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QCheckBox" name="cb_SetupAudioNotificationTextMessage">
+       <property name="text">
+        <string>notification for text messages</string>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1">
+      <widget class="QCheckBox" name="cb_SetupAudioNotificationVoiceRoom">
+       <property name="text">
+        <string>notification for join/leave voice room</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/blackgui/components/cockpitcomcomponent.ui b/src/blackgui/components/cockpitcomcomponent.ui
index 232d1ee39..80f1620f1 100644
--- a/src/blackgui/components/cockpitcomcomponent.ui
+++ b/src/blackgui/components/cockpitcomcomponent.ui
@@ -7,13 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>363</width>
-    <height>101</height>
+    <height>81</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
-    <height>0</height>
+    <height>75</height>
    </size>
   </property>
   <property name="windowTitle">
diff --git a/src/blackgui/components/cockpitcomponent.ui b/src/blackgui/components/cockpitcomponent.ui
index df1a823f1..720125eb3 100644
--- a/src/blackgui/components/cockpitcomponent.ui
+++ b/src/blackgui/components/cockpitcomponent.ui
@@ -32,7 +32,7 @@
    <item alignment="Qt::AlignTop">
     <widget class="BlackGui::Components::CCockpitComComponent" name="comp_CockpitComComponent">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -40,7 +40,7 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>40</height>
+       <height>90</height>
       </size>
      </property>
      <property name="frameShape">
@@ -51,7 +51,7 @@
      </property>
     </widget>
    </item>
-   <item alignment="Qt::AlignTop">
+   <item>
     <widget class="BlackGui::CShowHideBar" name="wip_CockpitComPanelShowHideBar" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@@ -70,7 +70,7 @@
    <item>
     <widget class="BlackGui::Components::CCockpitInfoAreaComponent" name="comp_CockpitInfoArea" native="true">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
diff --git a/src/blackgui/components/cockpitinfoareacomponent.ui b/src/blackgui/components/cockpitinfoareacomponent.ui
index 2ea2a6661..a859d302f 100644
--- a/src/blackgui/components/cockpitinfoareacomponent.ui
+++ b/src/blackgui/components/cockpitinfoareacomponent.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -37,6 +37,12 @@
    </property>
   </widget>
   <widget class="BlackGui::CDockWidgetInfoArea" name="dw_CockpitVoiceRooms">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
    <property name="floating">
     <bool>false</bool>
    </property>
@@ -53,9 +59,9 @@
     <number>8</number>
    </attribute>
    <widget class="QWidget" name="qw_CockpitVoiceRooms">
-    <layout class="QVBoxLayout" name="vl_CockpitMainArea">
+    <layout class="QVBoxLayout" name="vl_CockpitVoiceRooms">
      <property name="spacing">
-      <number>0</number>
+      <number>3</number>
      </property>
      <property name="leftMargin">
       <number>0</number>
@@ -83,6 +89,12 @@
    </widget>
   </widget>
   <widget class="BlackGui::CDockWidgetInfoArea" name="dw_Audio">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
    <property name="floating">
     <bool>false</bool>
    </property>
@@ -99,7 +111,22 @@
     <number>8</number>
    </attribute>
    <widget class="QWidget" name="qw_Audio">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
+    <layout class="QVBoxLayout" name="vl_Audio">
+     <property name="spacing">
+      <number>3</number>
+     </property>
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
      <item>
       <widget class="BlackGui::Components::CAudioComponent" name="comp_Audio">
        <property name="frameShape">
diff --git a/src/blackgui/components/maininfoareacomponent.ui b/src/blackgui/components/maininfoareacomponent.ui
index 85fd73e46..73ed2e75d 100644
--- a/src/blackgui/components/maininfoareacomponent.ui
+++ b/src/blackgui/components/maininfoareacomponent.ui
@@ -40,6 +40,12 @@
   </property>
   <widget class="QWidget" name="qw_centralWidgetEmpty"/>
   <widget class="BlackGui::CDockWidgetInfoArea" name="dw_Cockpit">
+   <property name="maximumSize">
+    <size>
+     <width>524287</width>
+     <height>524287</height>
+    </size>
+   </property>
    <property name="allowedAreas">
     <set>Qt::TopDockWidgetArea</set>
    </property>
@@ -67,7 +73,7 @@
       <number>0</number>
      </property>
      <item>
-      <widget class="BlackGui::Components::CCockpitComponent" name="comp_CockpitInfoArea" native="true"/>
+      <widget class="BlackGui::Components::CCockpitComponent" name="comp_Cockpit" native="true"/>
      </item>
     </layout>
    </widget>
diff --git a/src/blackgui/components/settingscomponent.ui b/src/blackgui/components/settingscomponent.ui
index 10b1dcbb6..d84351187 100644
--- a/src/blackgui/components/settingscomponent.ui
+++ b/src/blackgui/components/settingscomponent.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>354</width>
+    <width>338</width>
     <height>323</height>
    </rect>
   </property>
@@ -355,213 +355,54 @@
    <attribute name="title">
     <string>Audio</string>
    </attribute>
-   <layout class="QVBoxLayout" name="verticalLayout_14">
+   <layout class="QVBoxLayout" name="vl_SettingsAudio">
+    <property name="spacing">
+     <number>0</number>
+    </property>
     <property name="leftMargin">
-     <number>2</number>
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
     </property>
     <property name="rightMargin">
-     <number>2</number>
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
     </property>
     <item>
-     <layout class="QFormLayout" name="fl_SettingsAudio">
-      <property name="fieldGrowthPolicy">
-       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+     <widget class="BlackGui::Components::CAudioSetup" name="comp_AudioSetup">
+      <property name="frameShape">
+       <enum>QFrame::StyledPanel</enum>
       </property>
-      <property name="leftMargin">
-       <number>2</number>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
       </property>
-      <property name="topMargin">
-       <number>4</number>
-      </property>
-      <property name="rightMargin">
-       <number>2</number>
-      </property>
-      <property name="bottomMargin">
-       <number>2</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="lbl_SettingsAudioInputDevice">
-        <property name="text">
-         <string>In</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="cb_SettingsAudioInputDevice"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="lbl_SettingsAudioOutputDevice">
-        <property name="text">
-         <string>Out</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="cb_SettingsAudioOutputDevice"/>
-      </item>
-      <item row="2" column="1">
-       <spacer name="vs_SettingsAudioVoiceTests">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="lbl_SettingsAudioVoiceTests">
-        <property name="text">
-         <string>Tests</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QWidget" name="wi_SettingsAudioTests" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <layout class="QHBoxLayout" name="hl_SettingsAudioTests">
-           <item>
-            <widget class="QPushButton" name="pb_SettingsAudioSquelchTest">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="autoFillBackground">
-              <bool>false</bool>
-             </property>
-             <property name="text">
-              <string>Squelch test</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pb_SettingsAudioMicrophoneTest">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Mic. test</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="lbl_SettingsAudioTestActionAndResult">
-        <property name="text">
-         <string>Result</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QPlainTextEdit" name="pte_SettingsAudioTestActionAndResult">
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>40</height>
-         </size>
-        </property>
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <widget class="QProgressBar" name="prb_SettingsAudioTestProgress">
-        <property name="value">
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1">
-       <spacer name="vs_SettingsAudioMisc">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="8" column="1">
-       <widget class="QCheckBox" name="cb_SettingsAudioPlayNotificationSounds">
-        <property name="text">
-         <string>play notification sounds</string>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="1">
-       <widget class="QCheckBox" name="cb_SettingsAudioNotificationTextMessage">
-        <property name="text">
-         <string>notification for text messages</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0" colspan="2">
-       <widget class="QLabel" name="lbl_SettingsAudioNotificationSounds">
-        <property name="text">
-         <string>Notification sounds</string>
-        </property>
-       </widget>
-      </item>
-      <item row="10" column="1">
-       <widget class="QCheckBox" name="cb_SettingsAudioNotificationVoiceRoom">
-        <property name="text">
-         <string>notification for join/leave voice room</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     </widget>
     </item>
    </layout>
   </widget>
-  <widget class="QWidget" name="tb_SettingsSimulatorFsx">
+  <widget class="QWidget" name="tb_SettingsSimulator">
    <attribute name="title">
     <string>Simulator</string>
    </attribute>
-   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <layout class="QVBoxLayout" name="vl_SettingsSimulator">
+    <property name="spacing">
+     <number>0</number>
+    </property>
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
     <item>
      <widget class="BlackGui::Components::CSettingsSimulatorComponent" name="comp_SettingsSimulator">
       <property name="frameShape">
@@ -578,7 +419,19 @@
    <attribute name="title">
     <string>GUI</string>
    </attribute>
-   <layout class="QVBoxLayout" name="verticalLayout_7">
+   <layout class="QVBoxLayout" name="vl_SettingsGui">
+    <property name="leftMargin">
+     <number>1</number>
+    </property>
+    <property name="topMargin">
+     <number>1</number>
+    </property>
+    <property name="rightMargin">
+     <number>1</number>
+    </property>
+    <property name="bottomMargin">
+     <number>1</number>
+    </property>
     <item>
      <layout class="QFormLayout" name="fl_SettingsGui">
       <property name="fieldGrowthPolicy">
@@ -731,7 +584,7 @@
       <item row="4" column="1">
        <widget class="QFontComboBox" name="cb_SettingsGuiFont">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -843,6 +696,12 @@
         </item>
         <item>
          <widget class="QLineEdit" name="le_SettingsGuiFontColor">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="readOnly">
            <bool>true</bool>
           </property>
@@ -892,7 +751,7 @@
       <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QHBoxLayout" name="hl_SettingsMisc">
        <item>
         <widget class="QPushButton" name="pb_SettingsMiscSave">
          <property name="text">
@@ -949,6 +808,12 @@
    <header>blackgui/components/settingssimulatorcomponent.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::Components::CAudioSetup</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/audiosetup.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/blackgui/components/settingsfsxcomponent.ui b/src/blackgui/components/settingsfsxcomponent.ui
index 058f5926d..356c5c346 100644
--- a/src/blackgui/components/settingsfsxcomponent.ui
+++ b/src/blackgui/components/settingsfsxcomponent.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>324</width>
     <height>150</height>
    </rect>
   </property>
diff --git a/src/blackgui/components/settingssimulatorcomponent.ui b/src/blackgui/components/settingssimulatorcomponent.ui
index 2582f987b..8d6b3c951 100644
--- a/src/blackgui/components/settingssimulatorcomponent.ui
+++ b/src/blackgui/components/settingssimulatorcomponent.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>424</width>
-    <height>318</height>
+    <width>308</width>
+    <height>285</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/blackgui/components/simulatorcomponent.ui b/src/blackgui/components/simulatorcomponent.ui
index 827fcb948..6011a6a7e 100644
--- a/src/blackgui/components/simulatorcomponent.ui
+++ b/src/blackgui/components/simulatorcomponent.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>310</width>
     <height>300</height>
    </rect>
   </property>
diff --git a/src/blackgui/components/voiceroomscomponent.ui b/src/blackgui/components/voiceroomscomponent.ui
index 975ad7c24..761aed866 100644
--- a/src/blackgui/components/voiceroomscomponent.ui
+++ b/src/blackgui/components/voiceroomscomponent.ui
@@ -39,6 +39,12 @@
     <layout class="QGridLayout" name="ql_CockpitVoiceRooms">
      <item row="0" column="1">
       <widget class="QWidget" name="qi_CockpitViewRoom2" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <layout class="QHBoxLayout" name="hl_CockpitRoom1">
         <property name="spacing">
          <number>2</number>
@@ -93,6 +99,12 @@
      </item>
      <item row="0" column="0">
       <widget class="QWidget" name="qi_CockpitViewRoom1" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <layout class="QHBoxLayout" name="hl_CockpitViewRoom1">
         <property name="spacing">
          <number>2</number>
diff --git a/src/blackgui/qss/mainwindow.qss b/src/blackgui/qss/mainwindow.qss
index 1ed205fa4..0cca2524d 100644
--- a/src/blackgui/qss/mainwindow.qss
+++ b/src/blackgui/qss/mainwindow.qss
@@ -30,6 +30,7 @@ BlackGui--CInfoArea {
 }
 
 /** fix scroll areas **/
+
 /** in flight plan **/
 QAbstractScrollArea #qw_FlightPlanTabMain { background-color: black; }
 QAbstractScrollArea #qw_RemarksGenerator { background-color: black; }
@@ -100,6 +101,14 @@ QAbstractScrollArea #pg_StatusPageConsole { background-color: black; }
     margin: 2px;
 }
 
+/** fixes scroll area for audio setup and inner background **/
+#sa_AudioSetup { background-color: black; }
+#saAudioSetupInner {
+        background-image: url(:/textures/icons/textures/texture-inner.jpg);
+        background-color: black;
+}
+
+/** COM panel **/
 #wip_CockpitComPanelShowHideBar QPushButton {
     background-color: transparent;
     border-style: solid;
@@ -118,6 +127,7 @@ QAbstractScrollArea #pg_StatusPageConsole { background-color: black; }
 QProgressBar {
     border: 1px solid green;
     border-radius: 5px;
+        background-color: black;
     text-align: center;
     padding: 0px;
     height: 16px;
diff --git a/src/swiftgui_standard/mainwindow.ui b/src/swiftgui_standard/mainwindow.ui
index a5c0d3efd..f751e894f 100644
--- a/src/swiftgui_standard/mainwindow.ui
+++ b/src/swiftgui_standard/mainwindow.ui
@@ -41,6 +41,9 @@
   <property name="tabShape">
    <enum>QTabWidget::Rounded</enum>
   </property>
+  <property name="dockOptions">
+   <set>QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks|QMainWindow::ForceTabbedDocks</set>
+  </property>
   <widget class="QWidget" name="wi_CentralWidgetOutside">
    <property name="sizePolicy">
     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -482,8 +485,8 @@
            </item>
           </layout>
          </widget>
-         <widget class="QWidget" name="pg_Foo">
-          <layout class="QVBoxLayout" name="vl_Foo">
+         <widget class="QWidget" name="pg_MainInfoArea">
+          <layout class="QVBoxLayout" name="vl_MainInfoArea">
            <property name="spacing">
             <number>0</number>
            </property>
@@ -605,7 +608,7 @@
     <set>QDockWidget::AllDockWidgetFeatures</set>
    </property>
    <property name="allowedAreas">
-    <set>Qt::BottomDockWidgetArea|Qt::TopDockWidgetArea</set>
+    <set>Qt::TopDockWidgetArea</set>
    </property>
    <attribute name="dockWidgetArea">
     <number>4</number>