diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.cpp b/src/blackgui/components/settingssimulatorbasicscomponent.cpp
index d3c7d015d..b2d9b757a 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.cpp
+++ b/src/blackgui/components/settingssimulatorbasicscomponent.cpp
@@ -250,7 +250,7 @@ namespace BlackGui
             ui->le_SimulatorDirectory->setPlaceholderText(s.isEmpty() ? "Simulator directory" : s);
 
             //! \fixme correct version when Qt multiline placeholder is fixed https://bugreports.qt.io/browse/QTBUG-43817
-            constexpr bool BrokenMultilinePlaceholder = true;
+            constexpr bool BrokenMultilinePlaceholder = true; // last checked with Qt 5.10
             const QStringList m = m_settings.getDefaultModelDirectories(simulator);
             if (m.isEmpty())
             {
diff --git a/src/blackgui/editors/liveryform.ui b/src/blackgui/editors/liveryform.ui
index 6cf050077..3d1338de6 100644
--- a/src/blackgui/editors/liveryform.ui
+++ b/src/blackgui/editors/liveryform.ui
@@ -123,7 +123,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="3">
+      <item row="0" column="3" alignment="Qt::AlignRight">
        <widget class="QPushButton" name="pb_SearchColor">
         <property name="toolTip">
          <string>find a color livery</string>
@@ -232,7 +232,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
+      <item row="0" column="2" alignment="Qt::AlignLeft">
        <widget class="QToolButton" name="tb_Paste">
         <property name="text">
          <string>...</string>
@@ -249,6 +249,12 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>BlackGui::Components::CColorSelector</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/colorselector.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>BlackGui::CLabelAndIcon</class>
    <extends>QFrame</extends>
@@ -266,12 +272,6 @@
    <extends>QLabel</extends>
    <header>blackgui/dropsite.h</header>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::Components::CColorSelector</class>
-   <extends>QFrame</extends>
-   <header>blackgui/components/colorselector.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>BlackGui::Editors::CAirlineIcaoForm</class>
    <extends>QFrame</extends>
diff --git a/src/blackgui/editors/modelmappingform.ui b/src/blackgui/editors/modelmappingform.ui
index a10bf250b..5546c8805 100644
--- a/src/blackgui/editors/modelmappingform.ui
+++ b/src/blackgui/editors/modelmappingform.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>407</width>
-    <height>107</height>
+    <width>355</width>
+    <height>104</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -29,7 +29,7 @@
    <property name="bottomMargin">
     <number>2</number>
    </property>
-   <item>
+   <item alignment="Qt::AlignTop">
     <widget class="QGroupBox" name="gb_ModelMappingForm">
      <property name="title">
       <string>Simulator model</string>
@@ -135,7 +135,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="5">
+      <item row="2" column="5" alignment="Qt::AlignRight">
        <widget class="QPushButton" name="pb_Stash">
         <property name="text">
          <string>Stash</string>
@@ -159,7 +159,7 @@
        <widget class="BlackGui::Components::CModelModeSelector" name="selector_ModelMode">
         <property name="minimumSize">
          <size>
-          <width>0</width>
+          <width>50</width>
           <height>22</height>
          </size>
         </property>
diff --git a/src/swiftdata/swiftdata.ui b/src/swiftdata/swiftdata.ui
index 4b6c1a321..d03088bd7 100644
--- a/src/swiftdata/swiftdata.ui
+++ b/src/swiftdata/swiftdata.ui
@@ -72,7 +72,7 @@
      <x>0</x>
      <y>0</y>
      <width>900</width>
-     <height>21</height>
+     <height>19</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
diff --git a/src/swiftlauncher/swiftlauncher.ui b/src/swiftlauncher/swiftlauncher.ui
index 95a0a87cb..f19f650c9 100644
--- a/src/swiftlauncher/swiftlauncher.ui
+++ b/src/swiftlauncher/swiftlauncher.ui
@@ -7,9 +7,15 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>700</height>
+    <height>650</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>400</width>
+    <height>650</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>swift launcher</string>
   </property>
@@ -93,7 +99,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>349</height>
+               <height>319</height>
               </rect>
              </property>
              <attribute name="label">
@@ -124,7 +130,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>349</height>
+               <height>319</height>
               </rect>
              </property>
              <attribute name="label">
@@ -189,7 +195,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>349</height>
+               <height>319</height>
               </rect>
              </property>
              <attribute name="label">
@@ -355,7 +361,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>349</height>
+               <height>319</height>
               </rect>
              </property>
              <attribute name="label">
@@ -437,7 +443,7 @@
                       <x>0</x>
                       <y>0</y>
                       <width>376</width>
-                      <height>179</height>
+                      <height>156</height>
                      </rect>
                     </property>
                     <layout class="QVBoxLayout" name="vl_DataUpdatesScrollArea">
@@ -488,7 +494,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>349</height>
+               <height>319</height>
               </rect>
              </property>
              <attribute name="label">
@@ -507,7 +513,7 @@
                  <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;title&gt;About swift&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.875pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.1pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8.25pt;&quot;&gt;Credits will go here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                 </property>
                 <property name="openExternalLinks">
@@ -542,7 +548,7 @@ p, li { white-space: pre-wrap; }
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>112</height>
+               <height>116</height>
               </rect>
              </property>
              <attribute name="label">