diff --git a/src/blackgui/components/dbquickmappingwizard.ui b/src/blackgui/components/dbquickmappingwizard.ui
index dde10df1d..5f4f07449 100644
--- a/src/blackgui/components/dbquickmappingwizard.ui
+++ b/src/blackgui/components/dbquickmappingwizard.ui
@@ -67,7 +67,7 @@
     </item>
     <item>
      <layout class="QVBoxLayout" name="vl_Intro">
-      <item>
+      <item alignment="Qt::AlignTop">
        <widget class="QGroupBox" name="gb_Model">
         <property name="title">
          <string>Model</string>
@@ -89,16 +89,6 @@
         </layout>
        </widget>
       </item>
-      <item>
-       <widget class="QWidget" name="wi_Empty" native="true">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>25</height>
-         </size>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QGroupBox" name="gb_AircraftIcao">
         <property name="title">
@@ -489,18 +479,53 @@
    </property>
    <layout class="QVBoxLayout" name="verticalLayout_2">
     <item>
-     <widget class="BlackGui::Components::CDbLoginComponent" name="comp_DbLogin">
-      <property name="frameShape">
-       <enum>QFrame::StyledPanel</enum>
+     <widget class="QGroupBox" name="gb_Credentials">
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>125</height>
+       </size>
       </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
+      <property name="title">
+       <string>User data</string>
+      </property>
+      <layout class="QVBoxLayout" name="vl_Credentials">
+       <item>
+        <widget class="BlackGui::Components::CDbLoginComponent" name="comp_DbLogin">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWizardPage" name="wp8_LastConfirmation">
+   <layout class="QVBoxLayout" name="verticalLayout_3">
+    <item>
+     <widget class="QLabel" name="lbl_Info">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="text">
+       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;By pressing &amp;quot;NEXT&amp;quot; you will send the changed data!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
       </property>
      </widget>
     </item>
    </layout>
   </widget>
-  <widget class="QWizardPage" name="wp8_SendStatus">
+  <widget class="QWizardPage" name="wp9_SendStatus">
    <property name="title">
     <string>Status</string>
    </property>
@@ -509,13 +534,28 @@
    </property>
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
-     <widget class="BlackGui::Components::CLogComponent" name="comp_Log">
-      <property name="frameShape">
-       <enum>QFrame::StyledPanel</enum>
+     <widget class="QGroupBox" name="gb_SendStatus">
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>125</height>
+       </size>
       </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
+      <property name="title">
+       <string>Send status</string>
       </property>
+      <layout class="QVBoxLayout" name="vl_SendStatus">
+       <item>
+        <widget class="BlackGui::Components::CLogComponent" name="comp_Log">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </item>
    </layout>
diff --git a/src/blackgui/editors/aircraftmodelform.ui b/src/blackgui/editors/aircraftmodelform.ui
index d5d792edb..e46140cdf 100644
--- a/src/blackgui/editors/aircraftmodelform.ui
+++ b/src/blackgui/editors/aircraftmodelform.ui
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Frame</string>
   </property>
-  <layout class="QHBoxLayout" name="vl_AircraftModelForm">
+  <layout class="QHBoxLayout" name="vl_AircraftModelForm" stretch="1,1">
    <property name="leftMargin">
     <number>0</number>
    </property>
diff --git a/src/blackgui/filters/liveryfilterbar.ui b/src/blackgui/filters/liveryfilterbar.ui
index b10e52890..13c90e284 100644
--- a/src/blackgui/filters/liveryfilterbar.ui
+++ b/src/blackgui/filters/liveryfilterbar.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Frame</string>
+   <string>Livery filter</string>
   </property>
   <property name="frameShape">
    <enum>QFrame::StyledPanel</enum>
@@ -44,33 +44,6 @@
    <property name="verticalSpacing">
     <number>2</number>
    </property>
-   <item row="0" column="8">
-    <spacer name="hs_Row1">
-     <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="0" column="2">
-    <widget class="QLabel" name="lbl_LiveryCode">
-     <property name="text">
-      <string>Code:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3">
-    <widget class="QLineEdit" name="le_LiveryCode">
-     <property name="placeholderText">
-      <string>Livery code</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="6">
     <widget class="QLabel" name="lbl_Description">
      <property name="text">
@@ -78,77 +51,6 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="4">
-    <widget class="QLabel" name="lbl_AirlineIcaoCode">
-     <property name="text">
-      <string>Airline:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="5">
-    <widget class="QLineEdit" name="le_AirlineIcaoCode">
-     <property name="maximumSize">
-      <size>
-       <width>75</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="placeholderText">
-      <string>ICAO</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="7">
-    <widget class="QLineEdit" name="le_Description"/>
-   </item>
-   <item row="1" column="2" colspan="2">
-    <widget class="QWidget" name="wi_Flags" native="true">
-     <layout class="QHBoxLayout" name="hl_Flags">
-      <property name="spacing">
-       <number>10</number>
-      </property>
-      <property name="leftMargin">
-       <number>5</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="cb_Colors">
-        <property name="text">
-         <string>Color liveries</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="cb_Airlines">
-        <property name="text">
-         <string>Airline liveries</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="hs_Flags">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="0" column="0" colspan="2">
     <widget class="BlackGui::Filters::CFilterBarButtons" name="filter_Buttons">
      <property name="frameShape">
@@ -232,6 +134,78 @@
      </layout>
     </widget>
    </item>
+   <item row="1" column="2" colspan="2">
+    <widget class="QWidget" name="wi_Flags" native="true">
+     <layout class="QHBoxLayout" name="hl_Flags">
+      <property name="spacing">
+       <number>10</number>
+      </property>
+      <property name="leftMargin">
+       <number>5</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="cb_Colors">
+        <property name="text">
+         <string>Color liveries</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="cb_Airlines">
+        <property name="text">
+         <string>Airline liveries</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="hs_Flags">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="7">
+    <widget class="QLineEdit" name="le_Description"/>
+   </item>
+   <item row="0" column="4">
+    <widget class="QLabel" name="lbl_AirlineIcaoCode">
+     <property name="text">
+      <string>Airline:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLabel" name="lbl_LiveryCode">
+     <property name="text">
+      <string>Code:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3">
+    <widget class="QLineEdit" name="le_LiveryCode">
+     <property name="placeholderText">
+      <string>Livery code</string>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="0">
     <widget class="QWidget" name="wi_Id" native="true">
      <layout class="QHBoxLayout" name="hl_Id">
@@ -283,6 +257,19 @@
      </layout>
     </widget>
    </item>
+   <item row="0" column="5">
+    <widget class="QLineEdit" name="le_AirlineIcaoCode">
+     <property name="maximumSize">
+      <size>
+       <width>75</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="placeholderText">
+      <string>ICAO</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>