diff --git a/src/blackgui/components/firstmodelsetcomponent.ui b/src/blackgui/components/firstmodelsetcomponent.ui
index baa8ccc7e..3cd678e44 100644
--- a/src/blackgui/components/firstmodelsetcomponent.ui
+++ b/src/blackgui/components/firstmodelsetcomponent.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>336</width>
-    <height>443</height>
+    <width>356</width>
+    <height>500</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -41,8 +41,8 @@
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="gl_Models">
-     <layout class="QGridLayout" name="gridLayout">
+    <widget class="QFrame" name="gl_FirstModelSet">
+     <layout class="QVBoxLayout" name="vl_FirstModelSet">
       <property name="leftMargin">
        <number>5</number>
       </property>
@@ -55,142 +55,157 @@
       <property name="bottomMargin">
        <number>5</number>
       </property>
-      <property name="verticalSpacing">
-       <number>10</number>
-      </property>
-      <item row="0" column="1" alignment="Qt::AlignLeft">
-       <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector"/>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="lbl_ModelSet">
-        <property name="text">
-         <string>Model set</string>
+      <item>
+       <widget class="QGroupBox" name="gb_Simulator">
+        <property name="title">
+         <string>Simulator</string>
         </property>
+        <layout class="QHBoxLayout" name="hl_Simulator">
+         <item>
+          <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="hs_Simulator">
+           <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>
        </widget>
       </item>
-      <item row="2" column="3">
-       <widget class="QPushButton" name="pb_ModelsTriggerReload">
-        <property name="text">
-         <string> reload </string>
+      <item>
+       <widget class="QGroupBox" name="gb_Models">
+        <property name="title">
+         <string>Models</string>
         </property>
+        <layout class="QGridLayout" name="gl_Models">
+         <item row="1" column="0">
+          <widget class="QLabel" name="lbl_Models">
+           <property name="text">
+            <string>Models:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="lbl_ModelDirectories">
+           <property name="text">
+            <string>Model dir.:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="3">
+          <widget class="QPushButton" name="pb_ChangeModelDir">
+           <property name="text">
+            <string>change</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2">
+          <widget class="QPushButton" name="pb_ClearModelDir">
+           <property name="toolTip">
+            <string>clear directory or multiple directories</string>
+           </property>
+           <property name="text">
+            <string>clear</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLineEdit" name="le_ModelDirectories">
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+           <property name="placeholderText">
+            <string>model directory from settings</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="lbl_ModelSet">
+           <property name="text">
+            <string>Model set</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="le_ModelsInfo">
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+           <property name="placeholderText">
+            <string>model info</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QLineEdit" name="le_ModelSetInfo">
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+           <property name="placeholderText">
+            <string>model set info</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="2">
+          <widget class="QPushButton" name="pb_Models">
+           <property name="text">
+            <string>display</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="2">
+          <widget class="QPushButton" name="pb_ModelSet">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>display</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="3">
+          <widget class="QPushButton" name="pb_ModelsTriggerReload">
+           <property name="text">
+            <string> reload </string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="3">
+          <widget class="QPushButton" name="pb_CreateModelSet">
+           <property name="text">
+            <string>create</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="le_ModelDirectories">
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-        <property name="placeholderText">
-         <string>model directory from settings</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QLineEdit" name="le_ModelSetInfo">
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-        <property name="placeholderText">
-         <string>model set info</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="le_ModelsInfo">
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-        <property name="placeholderText">
-         <string>model info</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="lbl_Models">
-        <property name="text">
-         <string>Models:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="lbl_ModelDirectories">
-        <property name="text">
-         <string>Model dir.:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="lbl_Simulator">
-        <property name="text">
-         <string>Simulator:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QPushButton" name="pb_Models">
-        <property name="text">
-         <string>display</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="3">
-       <widget class="QPushButton" name="pb_CreateModelSet">
-        <property name="text">
-         <string>create</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <widget class="QPushButton" name="pb_ChangeModelDir">
-        <property name="text">
-         <string>change</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QPushButton" name="pb_ClearModelDir">
-        <property name="toolTip">
-         <string>clear directory or multiple directories</string>
-        </property>
-        <property name="text">
-         <string>clear</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2">
-       <widget class="QPushButton" name="pb_ModelSet">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>display</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="4">
+      <item>
        <widget class="QGroupBox" name="gb_Distributors">
         <property name="title">
          <string>Distributions</string>
         </property>
-        <layout class="QVBoxLayout" name="vl_Distributors">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
-          <widget class="BlackGui::Components::CDbDistributorComponent" name="comp_Distributors">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>150</height>
-            </size>
-           </property>
-          </widget>
+          <widget class="BlackGui::Components::CDbDistributorComponent" name="comp_Distributors"/>
          </item>
         </layout>
        </widget>
@@ -214,17 +229,6 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <tabstops>
-  <tabstop>le_ModelDirectories</tabstop>
-  <tabstop>pb_ClearModelDir</tabstop>
-  <tabstop>pb_ChangeModelDir</tabstop>
-  <tabstop>le_ModelsInfo</tabstop>
-  <tabstop>pb_Models</tabstop>
-  <tabstop>pb_ModelsTriggerReload</tabstop>
-  <tabstop>le_ModelSetInfo</tabstop>
-  <tabstop>pb_ModelSet</tabstop>
-  <tabstop>pb_CreateModelSet</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.ui b/src/blackgui/components/settingssimulatorbasicscomponent.ui
index 31d46935e..736b15472 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.ui
+++ b/src/blackgui/components/settingssimulatorbasicscomponent.ui
@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>CSettingsSimulatorBasicsComponent</class>
  <widget class="QFrame" name="CSettingsSimulatorBasicsComponent">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>472</width>
+    <height>355</height>
+   </rect>
+  </property>
   <property name="windowTitle">
    <string>Simulator basic settings</string>
   </property>
@@ -64,11 +72,11 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2">
+   <item row="0" column="1" colspan="2" alignment="Qt::AlignLeft">
     <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
      <property name="minimumSize">
       <size>
-       <width>0</width>
+       <width>150</width>
        <height>25</height>
       </size>
      </property>