diff --git a/src/blackgui/components/dbdistributorselectorcomponent.ui b/src/blackgui/components/dbdistributorselectorcomponent.ui
index cd98892aa..bfc581b07 100644
--- a/src/blackgui/components/dbdistributorselectorcomponent.ui
+++ b/src/blackgui/components/dbdistributorselectorcomponent.ui
@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>191</width>
-    <height>22</height>
+    <height>24</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Frame</string>
+   <string>Distributor selector</string>
   </property>
   <property name="frameShape">
    <enum>QFrame::StyledPanel</enum>
diff --git a/src/blackgui/components/dbmappingcomponent.ui b/src/blackgui/components/dbmappingcomponent.ui
index 61659d244..50d364582 100644
--- a/src/blackgui/components/dbmappingcomponent.ui
+++ b/src/blackgui/components/dbmappingcomponent.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
-    <height>618</height>
+    <width>900</width>
+    <height>637</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -287,7 +287,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>582</width>
+            <width>882</width>
             <height>425</height>
            </rect>
           </property>
@@ -315,12 +315,6 @@
            </property>
            <item>
             <widget class="QFrame" name="fr_EditorsLeft">
-             <property name="frameShape">
-              <enum>QFrame::StyledPanel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
              <layout class="QVBoxLayout" name="vl_EditorsLeft">
               <property name="leftMargin">
                <number>0</number>
@@ -338,8 +332,8 @@
                <widget class="BlackGui::Editors::CDistributorForm" name="editor_Distributor">
                 <property name="minimumSize">
                  <size>
-                  <width>0</width>
-                  <height>75</height>
+                  <width>100</width>
+                  <height>150</height>
                  </size>
                 </property>
                </widget>
@@ -349,7 +343,7 @@
                 <property name="minimumSize">
                  <size>
                   <width>0</width>
-                  <height>75</height>
+                  <height>150</height>
                  </size>
                 </property>
                 <property name="frameShape">
@@ -360,6 +354,16 @@
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QFrame" name="fr_LeftEmpty">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>
@@ -380,29 +384,29 @@
               </property>
               <item>
                <widget class="BlackGui::Editors::CLiveryForm" name="editor_Livery">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
+                <property name="minimumSize">
+                 <size>
+                  <width>0</width>
+                  <height>250</height>
+                 </size>
                 </property>
                </widget>
               </item>
               <item>
-               <spacer name="vs_EditorRight">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
+               <widget class="QFrame" name="fr_RightEmpty">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
                 </property>
-                <property name="sizeType">
-                 <enum>QSizePolicy::Expanding</enum>
+                <property name="frameShape">
+                 <enum>QFrame::StyledPanel</enum>
                 </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>20</width>
-                  <height>402</height>
-                 </size>
+                <property name="frameShadow">
+                 <enum>QFrame::Raised</enum>
                 </property>
-               </spacer>
+               </widget>
               </item>
              </layout>
             </widget>
diff --git a/src/blackgui/editors/aircrafticaoform.ui b/src/blackgui/editors/aircrafticaoform.ui
index 73951d133..9c94e192a 100644
--- a/src/blackgui/editors/aircrafticaoform.ui
+++ b/src/blackgui/editors/aircrafticaoform.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>399</width>
+    <width>402</width>
     <height>241</height>
    </rect>
   </property>
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_AirccraftIcaoForm">
    <property name="spacing">
-    <number>0</number>
+    <number>4</number>
    </property>
    <property name="leftMargin">
     <number>0</number>
@@ -400,11 +400,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>BlackGui::CDropSite</class>
-   <extends>QLabel</extends>
-   <header>blackgui/dropsite.h</header>
-  </customwidget>
   <customwidget>
    <class>BlackGui::CLabelAndIcon</class>
    <extends>QFrame</extends>
@@ -417,6 +412,11 @@
    <header>blackgui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::CDropSite</class>
+   <extends>QLabel</extends>
+   <header>blackgui/dropsite.h</header>
+  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CAircraftCombinedTypeSelector</class>
    <extends>QFrame</extends>
diff --git a/src/blackgui/editors/airlineicaoform.ui b/src/blackgui/editors/airlineicaoform.ui
index 117853de9..55f589e47 100644
--- a/src/blackgui/editors/airlineicaoform.ui
+++ b/src/blackgui/editors/airlineicaoform.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_AirlineIcaoCode">
    <property name="spacing">
-    <number>0</number>
+    <number>4</number>
    </property>
    <property name="leftMargin">
     <number>0</number>
@@ -264,11 +264,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>BlackGui::CDropSite</class>
-   <extends>QLabel</extends>
-   <header>blackgui/dropsite.h</header>
-  </customwidget>
   <customwidget>
    <class>BlackGui::CLabelAndIcon</class>
    <extends>QFrame</extends>
@@ -281,6 +276,11 @@
    <header>blackgui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::CDropSite</class>
+   <extends>QLabel</extends>
+   <header>blackgui/dropsite.h</header>
+  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CDbCountrySelectorComponent</class>
    <extends>QFrame</extends>
diff --git a/src/blackgui/editors/distributorform.ui b/src/blackgui/editors/distributorform.ui
index 88e02a5d7..758f1e26d 100644
--- a/src/blackgui/editors/distributorform.ui
+++ b/src/blackgui/editors/distributorform.ui
@@ -46,20 +46,60 @@
      <property name="title">
       <string>Distributor</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="BlackGui::CLabelAndIcon" name="lai_Id">
-        <property name="minimumSize">
-         <size>
-          <width>20</width>
-          <height>0</height>
-         </size>
+     <layout class="QGridLayout" name="gl_Distributor">
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="le_Alias1">
+        <property name="placeholderText">
+         <string>An alias</string>
         </property>
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="lbl_Alias">
+        <property name="text">
+         <string>Alias1/2:</string>
         </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QLineEdit" name="le_Alias2">
+        <property name="placeholderText">
+         <string>Another alias</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="lbl_Description">
+        <property name="text">
+         <string>Description:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="lbl_Timestamp">
+        <property name="text">
+         <string>Last updated</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2">
+       <widget class="QLineEdit" name="le_Updated">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="3">
+       <widget class="BlackGui::CDropSite" name="drop_DropData">
+        <property name="text">
+         <string>Drop data here</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2">
+       <widget class="QLineEdit" name="le_Description">
+        <property name="placeholderText">
+         <string>Describe distributor</string>
         </property>
        </widget>
       </item>
@@ -79,13 +119,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="le_Alias1">
-        <property name="placeholderText">
-         <string>An alias</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="1" colspan="2">
        <widget class="BlackGui::Components::CDbDistributorSelectorComponent" name="distributor_Selector">
         <property name="minimumSize">
@@ -96,52 +129,19 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QLineEdit" name="le_Alias2">
-        <property name="placeholderText">
-         <string>Another alias</string>
+      <item row="0" column="0">
+       <widget class="BlackGui::CLabelAndIcon" name="lai_Id">
+        <property name="minimumSize">
+         <size>
+          <width>20</width>
+          <height>0</height>
+         </size>
         </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="lbl_Alias">
-        <property name="text">
-         <string>Alias1/2:</string>
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
         </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="lbl_Description">
-        <property name="text">
-         <string>Description:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="lbl_Timestamp">
-        <property name="text">
-         <string>Last updated</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="3">
-       <widget class="BlackGui::CDropSite" name="drop_DropData">
-        <property name="text">
-         <string>Drop data here</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" colspan="2">
-       <widget class="QLineEdit" name="le_Description">
-        <property name="placeholderText">
-         <string>Describe distributor</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="QLineEdit" name="le_Updated">
-        <property name="readOnly">
-         <bool>true</bool>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
         </property>
        </widget>
       </item>
@@ -151,11 +151,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>BlackGui::CDropSite</class>
-   <extends>QLabel</extends>
-   <header>blackgui/dropsite.h</header>
-  </customwidget>
   <customwidget>
    <class>BlackGui::CLabelAndIcon</class>
    <extends>QFrame</extends>
@@ -168,6 +163,11 @@
    <header>blackgui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::CDropSite</class>
+   <extends>QLabel</extends>
+   <header>blackgui/dropsite.h</header>
+  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CDbDistributorSelectorComponent</class>
    <extends>QFrame</extends>
diff --git a/src/blackgui/editors/liveryform.ui b/src/blackgui/editors/liveryform.ui
index d914d8886..207a1e6a3 100644
--- a/src/blackgui/editors/liveryform.ui
+++ b/src/blackgui/editors/liveryform.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_LiveryForm">
    <property name="spacing">
-    <number>0</number>
+    <number>4</number>
    </property>
    <property name="leftMargin">
     <number>0</number>
@@ -217,11 +217,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>BlackGui::CDropSite</class>
-   <extends>QLabel</extends>
-   <header>blackgui/dropsite.h</header>
-  </customwidget>
   <customwidget>
    <class>BlackGui::CLabelAndIcon</class>
    <extends>QFrame</extends>
@@ -234,6 +229,11 @@
    <header>blackgui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::CDropSite</class>
+   <extends>QLabel</extends>
+   <header>blackgui/dropsite.h</header>
+  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CColorSelector</class>
    <extends>QFrame</extends>
diff --git a/src/blackgui/editors/modelmappingform.ui b/src/blackgui/editors/modelmappingform.ui
index d25c79143..6902b2753 100644
--- a/src/blackgui/editors/modelmappingform.ui
+++ b/src/blackgui/editors/modelmappingform.ui
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="vl_ModelMappingForm">
    <property name="spacing">
-    <number>0</number>
+    <number>4</number>
    </property>
    <property name="leftMargin">
     <number>0</number>