diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp
index 001731785..d8e9084c4 100644
--- a/src/blackgui/components/mappingcomponent.cpp
+++ b/src/blackgui/components/mappingcomponent.cpp
@@ -122,7 +122,7 @@ namespace BlackGui
 
             // selector
             ui->comp_SimulatorSelector->setRememberSelection(false); // pilot client UI
-            ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons);
+            ui->comp_SimulatorSelector->setMode(CSimulatorSelector::ComboBox);
             ui->comp_SimulatorSelector->setToConnectedSimulator();
             connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CMappingComponent::onModelSetSimulatorChanged);
 
diff --git a/src/blackgui/components/mappingcomponent.ui b/src/blackgui/components/mappingcomponent.ui
index 89243c7af..3b5fe5c08 100644
--- a/src/blackgui/components/mappingcomponent.ui
+++ b/src/blackgui/components/mappingcomponent.ui
@@ -170,7 +170,41 @@
        <property name="bottomMargin">
         <number>3</number>
        </property>
-       <item row="1" column="5">
+       <item row="2" column="3">
+        <widget class="QPushButton" name="pb_ResetAircraft">
+         <property name="toolTip">
+          <string>reset model by callsign</string>
+         </property>
+         <property name="text">
+          <string>reset</string>
+         </property>
+         <property name="icon">
+          <iconset resource="../../blackmisc/blackmisc.qrc">
+           <normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="4">
+        <widget class="QPushButton" name="pb_DoMatchingAgain">
+         <property name="toolTip">
+          <string>do all matchings again</string>
+         </property>
+         <property name="text">
+          <string>re-match</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" 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="2" column="5">
         <widget class="QPushButton" name="pb_SaveAircraft">
          <property name="toolTip">
           <string>save selected model</string>
@@ -180,30 +214,7 @@
          </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>
-       <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="0">
+       <item row="2" column="0">
         <widget class="QLabel" name="lbl_Aircraft">
          <property name="toolTip">
           <string>aircraft enabled</string>
@@ -213,24 +224,7 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="lbl_AircraftIcon">
-         <property name="text">
-          <string>Icon</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="5">
-        <widget class="QPushButton" name="pb_LoadModels">
-         <property name="toolTip">
-          <string>load model set</string>
-         </property>
-         <property name="text">
-          <string>load set</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="2">
+       <item row="2" column="2">
         <widget class="QLineEdit" name="le_Callsign">
          <property name="toolTip">
           <string>callsign of aircraft</string>
@@ -249,56 +243,67 @@
          </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>
+       <item row="1" column="4" colspan="2">
+        <widget class="QWidget" name="wi_LoadSet" native="true">
+         <layout class="QHBoxLayout" name="hl_LoadSet">
+          <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 alignment="Qt::AlignRight">
+           <widget class="QPushButton" name="pb_LoadModels">
+            <property name="toolTip">
+             <string>load model set</string>
+            </property>
+            <property name="text">
+             <string>load model set</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item row="1" column="4">
-        <widget class="QPushButton" name="pb_DoMatchingAgain">
+       <item row="2" column="1">
+        <widget class="QCheckBox" name="cb_AircraftEnabled">
          <property name="toolTip">
-          <string>do all matchings again</string>
+          <string>aircraft enabled/disable</string>
          </property>
          <property name="text">
-          <string>re-match</string>
+          <string/>
          </property>
         </widget>
        </item>
-       <item row="0" column="2" colspan="3" alignment="Qt::AlignLeft">
-        <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
-         <property name="minimumSize">
-          <size>
-           <width>150</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+       <item row="1" column="0">
+        <widget class="QLabel" name="lbl_AircraftIcon">
+         <property name="text">
+          <string>Icon</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="3">
-        <widget class="QPushButton" name="pb_ResetAircraft">
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="cb_AircraftIconDisplayed">
          <property name="toolTip">
-          <string>reset model by callsign</string>
+          <string>show / hide icon of aircraft</string>
          </property>
          <property name="text">
-          <string>reset</string>
+          <string/>
          </property>
-         <property name="icon">
-          <iconset resource="../../blackmisc/blackmisc.qrc">
-           <normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
+         <property name="checked">
+          <bool>false</bool>
          </property>
         </widget>
        </item>
+       <item row="1" column="2">
+        <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector"/>
+       </item>
       </layout>
      </widget>
     </widget>