diff --git a/src/blackgui/components/logincomponent.ui b/src/blackgui/components/logincomponent.ui
index b9ee71599..2fe3ad445 100644
--- a/src/blackgui/components/logincomponent.ui
+++ b/src/blackgui/components/logincomponent.ui
@@ -177,6 +177,13 @@
                </property>
               </spacer>
              </item>
+             <item>
+              <widget class="QPushButton" name="pb_OtherServersGotoSettings">
+               <property name="text">
+                <string> goto settings </string>
+               </property>
+              </widget>
+             </item>
              <item>
               <widget class="QPushButton" name="pb_CopyCredentialsOtherServers">
                <property name="toolTip">
@@ -187,13 +194,6 @@
                </property>
               </widget>
              </item>
-             <item>
-              <widget class="QPushButton" name="pb_OtherServersGotoSettings">
-               <property name="text">
-                <string> goto settings </string>
-               </property>
-              </widget>
-             </item>
             </layout>
            </widget>
           </item>
@@ -728,7 +728,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>tw_Network</tabstop>
   <tabstop>le_Callsign</tabstop>
   <tabstop>selector_AircraftIcao</tabstop>
   <tabstop>le_AircraftCombinedType</tabstop>
diff --git a/src/blackgui/components/mappingcomponent.ui b/src/blackgui/components/mappingcomponent.ui
index 14dc70069..6eb2779f7 100644
--- a/src/blackgui/components/mappingcomponent.ui
+++ b/src/blackgui/components/mappingcomponent.ui
@@ -33,7 +33,7 @@
      </property>
      <widget class="QTabWidget" name="tw_ListViews">
       <property name="currentIndex">
-       <number>3</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="tb_CurrentMappings">
        <attribute name="title">
@@ -192,6 +192,16 @@
        <property name="bottomMargin">
         <number>3</number>
        </property>
+       <item row="2" column="0" colspan="5">
+        <widget class="BlackGui::Components::CAircraftModelStringCompleter" name="completer_ModelStrings">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>20</height>
+          </size>
+         </property>
+        </widget>
+       </item>
        <item row="1" column="0">
         <widget class="QLabel" name="lbl_Aircraft">
          <property name="text">
@@ -212,7 +222,7 @@
        <item row="0" column="1">
         <widget class="QCheckBox" name="cb_AircraftIconDisplayed">
          <property name="toolTip">
-          <string>show / hide icon</string>
+          <string>show / hide icon of aircraft</string>
          </property>
          <property name="text">
           <string/>
@@ -222,6 +232,16 @@
          </property>
         </widget>
        </item>
+       <item row="1" column="4">
+        <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="0" column="0">
         <widget class="QLabel" name="lbl_AircraftIcon">
          <property name="text">
@@ -229,7 +249,7 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="3">
+       <item row="1" column="3">
         <widget class="QPushButton" name="pb_ResetAircraft">
          <property name="toolTip">
           <string>reset model by callsign</string>
@@ -239,28 +259,14 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="3">
-        <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="2" column="0" colspan="4">
-        <widget class="BlackGui::Components::CAircraftModelStringCompleter" name="completer_ModelStrings">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>20</height>
-          </size>
-         </property>
-        </widget>
-       </item>
        <item row="1" column="2">
         <widget class="QLineEdit" name="le_Callsign">
+         <property name="toolTip">
+          <string>callsign of aircraft</string>
+         </property>
+         <property name="statusTip">
+          <string/>
+         </property>
          <property name="maxLength">
           <number>15</number>
          </property>
@@ -272,13 +278,13 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="2" alignment="Qt::AlignRight">
+       <item row="0" column="4">
         <widget class="QPushButton" name="pb_LoadModels">
          <property name="toolTip">
-          <string>load models</string>
+          <string>load model set</string>
          </property>
          <property name="text">
-          <string>load</string>
+          <string>load set</string>
          </property>
         </widget>
        </item>
diff --git a/src/blackgui/components/matchingstatisticscomponent.ui b/src/blackgui/components/matchingstatisticscomponent.ui
index 6cd20f60a..e8464aee3 100644
--- a/src/blackgui/components/matchingstatisticscomponent.ui
+++ b/src/blackgui/components/matchingstatisticscomponent.ui
@@ -74,6 +74,19 @@
         </property>
        </widget>
       </item>
+      <item>
+       <spacer name="hs_Bottom">
+        <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_Generate">
         <property name="text">
diff --git a/src/swiftguistandard/swiftguistd.ui b/src/swiftguistandard/swiftguistd.ui
index d6999d70a..c71b9f735 100644
--- a/src/swiftguistandard/swiftguistd.ui
+++ b/src/swiftguistandard/swiftguistd.ui
@@ -288,24 +288,12 @@
    <addaction name="menu_Test"/>
   </widget>
   <widget class="QStatusBar" name="sb_MainStatusBar">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
    <property name="minimumSize">
     <size>
      <width>0</width>
      <height>20</height>
     </size>
    </property>
-   <property name="maximumSize">
-    <size>
-     <width>16777215</width>
-     <height>16777215</height>
-    </size>
-   </property>
    <property name="sizeGripEnabled">
     <bool>false</bool>
    </property>