diff --git a/src/blackgui/components/mappingcomponent.ui b/src/blackgui/components/mappingcomponent.ui
index 7fd79041d..153e7641c 100644
--- a/src/blackgui/components/mappingcomponent.ui
+++ b/src/blackgui/components/mappingcomponent.ui
@@ -157,7 +157,7 @@
         <height>80</height>
        </size>
       </property>
-      <layout class="QGridLayout" name="gl_AircraftModifications" columnstretch="0,0,1,1,1,1">
+      <layout class="QGridLayout" name="gl_AircraftModifications" columnstretch="0,0,0,0,0,0">
        <property name="leftMargin">
         <number>3</number>
        </property>
@@ -170,17 +170,21 @@
        <property name="bottomMargin">
         <number>3</number>
        </property>
-       <item row="3" column="0">
-        <widget class="QLabel" name="lbl_Aircraft">
-         <property name="toolTip">
-          <string>aircraft enabled</string>
-         </property>
+       <item row="0" column="3">
+        <widget class="QPushButton" name="pb_ValidateModelSet">
          <property name="text">
-          <string>Enbl.</string>
+          <string>validate</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="4">
+       <item row="0" column="0">
+        <widget class="QLabel" name="lbl_AircraftIcon">
+         <property name="text">
+          <string>Icon</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="4">
         <widget class="QPushButton" name="pb_DoMatchingAgain">
          <property name="toolTip">
           <string>do all matchings again</string>
@@ -190,24 +194,17 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="6">
-        <widget class="BlackGui::Components::CAircraftModelStringCompleter" name="completer_ModelStrings">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>20</height>
-          </size>
+       <item row="1" column="5">
+        <widget class="QPushButton" name="pb_SaveAircraft">
+         <property name="toolTip">
+          <string>save selected model</string>
          </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="lbl_AircraftIcon">
          <property name="text">
-          <string>Icon</string>
+          <string>save</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="3">
+       <item row="1" column="3">
         <widget class="QPushButton" name="pb_ResetAircraft">
          <property name="toolTip">
           <string>reset model by callsign</string>
@@ -221,30 +218,7 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QCheckBox" name="cb_AircraftIconDisplayed">
-         <property name="toolTip">
-          <string>show / hide icon of aircraft</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="5">
-        <widget class="QPushButton" name="pb_SaveAircraft">
-         <property name="toolTip">
-          <string>save selected model</string>
-         </property>
-         <property name="text">
-          <string>save</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="2">
+       <item row="1" column="2">
         <widget class="QLineEdit" name="le_Callsign">
          <property name="toolTip">
           <string>callsign of aircraft</string>
@@ -260,18 +234,8 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QCheckBox" name="cb_AircraftEnabled">
-         <property name="toolTip">
-          <string>aircraft enabled/disable</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="5">
-        <widget class="BlackGui::CElidedPushButton" name="pb_LoadModels">
+       <item row="0" column="4" colspan="2">
+        <widget class="QPushButton" name="pb_LoadModels">
          <property name="toolTip">
           <string>load model set</string>
          </property>
@@ -280,14 +244,17 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="4">
-        <widget class="QPushButton" name="pb_ValidateModelSet">
+       <item row="1" column="0">
+        <widget class="QLabel" name="lbl_Aircraft">
+         <property name="toolTip">
+          <string>aircraft enabled</string>
+         </property>
          <property name="text">
-          <string>validate</string>
+          <string>Enbl.</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="2" colspan="2" alignment="Qt::AlignLeft">
+       <item row="0" column="2">
         <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
          <property name="minimumSize">
           <size>
@@ -297,6 +264,39 @@
          </property>
         </widget>
        </item>
+       <item row="2" column="0" colspan="6">
+        <widget class="BlackGui::Components::CAircraftModelStringCompleter" name="completer_ModelStrings">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>20</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QCheckBox" name="cb_AircraftIconDisplayed">
+         <property name="toolTip">
+          <string>show / hide icon of aircraft</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="cb_AircraftEnabled">
+         <property name="toolTip">
+          <string>aircraft enabled/disable</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
@@ -338,18 +338,12 @@
    <header>blackgui/components/matchingstatisticscomponent.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::CElidedPushButton</class>
-   <extends>QPushButton</extends>
-   <header>blackgui/elidedpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>tw_SpecializedViews</tabstop>
   <tabstop>tvp_RenderedAircraft</tabstop>
   <tabstop>cb_AircraftIconDisplayed</tabstop>
   <tabstop>pb_ValidateModelSet</tabstop>
-  <tabstop>pb_LoadModels</tabstop>
   <tabstop>cb_AircraftEnabled</tabstop>
   <tabstop>le_Callsign</tabstop>
   <tabstop>pb_ResetAircraft</tabstop>