diff --git a/src/blackgui/editors/aircrafticaoform.ui b/src/blackgui/editors/aircrafticaoform.ui
index c474e4fa3..8e5c86b57 100644
--- a/src/blackgui/editors/aircrafticaoform.ui
+++ b/src/blackgui/editors/aircrafticaoform.ui
@@ -235,6 +235,9 @@
         <property name="text">
          <string>Model:</string>
         </property>
+        <property name="buddy">
+         <cstring>le_ModelDescription</cstring>
+        </property>
        </widget>
       </item>
       <item row="3" column="1">
@@ -266,6 +269,9 @@
         <property name="text">
          <string>Last updated:</string>
         </property>
+        <property name="buddy">
+         <cstring>le_Updated</cstring>
+        </property>
        </widget>
       </item>
       <item row="6" column="1">
@@ -287,6 +293,9 @@
         <property name="text">
          <string>Manufacturer:</string>
         </property>
+        <property name="buddy">
+         <cstring>le_Manufacturer</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="1">
diff --git a/src/blackgui/editors/airlineicaoform.ui b/src/blackgui/editors/airlineicaoform.ui
index 8d024b4cc..117853de9 100644
--- a/src/blackgui/editors/airlineicaoform.ui
+++ b/src/blackgui/editors/airlineicaoform.ui
@@ -176,6 +176,9 @@
         <property name="text">
          <string>Country:</string>
         </property>
+        <property name="buddy">
+         <cstring>country_Selector</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="0">
@@ -190,6 +193,9 @@
         <property name="text">
          <string>Name:</string>
         </property>
+        <property name="buddy">
+         <cstring>selector_AirlineName</cstring>
+        </property>
        </widget>
       </item>
       <item row="5" column="0">
@@ -197,6 +203,9 @@
         <property name="text">
          <string>Last updated</string>
         </property>
+        <property name="buddy">
+         <cstring>le_Updated</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="1">
@@ -211,6 +220,9 @@
         <property name="text">
          <string>Telephony:</string>
         </property>
+        <property name="buddy">
+         <cstring>le_TelephonyDesignator</cstring>
+        </property>
        </widget>
       </item>
       <item row="6" column="0" colspan="2">
@@ -252,12 +264,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>BlackGui::Components::CDbCountrySelectorComponent</class>
-   <extends>QFrame</extends>
-   <header>blackgui/components/dbcountryselectorcomponent.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>BlackGui::CDropSite</class>
    <extends>QLabel</extends>
@@ -269,18 +275,24 @@
    <header>blackgui/labelandicon.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::Components::CDbAirlineIcaoSelectorComponent</class>
-   <extends>QFrame</extends>
-   <header>blackgui/components/dbairlineicaoselectorcomponent.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>BlackGui::Editors::CValidationIndicator</class>
    <extends>QFrame</extends>
    <header>blackgui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::Components::CDbCountrySelectorComponent</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/dbcountryselectorcomponent.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>BlackGui::Components::CDbAirlineIcaoSelectorComponent</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/dbairlineicaoselectorcomponent.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CDbAirlineNameSelectorComponent</class>
    <extends>QFrame</extends>
diff --git a/src/blackgui/editors/liveryform.ui b/src/blackgui/editors/liveryform.ui
index 147cef9ca..9ad467027 100644
--- a/src/blackgui/editors/liveryform.ui
+++ b/src/blackgui/editors/liveryform.ui
@@ -126,6 +126,9 @@
         <property name="text">
          <string>Code:</string>
         </property>
+        <property name="buddy">
+         <cstring>le_Code</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="0">
@@ -133,6 +136,9 @@
         <property name="text">
          <string>Description:</string>
         </property>
+        <property name="buddy">
+         <cstring>le_Description</cstring>
+        </property>
        </widget>
       </item>
       <item row="4" column="0">
@@ -140,6 +146,9 @@
         <property name="text">
          <string>Last updated:</string>
         </property>
+        <property name="buddy">
+         <cstring>le_Updated</cstring>
+        </property>
        </widget>
       </item>
       <item row="4" column="1">
diff --git a/src/blackgui/editors/modelmappingform.ui b/src/blackgui/editors/modelmappingform.ui
index df5010b57..25029312b 100644
--- a/src/blackgui/editors/modelmappingform.ui
+++ b/src/blackgui/editors/modelmappingform.ui
@@ -73,6 +73,9 @@
         <property name="text">
          <string>Description:</string>
         </property>
+        <property name="buddy">
+         <cstring>le_Description</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="6">
@@ -94,6 +97,9 @@
         <property name="text">
          <string>Last updated:</string>
         </property>
+        <property name="buddy">
+         <cstring>le_LastUpdated</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="2">
@@ -101,6 +107,9 @@
         <property name="text">
          <string>Model key:</string>
         </property>
+        <property name="buddy">
+         <cstring>le_ModelKey</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="5">
@@ -138,6 +147,9 @@
         <property name="text">
          <string>Name:</string>
         </property>
+        <property name="buddy">
+         <cstring>le_Name</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="7" rowspan="2">
@@ -162,12 +174,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>BlackGui::CSimulatorSelector</class>
-   <extends>QFrame</extends>
-   <header>blackgui/simulatorselector.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>BlackGui::CLabelAndIcon</class>
    <extends>QFrame</extends>
@@ -180,6 +186,12 @@
    <header>blackgui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::CSimulatorSelector</class>
+   <extends>QFrame</extends>
+   <header>blackgui/simulatorselector.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>le_Id</tabstop>