diff --git a/src/blackgui/components/settingscomponent.ui b/src/blackgui/components/settingscomponent.ui
index 7f14e49c8..9151ff013 100644
--- a/src/blackgui/components/settingscomponent.ui
+++ b/src/blackgui/components/settingscomponent.ui
@@ -493,13 +493,13 @@
     <property name="bottomMargin">
      <number>1</number>
     </property>
-    <item>
+    <item alignment="Qt::AlignTop">
      <widget class="BlackGui::Components::CSettingsSimulatorComponent" name="comp_SettingsSimulator">
-      <property name="frameShape">
-       <enum>QFrame::StyledPanel</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>150</height>
+       </size>
       </property>
      </widget>
     </item>
diff --git a/src/blackgui/components/settingssimulatorcomponent.ui b/src/blackgui/components/settingssimulatorcomponent.ui
index 9383e4e7e..b920b868a 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>261</width>
-    <height>248</height>
+    <width>220</width>
+    <height>255</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -22,7 +22,7 @@
   <property name="lineWidth">
    <number>0</number>
   </property>
-  <layout class="QVBoxLayout" name="vl_SettingsSimulatorComponent" stretch="0,1">
+  <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>2</number>
    </property>
@@ -35,349 +35,349 @@
    <property name="bottomMargin">
     <number>2</number>
    </property>
-   <item>
-    <widget class="QWidget" name="qw_SettingsSimulatorsAll" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="3" column="1">
+    <widget class="QLabel" name="lbl_PluginInfo">
+     <property name="text">
+      <string>Simulator info will go here</string>
      </property>
-     <layout class="QFormLayout" name="fl_SettingsSimulatorsAll">
-      <property name="fieldGrowthPolicy">
-       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </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="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::AlignRight">
+      <widget class="QLabel" name="lbl_RestrictionText">
+       <property name="text">
+        <string>restriction info</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pb_ClearRestrictedRendering">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>60</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>60</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>clear</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="lbl_LoadedPlugin">
+     <property name="text">
+      <string>Loaded</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="BlackGui::CPluginSelector" name="pluginSelector_EnabledSimulators" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>50</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="4" 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="5" column="0">
+    <widget class="QLabel" name="lbl_RenderingEnabled">
+     <property name="toolTip">
+      <string>Rendering enabled</string>
+     </property>
+     <property name="text">
+      <string>Rendering en.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <layout class="QHBoxLayout" name="hl_RenderingEnabled">
+     <item>
+      <widget class="BlackGui::CLedWidget" name="led_RenderingEnabled" native="true"/>
+     </item>
+     <item>
+      <spacer name="hs_RenderingEnabled">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pb_DisableRendering">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>60</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>60</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>disable</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="7" 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>
+     <item>
+      <widget class="QPushButton" name="pb_ApplyMaxAircraft">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>60</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>60</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>apply</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="lbl_Check">
+     <property name="text">
+      <string>Check</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0">
+    <widget class="QLabel" name="lbl_MaxDistance">
+     <property name="text">
+      <string>Max.dist.(NM)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" 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>
+     <item>
+      <widget class="QPushButton" name="pb_ApplyMaxDistance">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>60</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>60</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>apply</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="4" column="1">
+    <widget class="QWidget" name="wi_TimeSync" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="leftMargin">
+       <number>0</number>
       </property>
-      <property name="horizontalSpacing">
-       <number>10</number>
+      <property name="topMargin">
+       <number>0</number>
       </property>
-      <property name="verticalSpacing">
-       <number>6</number>
+      <property name="rightMargin">
+       <number>0</number>
       </property>
-      <item row="1" column="0">
-       <widget class="QLabel" name="lbl_LoadedPlugin">
-        <property name="text">
-         <string>Loaded</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <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="2" column="0">
-       <widget class="QLabel" name="lbl_TimeSync">
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="cb_TimeSync">
         <property name="toolTip">
-         <string>Time synchronization</string>
+         <string>Enable time syncronization</string>
         </property>
         <property name="text">
-         <string>Time synch.</string>
+         <string/>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QWidget" name="wi_TimeSync" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <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="QCheckBox" name="cb_TimeSync">
-           <property name="toolTip">
-            <string>Enable time syncronization</string>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="le_TimeSyncOffset">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>75</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string>offset +/-hh:mm</string>
-           </property>
-           <property name="inputMask">
-            <string>#99:99</string>
-           </property>
-           <property name="text">
-            <string>+00:00</string>
-           </property>
-           <property name="maxLength">
-            <number>6</number>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="pb_ApplyTimeSync">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>60</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>60</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>apply</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="lbl_RenderingEnabled">
+      <item>
+       <widget class="QLineEdit" name="le_TimeSyncOffset">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>75</width>
+          <height>16777215</height>
+         </size>
+        </property>
         <property name="toolTip">
-         <string>Rendering enabled</string>
+         <string>offset +/-hh:mm</string>
+        </property>
+        <property name="inputMask">
+         <string>#99:99</string>
         </property>
         <property name="text">
-         <string>Rendering en.</string>
+         <string>+00:00</string>
+        </property>
+        <property name="maxLength">
+         <number>6</number>
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
-       <layout class="QHBoxLayout" name="hl_RenderingEnabled">
-        <item>
-         <widget class="BlackGui::CLedWidget" name="led_RenderingEnabled" native="true"/>
-        </item>
-        <item>
-         <spacer name="hs_RenderingEnabled">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pb_DisableRendering">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>60</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>60</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>disable</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>
+      <item>
+       <widget class="QPushButton" name="pb_ApplyTimeSync">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>60</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>60</width>
+          <height>16777215</height>
+         </size>
         </property>
         <property name="text">
-         <string>Restrictions</string>
+         <string>apply</string>
         </property>
        </widget>
       </item>
-      <item row="5" 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::AlignRight">
-         <widget class="QLabel" name="lbl_RestrictionText">
-          <property name="text">
-           <string>restriction info</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pb_ClearRestrictedRendering">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>60</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>60</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>clear</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="lbl_MaxAircraft">
-        <property name="text">
-         <string>Max.aircraft</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" 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>
-        <item>
-         <widget class="QPushButton" name="pb_ApplyMaxAircraft">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>60</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>60</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>apply</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="8" column="0">
-       <widget class="QLabel" name="lbl_MaxDistance">
-        <property name="text">
-         <string>Max.dist.(NM)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" 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>
-        <item>
-         <widget class="QPushButton" name="pb_ApplyMaxDistance">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>60</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>60</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>apply</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="0" column="0" colspan="2">
-       <widget class="BlackGui::CPluginSelector" name="pluginSelector_EnabledSimulators" native="true"/>
-      </item>
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="vs_SettingsSimulator">
+   <item row="7" column="0">
+    <widget class="QLabel" name="lbl_MaxAircraft">
+     <property name="text">
+      <string>Max.aircraft</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" alignment="Qt::AlignRight">
+    <widget class="QPushButton" name="pb_Check">
+     <property name="text">
+      <string>check</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <spacer name="vs_Top">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
-      <enum>QSizePolicy::MinimumExpanding</enum>
+      <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>30</height>
+       <height>20</height>
       </size>
      </property>
     </spacer>
@@ -398,6 +398,18 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>pb_Check</tabstop>
+  <tabstop>cb_TimeSync</tabstop>
+  <tabstop>le_TimeSyncOffset</tabstop>
+  <tabstop>pb_ApplyTimeSync</tabstop>
+  <tabstop>pb_DisableRendering</tabstop>
+  <tabstop>pb_ClearRestrictedRendering</tabstop>
+  <tabstop>le_MaxAircraft</tabstop>
+  <tabstop>pb_ApplyMaxAircraft</tabstop>
+  <tabstop>le_MaxDistance</tabstop>
+  <tabstop>pb_ApplyMaxDistance</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/blackgui/plugindetailswindow.ui b/src/blackgui/plugindetailswindow.ui
index 95725085c..2db24acca 100644
--- a/src/blackgui/plugindetailswindow.ui
+++ b/src/blackgui/plugindetailswindow.ui
@@ -69,40 +69,14 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
+    <layout class="QHBoxLayout" name="hl_Button">
+     <item alignment="Qt::AlignHCenter">
       <widget class="QPushButton" name="pb_Close">
        <property name="text">
         <string>Close</string>
        </property>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
     </layout>
    </item>
   </layout>