diff --git a/src/blackgui/components/internalscomponent.ui b/src/blackgui/components/internalscomponent.ui
index b6f6ff986..bd0556022 100644
--- a/src/blackgui/components/internalscomponent.ui
+++ b/src/blackgui/components/internalscomponent.ui
@@ -185,7 +185,7 @@
           <property name="bottomMargin">
            <number>4</number>
           </property>
-          <item row="1" column="2">
+          <item row="1" column="2" alignment="Qt::AlignLeft">
            <widget class="QPushButton" name="pb_SendTextMessage">
             <property name="text">
              <string>send</string>
@@ -274,38 +274,60 @@
       <attribute name="title">
        <string>Statistics / Logs</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <layout class="QFormLayout" name="fl_Statistics">
-         <item row="0" column="0">
-          <widget class="QLabel" name="lbl_LatestInterpolationLog">
-           <property name="text">
-            <string>Latest interpolation log</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QPushButton" name="pb_LatestInterpolationLog">
-           <property name="text">
-            <string>show</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="lbl_LatestPartsLog">
-           <property name="text">
-            <string>Latest parts log</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QPushButton" name="pb_LatestPartsLog">
-           <property name="text">
-            <string>show</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+      <layout class="QGridLayout" name="gl_Statistics" columnstretch="0,0,0">
+       <item row="0" column="1">
+        <widget class="QPushButton" name="pb_LatestInterpolationLog">
+         <property name="text">
+          <string>show</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QPushButton" name="pb_LatestPartsLog">
+         <property name="text">
+          <string>show</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="lbl_LatestPartsLog">
+         <property name="text">
+          <string>Latest parts log</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="lbl_LatestInterpolationLog">
+         <property name="text">
+          <string>Latest interpolation log</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="2">
+        <spacer name="horizontalSpacer">
+         <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 row="2" column="0">
+        <spacer name="vs_Statistics">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
        </item>
       </layout>
      </widget>
@@ -634,8 +656,6 @@
   <tabstop>le_AtisCallsign</tabstop>
   <tabstop>pb_SendAtis</tabstop>
   <tabstop>pte_Atis</tabstop>
-  <tabstop>pb_LatestInterpolationLog</tabstop>
-  <tabstop>pb_LatestPartsLog</tabstop>
   <tabstop>pb_DisplayLog</tabstop>
   <tabstop>pb_RequestFromNetwork</tabstop>
   <tabstop>tb_History</tabstop>
diff --git a/src/blackgui/editors/aircraftpartsform.ui b/src/blackgui/editors/aircraftpartsform.ui
index 99559e411..9660fdbbe 100644
--- a/src/blackgui/editors/aircraftpartsform.ui
+++ b/src/blackgui/editors/aircraftpartsform.ui
@@ -39,7 +39,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="2">
+   <item row="5" column="2" alignment="Qt::AlignLeft">
     <widget class="QPushButton" name="pb_AircraftPartsEnginesOff">
      <property name="text">
       <string>all off</string>
@@ -77,7 +77,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="2">
+   <item row="0" column="2" alignment="Qt::AlignLeft">
     <widget class="QPushButton" name="pb_AircraftPartsUiToJson">
      <property name="text">
       <string>to JSON</string>
@@ -126,14 +126,14 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="2">
+   <item row="2" column="2" alignment="Qt::AlignLeft">
     <widget class="QPushButton" name="pb_AircraftPartsLightsOff">
      <property name="text">
       <string>all off</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="2" column="1" alignment="Qt::AlignLeft">
     <widget class="QPushButton" name="pb_AircraftPartsLightsOn">
      <property name="text">
       <string>all on</string>
@@ -147,7 +147,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="5" column="1" alignment="Qt::AlignLeft">
     <widget class="QPushButton" name="pb_AircraftPartsEnginesOn">
      <property name="text">
       <string>all on</string>
@@ -164,7 +164,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="3">
+   <item row="6" column="0" colspan="3" alignment="Qt::AlignLeft">
     <widget class="QFrame" name="fr_Engines">
      <property name="minimumSize">
       <size>
@@ -245,6 +245,31 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>sb_AircraftPartsFlapsPercentage</tabstop>
+  <tabstop>pb_AircraftPartsUiToJson</tabstop>
+  <tabstop>cb_AircraftPartsGearDown</tabstop>
+  <tabstop>cb_AircraftPartsSpoilers</tabstop>
+  <tabstop>cb_AircraftPartsIsOnGround</tabstop>
+  <tabstop>pb_AircraftPartsLightsOn</tabstop>
+  <tabstop>pb_AircraftPartsLightsOff</tabstop>
+  <tabstop>cb_AircraftPartsLightsTaxi</tabstop>
+  <tabstop>cb_AircraftPartsLightsNav</tabstop>
+  <tabstop>cb_AircraftPartsLightsLanding</tabstop>
+  <tabstop>cb_AircraftPartsLightsBeacon</tabstop>
+  <tabstop>cb_AircraftPartsLightsStrobe</tabstop>
+  <tabstop>cb_AircraftPartsLightsLogo</tabstop>
+  <tabstop>pb_AircraftPartsEnginesOn</tabstop>
+  <tabstop>pb_AircraftPartsEnginesOff</tabstop>
+  <tabstop>cb_AircraftPartsEngine1</tabstop>
+  <tabstop>cb_AircraftPartsEngine2</tabstop>
+  <tabstop>cb_AircraftPartsEngine3</tabstop>
+  <tabstop>cb_AircraftPartsEngine4</tabstop>
+  <tabstop>cb_AircraftPartsEngine5</tabstop>
+  <tabstop>cb_AircraftPartsEngine6</tabstop>
+  <tabstop>te_AircraftPartsJson</tabstop>
+  <tabstop>pb_Set</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>