diff --git a/src/blackgui/components/dbmappingcomponent.ui b/src/blackgui/components/dbmappingcomponent.ui
index e100774c0..9b4d4382c 100644
--- a/src/blackgui/components/dbmappingcomponent.ui
+++ b/src/blackgui/components/dbmappingcomponent.ui
@@ -250,7 +250,7 @@
          <property name="minimumSize">
           <size>
            <width>0</width>
-           <height>110</height>
+           <height>100</height>
           </size>
          </property>
         </widget>
@@ -331,17 +331,17 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>BlackGui::Views::CAircraftModelView</class>
+   <extends>QTableView</extends>
+   <header>blackgui/views/aircraftmodelview.h</header>
+  </customwidget>
   <customwidget>
    <class>BlackGui::Editors::CAircraftModelForm</class>
    <extends>QFrame</extends>
    <header>blackgui/editors/aircraftmodelform.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
-   <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
-  </customwidget>
   <customwidget>
    <class>BlackGui::Editors::CModelMappingForm</class>
    <extends>QFrame</extends>
diff --git a/src/blackgui/editors/modelmappingform.ui b/src/blackgui/editors/modelmappingform.ui
index 82a813675..59377590e 100644
--- a/src/blackgui/editors/modelmappingform.ui
+++ b/src/blackgui/editors/modelmappingform.ui
@@ -6,19 +6,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>429</width>
+    <width>417</width>
     <height>107</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Model editor</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::NoFrame</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Plain</enum>
-  </property>
   <layout class="QVBoxLayout" name="vl_ModelMappingForm">
    <property name="spacing">
     <number>4</number>
@@ -27,20 +21,20 @@
     <number>0</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <item>
     <widget class="QGroupBox" name="gb_ModelMappingForm">
      <property name="title">
       <string>Simulator model</string>
      </property>
-     <layout class="QGridLayout" name="gl_ModelMappingForm" columnstretch="0,1,0,1,2,1,0">
+     <layout class="QGridLayout" name="gl_ModelMappingForm" columnstretch="1,2,1,2,2,1,0">
       <property name="leftMargin">
        <number>3</number>
       </property>
@@ -53,26 +47,20 @@
       <property name="bottomMargin">
        <number>3</number>
       </property>
-      <item row="0" column="6" rowspan="3">
-       <widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator">
-        <property name="minimumSize">
-         <size>
-          <width>10</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
+      <property name="spacing">
+       <number>4</number>
+      </property>
+      <item row="1" column="3" colspan="2">
+       <widget class="QLineEdit" name="le_Description">
+        <property name="placeholderText">
+         <string>Model description</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="3" colspan="2">
-       <widget class="QLineEdit" name="le_ModelKey">
-        <property name="placeholderText">
-         <string>Model  key</string>
+      <item row="2" column="0">
+       <widget class="QLabel" name="lbl_Updated">
+        <property name="text">
+         <string>Updated:</string>
         </property>
        </widget>
       </item>
@@ -83,13 +71,10 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="lbl_Description">
-        <property name="text">
-         <string>Description:</string>
-        </property>
-        <property name="buddy">
-         <cstring>le_Description</cstring>
+      <item row="0" column="3" colspan="2">
+       <widget class="QLineEdit" name="le_ModelKey">
+        <property name="placeholderText">
+         <string>Model  key</string>
         </property>
        </widget>
       </item>
@@ -103,6 +88,16 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="2">
+       <widget class="QLabel" name="lbl_Description">
+        <property name="text">
+         <string>Description:</string>
+        </property>
+        <property name="buddy">
+         <cstring>le_Description</cstring>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="le_Id">
         <property name="maximumSize">
@@ -123,6 +118,13 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="2">
+       <widget class="QLabel" name="lbl_Path">
+        <property name="text">
+         <string>File:</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="lbl_Name">
         <property name="text">
@@ -133,13 +135,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QLabel" name="lbl_Path">
-        <property name="text">
-         <string>File:</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="5">
        <widget class="QPushButton" name="pb_Stash">
         <property name="text">
@@ -150,17 +145,26 @@
       <item row="2" column="1">
        <widget class="QLineEdit" name="le_LastUpdated"/>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="lbl_Updated">
-        <property name="text">
-         <string>Updated:</string>
+      <item row="0" column="6" rowspan="3">
+       <widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator">
+        <property name="minimumSize">
+         <size>
+          <width>10</width>
+          <height>0</height>
+         </size>
         </property>
        </widget>
       </item>
-      <item row="1" column="3" colspan="2">
-       <widget class="QLineEdit" name="le_Description">
-        <property name="placeholderText">
-         <string>Model description</string>
+      <item row="1" column="5">
+       <widget class="BlackGui::Components::CModelModeSelector" name="selector_ModelMode">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>22</height>
+         </size>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::StrongFocus</enum>
         </property>
        </widget>
       </item>
@@ -187,25 +191,18 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="5">
-       <widget class="BlackGui::Components::CModelModeSelector" name="selector_ModelMode">
-        <property name="focusPolicy">
-         <enum>Qt::StrongFocus</enum>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>BlackGui::Components::CSimulatorSelector</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/simulatorselector.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>BlackGui::CLabelAndIcon</class>
    <extends>QFrame</extends>
@@ -218,12 +215,6 @@
    <header>blackgui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::Components::CSimulatorSelector</class>
-   <extends>QFrame</extends>
-   <header>blackgui/components/simulatorselector.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CModelModeSelector</class>
    <extends>QFrame</extends>
diff --git a/src/blackgui/share/qss/stdwidget.qss b/src/blackgui/share/qss/stdwidget.qss
index 286e9e142..a6648c09c 100644
--- a/src/blackgui/share/qss/stdwidget.qss
+++ b/src/blackgui/share/qss/stdwidget.qss
@@ -276,7 +276,8 @@ QPlainTextEdit {
 
 QGroupBox {
   border: 1px solid green;
-  margin-top: 2ex; /* the x-height of the relevant font, leave space at the top for the title */
+  margin-top: 2.5ex; /* the x-height of the relevant font, leave space at the top for the title */
+  padding-top: 2.5ex;
   border-radius: 5px;
   background: black; /* background is background color here */
   background-image: url(:/textures/icons/textures/texture-inner.jpg);
@@ -291,7 +292,7 @@ QGroupBox::title {
   left: 5px;
   subcontrol-origin: margin;
   subcontrol-position: middle left; /* position at the top center */
-  padding: 0px 10px;
+  padding: 0px 10px 0px 10px;
   background-color: darkblue;
   border: 1px solid green;
   border-radius: 5px;