diff --git a/src/blackgui/components/settingssimulatorcomponent.ui b/src/blackgui/components/settingssimulatorcomponent.ui
index 01b1de7dc..7189a3a84 100644
--- a/src/blackgui/components/settingssimulatorcomponent.ui
+++ b/src/blackgui/components/settingssimulatorcomponent.ui
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>368</width>
+    <width>320</width>
     <height>281</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Simulator settings</string>
   </property>
-  <layout class="QGridLayout" name="gl_SettingsSimulator" columnstretch="0,1,0">
+  <layout class="QGridLayout" name="gl_SettingsSimulator" columnstretch="0,0,0">
    <property name="leftMargin">
     <number>2</number>
    </property>
@@ -26,16 +26,6 @@
    <property name="bottomMargin">
     <number>2</number>
    </property>
-   <item row="1" column="0" colspan="2">
-    <widget class="QLabel" name="lbl_PluginInfo">
-     <property name="text">
-      <string>Simulator info will go here</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0" colspan="3">
     <widget class="BlackGui::CPluginSelector" name="pluginSelector_EnabledSimulators" native="true">
      <property name="minimumSize">
@@ -59,6 +49,16 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QLabel" name="lbl_PluginInfo">
+     <property name="text">
+      <string>Simulator info will go here</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item row="3" column="0" colspan="3">
     <widget class="QScrollArea" name="sa_Settings">
      <property name="widgetResizable">
@@ -68,9 +68,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>0</y>
-        <width>362</width>
-        <height>207</height>
+        <y>-7</y>
+        <width>303</width>
+        <height>214</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gl_SimulatorSettings" columnstretch="0,0,0">
@@ -86,68 +86,6 @@
        <property name="bottomMargin">
         <number>4</number>
        </property>
-       <item row="4" column="2">
-        <widget class="QPushButton" name="pb_DisableRendering">
-         <property name="toolTip">
-          <string>disable all rendering</string>
-         </property>
-         <property name="text">
-          <string>dis.</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <widget class="QPushButton" name="pb_ApplyTimeSync">
-         <property name="text">
-          <string>apply</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="2">
-        <widget class="QPushButton" name="pb_ApplyMaxDistance">
-         <property name="text">
-          <string>apply</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="1">
-        <layout class="QHBoxLayout" name="hl_MaxDistance">
-         <property name="spacing">
-          <number>4</number>
-         </property>
-         <item>
-          <widget class="QLineEdit" name="le_MaxDistance">
-           <property name="placeholderText">
-            <string>no restrictions</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="lbl_RestrictedRendering">
-         <property name="toolTip">
-          <string>Current rendering restrictions (if any)</string>
-         </property>
-         <property name="text">
-          <string>Restrictions</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="lbl_RecordOwnGndPositions">
-         <property name="text">
-          <string>Record gnd.pos.</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="2">
-        <widget class="QPushButton" name="pb_ApplyMaxAircraft">
-         <property name="text">
-          <string>apply</string>
-         </property>
-        </widget>
-       </item>
        <item row="0" column="1">
         <widget class="QWidget" name="wi_TimeSync" native="true">
          <layout class="QHBoxLayout" name="horizontalLayout">
@@ -214,23 +152,34 @@
          </layout>
         </widget>
        </item>
-       <item row="5" column="1">
-        <layout class="QHBoxLayout" name="hl_RestrictedRendering">
+       <item row="11" column="1">
+        <layout class="QHBoxLayout" name="hl_MaxDistance">
          <property name="spacing">
           <number>4</number>
          </property>
          <item>
-          <widget class="BlackGui::CLedWidget" name="led_RestrictedRendering" native="true"/>
-         </item>
-         <item alignment="Qt::AlignLeft">
-          <widget class="QLabel" name="lbl_RestrictionText">
-           <property name="text">
-            <string>restriction info</string>
+          <widget class="QLineEdit" name="le_MaxDistance">
+           <property name="placeholderText">
+            <string>no restrictions</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="lbl_MaxAircraft">
+         <property name="text">
+          <string>Max.aircraft</string>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="2">
+        <widget class="QPushButton" name="pb_ApplyMaxDistance">
+         <property name="text">
+          <string>apply</string>
+         </property>
+        </widget>
+       </item>
        <item row="3" column="1">
         <widget class="QWidget" name="wi_RecordOwnGndPositions" native="true">
          <layout class="QHBoxLayout" name="hl_RecordOwnGndPositions">
@@ -263,86 +212,13 @@
          </layout>
         </widget>
        </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="lbl_MaxAircraft">
-         <property name="text">
-          <string>Max.aircraft</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="lbl_TimeSync">
+       <item row="2" column="0">
+        <widget class="QLabel" name="lbl_ComSync">
          <property name="toolTip">
-          <string>Time synchronization</string>
+          <string>Synchronize COM unit with simulator</string>
          </property>
          <property name="text">
-          <string>Time synch.</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2">
-        <widget class="QPushButton" name="pb_ApplyComSync">
-         <property name="text">
-          <string>apply</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="1">
-        <widget class="BlackGui::CLedWidget" name="led_RenderingEnabled" native="true">
-         <property name="minimumSize">
-          <size>
-           <width>10</width>
-           <height>0</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="2">
-        <widget class="QPushButton" name="pb_ApplyCGSource">
-         <property name="text">
-          <string>apply</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="2">
-        <widget class="QPushButton" name="pb_ClearRestrictedRendering">
-         <property name="text">
-          <string>clear</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="0">
-        <widget class="QLabel" name="lbl_MaxDistance">
-         <property name="text">
-          <string>Max.dist.(NM)</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="1">
-        <layout class="QHBoxLayout" name="hl_MaxAircraft">
-         <property name="spacing">
-          <number>4</number>
-         </property>
-         <item>
-          <widget class="QLineEdit" name="le_MaxAircraft">
-           <property name="placeholderText">
-            <string>no restrictions</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="3" column="2">
-        <widget class="QPushButton" name="pb_ApplyRecordOwnAircraftGnd">
-         <property name="text">
-          <string>apply</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QCheckBox" name="cb_ComSync">
-         <property name="text">
-          <string>use COM sync.</string>
+          <string>COM synch.</string>
          </property>
         </widget>
        </item>
@@ -356,6 +232,116 @@
          </property>
         </widget>
        </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="lbl_TimeSync">
+         <property name="toolTip">
+          <string>Time synchronization</string>
+         </property>
+         <property name="text">
+          <string>Time synch.</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1">
+        <layout class="QHBoxLayout" name="hl_MaxAircraft">
+         <property name="spacing">
+          <number>4</number>
+         </property>
+         <item>
+          <widget class="QLineEdit" name="le_MaxAircraft">
+           <property name="placeholderText">
+            <string>no restrictions</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="8" column="2">
+        <widget class="QPushButton" name="pb_ApplyMaxAircraft">
+         <property name="text">
+          <string>apply</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="2">
+        <widget class="QPushButton" name="pb_ApplyRecordOwnAircraftGnd">
+         <property name="text">
+          <string>apply</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="2">
+        <widget class="QPushButton" name="pb_ApplyTimeSync">
+         <property name="text">
+          <string>apply</string>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="0">
+        <widget class="QLabel" name="lbl_MaxDistance">
+         <property name="text">
+          <string>Max.dist.(NM)</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2">
+        <widget class="QPushButton" name="pb_ApplyCGSource">
+         <property name="text">
+          <string>apply</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="lbl_RecordOwnGndPositions">
+         <property name="text">
+          <string>Record gnd.pos.</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="BlackGui::Components::CCGSourceSelector" name="comp_CGSourceSelector"/>
+       </item>
+       <item row="4" column="1">
+        <widget class="BlackGui::CLedWidget" name="led_RenderingEnabled" native="true">
+         <property name="minimumSize">
+          <size>
+           <width>10</width>
+           <height>0</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <layout class="QHBoxLayout" name="hl_RestrictedRendering">
+         <property name="spacing">
+          <number>4</number>
+         </property>
+         <item>
+          <widget class="BlackGui::CLedWidget" name="led_RestrictedRendering" native="true"/>
+         </item>
+         <item alignment="Qt::AlignLeft">
+          <widget class="QLabel" name="lbl_RestrictionText">
+           <property name="text">
+            <string>restriction info</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="2">
+        <widget class="QPushButton" name="pb_ApplyComSync">
+         <property name="text">
+          <string>apply</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QCheckBox" name="cb_ComSync">
+         <property name="text">
+          <string>use COM sync.</string>
+         </property>
+        </widget>
+       </item>
        <item row="1" column="0">
         <widget class="QLabel" name="lbl_CGSource">
          <property name="text">
@@ -363,19 +349,50 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="BlackGui::Components::CCGSourceSelector" name="comp_CGSourceSelector"/>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="lbl_ComSync">
+       <item row="4" column="2">
+        <widget class="QPushButton" name="pb_DisableRendering">
          <property name="toolTip">
-          <string>Synchronize COM unit with simulator</string>
+          <string>disable all rendering</string>
          </property>
          <property name="text">
-          <string>COM synch.</string>
+          <string>dis.</string>
          </property>
         </widget>
        </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="lbl_RestrictedRendering">
+         <property name="toolTip">
+          <string>Current rendering restrictions (if any)</string>
+         </property>
+         <property name="text">
+          <string>Restrictions</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="2">
+        <widget class="QPushButton" name="pb_ClearRestrictedRendering">
+         <property name="text">
+          <string>clear</string>
+         </property>
+        </widget>
+       </item>
+       <item row="12" column="0" colspan="3">
+        <widget class="QWidget" name="wi_Bottom_ForceOnTop" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>2</height>
+          </size>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_2"/>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
index b4898fa9a..ecc5a088a 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>250</width>
+    <width>300</width>
     <height>298</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>250</width>
-    <height>150</height>
+    <width>300</width>
+    <height>200</height>
    </size>
   </property>
   <property name="windowTitle">