diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp
index 807fcc930..4d95314e5 100644
--- a/src/blackgui/components/flightplancomponent.cpp
+++ b/src/blackgui/components/flightplancomponent.cpp
@@ -830,10 +830,19 @@ namespace BlackGui
         {
             if (!sGui || !sGui->hasWebDataServices()) { return; }
             const QStringList aircraft(sGui->getWebDataServices()->getAircraftIcaoCodes().allDesignators().toList());
-            ui->le_AircraftType->setCompleter(new QCompleter(aircraft, this));
+            QCompleter *aircraftCompleter = new QCompleter(aircraft, this);
+            aircraftCompleter->setMaxVisibleItems(10);
+            aircraftCompleter->popup()->setMinimumWidth(75);
+            aircraftCompleter->setCaseSensitivity(Qt::CaseInsensitive);
+            aircraftCompleter->setCompletionMode(QCompleter::PopupCompletion);
+            ui->le_AircraftType->setCompleter(aircraftCompleter);
 
             const QStringList airports = sGui->getWebDataServices()->getAirports().allIcaoCodes(true);
             QCompleter *airportCompleter = new QCompleter(airports, this);
+            airportCompleter->setMaxVisibleItems(10);
+            airportCompleter->popup()->setMinimumWidth(75);
+            airportCompleter->setCaseSensitivity(Qt::CaseInsensitive);
+            airportCompleter->setCompletionMode(QCompleter::PopupCompletion);
             ui->le_AlternateAirport->setCompleter(airportCompleter);
             ui->le_DestinationAirport->setCompleter(airportCompleter);
             ui->le_OriginAirport->setCompleter(airportCompleter);
diff --git a/src/blackgui/components/flightplancomponent.ui b/src/blackgui/components/flightplancomponent.ui
index d895f3c76..366f8e3b9 100644
--- a/src/blackgui/components/flightplancomponent.ui
+++ b/src/blackgui/components/flightplancomponent.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>368</width>
-    <height>512</height>
+    <width>404</width>
+    <height>373</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -43,8 +43,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>358</width>
-         <height>482</height>
+         <width>383</width>
+         <height>480</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -86,16 +86,62 @@
           <property name="spacing">
            <number>4</number>
           </property>
-          <item row="4" column="2">
-           <widget class="QLineEdit" name="le_TakeOffTimePlanned">
-            <property name="inputMask">
-             <string>99:99</string>
+          <item row="1" column="1">
+           <widget class="QWidget" name="wi_Callsign" native="true">
+            <layout class="QHBoxLayout" name="hl_CallsignWidget">
+             <property name="leftMargin">
+              <number>0</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="QLineEdit" name="le_Callsign">
+               <property name="maxLength">
+                <number>40</number>
+               </property>
+               <property name="readOnly">
+                <bool>true</bool>
+               </property>
+               <property name="placeholderText">
+                <string>e.g. DLH1331</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="tb_SyncWithSimulator">
+               <property name="toolTip">
+                <string>Synchronize with simulator</string>
+               </property>
+               <property name="whatsThis">
+                <string>Synchronize with simulator</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../../blackmisc/blackmisc.qrc">
+                 <normaloff>:/diagona/icons/diagona/icons/arrow-circle-225.png</normaloff>:/diagona/icons/diagona/icons/arrow-circle-225.png</iconset>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="15" column="1">
+           <widget class="QPushButton" name="pb_LoadDisk">
+            <property name="toolTip">
+             <string>Load from disk</string>
             </property>
             <property name="text">
-             <string>00:00</string>
+             <string>Load</string>
             </property>
-            <property name="maxLength">
-             <number>5</number>
+            <property name="icon">
+             <iconset resource="../../blackmisc/blackmisc.qrc">
+              <normaloff>:/pastel/icons/pastel/16/disk.png</normaloff>:/pastel/icons/pastel/16/disk.png</iconset>
             </property>
            </widget>
           </item>
@@ -115,7 +161,46 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="3">
+          <item row="5" column="2">
+           <widget class="QLineEdit" name="le_TakeOffTimePlanned">
+            <property name="inputMask">
+             <string>99:99</string>
+            </property>
+            <property name="text">
+             <string>00:00</string>
+            </property>
+            <property name="maxLength">
+             <number>5</number>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="1">
+           <widget class="QLineEdit" name="le_EstimatedTimeEnroute">
+            <property name="inputMask">
+             <string>99:99</string>
+            </property>
+            <property name="text">
+             <string>00:00</string>
+            </property>
+            <property name="placeholderText">
+             <string>hh:mm e.g. 02:30</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="3">
+           <widget class="QLabel" name="lbl_CruiseTrueAirspeed">
+            <property name="toolTip">
+             <string>True airspeed</string>
+            </property>
+            <property name="text">
+             <string>4. TAS</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="3">
            <layout class="QGridLayout" name="gl_EquipmentIcao">
             <item row="0" column="4">
              <widget class="QToolButton" name="tb_HelpEquipment">
@@ -146,7 +231,7 @@
             </item>
            </layout>
           </item>
-          <item row="2" column="2">
+          <item row="3" column="2">
            <widget class="QLineEdit" name="le_PrefixIcaoSuffix">
             <property name="readOnly">
              <bool>true</bool>
@@ -156,33 +241,17 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="3">
-           <widget class="QLabel" name="lbl_CruiseTrueAirspeed">
+          <item row="9" column="2">
+           <widget class="QPushButton" name="pb_RemarksGenerator">
             <property name="toolTip">
-             <string>True airspeed</string>
+             <string>goto generator page</string>
             </property>
             <property name="text">
-             <string>4. TAS</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
+             <string>goto gen.</string>
             </property>
            </widget>
           </item>
-          <item row="7" column="1">
-           <widget class="QLineEdit" name="le_EstimatedTimeEnroute">
-            <property name="inputMask">
-             <string>99:99</string>
-            </property>
-            <property name="text">
-             <string>00:00</string>
-            </property>
-            <property name="placeholderText">
-             <string>hh:mm e.g. 02:30</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" colspan="2">
+          <item row="3" column="0" colspan="2">
            <widget class="QWidget" name="wi_PrefixButtons" native="true">
             <layout class="QHBoxLayout" name="hl_PrefixButtons">
              <property name="leftMargin">
@@ -203,7 +272,7 @@
                 <string>Equipment</string>
                </property>
                <property name="text">
-                <string>3. Equip.:</string>
+                <string>3. Eqpt.</string>
                </property>
               </widget>
              </item>
@@ -243,51 +312,14 @@
             </layout>
            </widget>
           </item>
-          <item row="8" column="2">
-           <widget class="QPushButton" name="pb_RemarksGenerator">
-            <property name="toolTip">
-             <string>goto generator page</string>
-            </property>
-            <property name="text">
-             <string>goto gen.</string>
-            </property>
-           </widget>
-          </item>
-          <item row="8" column="0">
+          <item row="9" column="0">
            <widget class="QLabel" name="lbl_Remarks">
             <property name="text">
              <string>11. Remarks</string>
             </property>
            </widget>
           </item>
-          <item row="9" column="0" colspan="4">
-           <widget class="QPlainTextEdit" name="pte_Remarks">
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>75</height>
-             </size>
-            </property>
-            <property name="placeholderText">
-             <string>enter remarks here or use &quot;generator&quot;</string>
-            </property>
-           </widget>
-          </item>
-          <item row="14" column="0">
-           <widget class="QPushButton" name="pb_SaveDisk">
-            <property name="toolTip">
-             <string>Save to disk</string>
-            </property>
-            <property name="text">
-             <string>Save</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../../blackmisc/blackmisc.qrc">
-              <normaloff>:/pastel/icons/pastel/16/disk.png</normaloff>:/pastel/icons/pastel/16/disk.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="13" column="1">
+          <item row="14" column="1">
            <widget class="QPushButton" name="pb_Load">
             <property name="toolTip">
              <string>Load flight plan from network</string>
@@ -301,21 +333,7 @@
             </property>
            </widget>
           </item>
-          <item row="14" column="1">
-           <widget class="QPushButton" name="pb_LoadDisk">
-            <property name="toolTip">
-             <string>Load from disk</string>
-            </property>
-            <property name="text">
-             <string>Load</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../../blackmisc/blackmisc.qrc">
-              <normaloff>:/pastel/icons/pastel/16/disk.png</normaloff>:/pastel/icons/pastel/16/disk.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="13" column="2">
+          <item row="14" column="2">
            <widget class="QPushButton" name="pb_ValidateFlightPlan">
             <property name="text">
              <string>&amp;Validate</string>
@@ -326,7 +344,41 @@
             </property>
            </widget>
           </item>
-          <item row="13" column="0">
+          <item row="10" column="0" colspan="4">
+           <widget class="QPlainTextEdit" name="pte_Remarks">
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>75</height>
+             </size>
+            </property>
+            <property name="placeholderText">
+             <string>enter remarks here or use &quot;generator&quot;</string>
+            </property>
+           </widget>
+          </item>
+          <item row="15" column="0">
+           <widget class="QPushButton" name="pb_SaveDisk">
+            <property name="toolTip">
+             <string>Save to disk</string>
+            </property>
+            <property name="text">
+             <string>Save</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../blackmisc/blackmisc.qrc">
+              <normaloff>:/pastel/icons/pastel/16/disk.png</normaloff>:/pastel/icons/pastel/16/disk.png</iconset>
+            </property>
+           </widget>
+          </item>
+          <item row="14" column="3">
+           <widget class="QCheckBox" name="cb_StrictCheck">
+            <property name="text">
+             <string>strict &amp;check</string>
+            </property>
+           </widget>
+          </item>
+          <item row="14" column="0">
            <widget class="QPushButton" name="pb_Send">
             <property name="toolTip">
              <string>Send flight plan to network</string>
@@ -340,24 +392,7 @@
             </property>
            </widget>
           </item>
-          <item row="13" column="3">
-           <widget class="QCheckBox" name="cb_StrictCheck">
-            <property name="text">
-             <string>strict &amp;check</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="2">
-           <widget class="QLabel" name="lbl_FuelOnBoard">
-            <property name="text">
-             <string>12. Fuel on board</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="11" column="1" colspan="3">
+          <item row="12" column="1" colspan="3">
            <widget class="QLineEdit" name="le_LastSent">
             <property name="readOnly">
              <bool>true</bool>
@@ -367,7 +402,7 @@
             </property>
            </widget>
           </item>
-          <item row="14" column="2">
+          <item row="15" column="2">
            <widget class="QPushButton" name="pb_Prefill">
             <property name="text">
              <string>&amp;Prefill</string>
@@ -378,7 +413,17 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="3">
+          <item row="7" column="2">
+           <widget class="QLabel" name="lbl_FuelOnBoard">
+            <property name="text">
+             <string>12. Fuel on board</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="3">
            <layout class="QGridLayout" name="gl_CruiseAltitude">
             <item row="0" column="0">
              <widget class="BlackGui::CAltitudeEdit" name="lep_CrusingAltitude"/>
@@ -402,7 +447,7 @@
             </item>
            </layout>
           </item>
-          <item row="14" column="3">
+          <item row="15" column="3">
            <widget class="QPushButton" name="pb_Reset">
             <property name="text">
              <string>&amp;Reset</string>
@@ -413,17 +458,7 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="lbl_DestinationAirport">
-            <property name="text">
-             <string>9. Destination airport</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="3">
+          <item row="8" column="3">
            <widget class="QLineEdit" name="le_AlternateAirport">
             <property name="maxLength">
              <number>4</number>
@@ -433,14 +468,43 @@
             </property>
            </widget>
           </item>
-          <item row="11" column="0">
-           <widget class="QLabel" name="lbl_LastSent">
+          <item row="7" column="0">
+           <widget class="QLabel" name="lbl_DestinationAirport">
             <property name="text">
-             <string>Sent</string>
+             <string>9. Destination airport</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="12" column="0" colspan="4">
+          <item row="11" column="0">
+           <widget class="QLabel" name="lbl_PilotsNameAndHomeBase">
+            <property name="toolTip">
+             <string>pilot's name</string>
+            </property>
+            <property name="text">
+             <string>14. Pilot / homebase</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QLabel" name="lbl_EstimatedTimeEnroute">
+            <property name="toolTip">
+             <string>Estimated time enroute</string>
+            </property>
+            <property name="text">
+             <string>10. Est.time enroute</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="13" column="0" colspan="4">
            <spacer name="vs_ButtonDistance1">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -456,20 +520,7 @@
             </property>
            </spacer>
           </item>
-          <item row="10" column="0">
-           <widget class="QLabel" name="lbl_PilotsNameAndHomeBase">
-            <property name="toolTip">
-             <string>pilot's name</string>
-            </property>
-            <property name="text">
-             <string>14. Pilot / homebase</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="0">
+          <item row="8" column="0">
            <widget class="QLineEdit" name="le_DestinationAirport">
             <property name="maxLength">
              <number>4</number>
@@ -479,20 +530,54 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="1">
-           <widget class="QLabel" name="lbl_EstimatedTimeEnroute">
-            <property name="toolTip">
-             <string>Estimated time enroute</string>
-            </property>
+          <item row="12" column="0">
+           <widget class="QLabel" name="lbl_LastSent">
             <property name="text">
-             <string>10. Est.time enroute</string>
+             <string>Sent</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="3">
+           <widget class="QLabel" name="lbl_CrusingAltitude">
+            <property name="text">
+             <string>7. Cruising altitude</string>
             </property>
             <property name="wordWrap">
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="7" column="2">
+          <item row="11" column="1" colspan="2">
+           <widget class="QLineEdit" name="le_PilotsName">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+            <property name="placeholderText">
+             <string>pilot's name (read only)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="11" column="3">
+           <widget class="QLineEdit" name="le_PilotsHomeBase">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+            <property name="placeholderText">
+             <string>homebase (read only)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="3">
+           <widget class="QLabel" name="lbl_AlternateAirport">
+            <property name="text">
+             <string>13. Alternate airport</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="2">
            <widget class="QLineEdit" name="le_FuelOnBoard">
             <property name="inputMask">
              <string>99:99</string>
@@ -508,47 +593,7 @@
             </property>
            </widget>
           </item>
-          <item row="10" column="1" colspan="2">
-           <widget class="QLineEdit" name="le_PilotsName">
-            <property name="readOnly">
-             <bool>true</bool>
-            </property>
-            <property name="placeholderText">
-             <string>pilot's name (read only)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="10" column="3">
-           <widget class="QLineEdit" name="le_PilotsHomeBase">
-            <property name="readOnly">
-             <bool>true</bool>
-            </property>
-            <property name="placeholderText">
-             <string>homebase (read only)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="3">
-           <widget class="QLabel" name="lbl_CrusingAltitude">
-            <property name="text">
-             <string>7. Cruising altitude</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="3">
-           <widget class="QLabel" name="lbl_AlternateAirport">
-            <property name="text">
-             <string>13. Alternate airport</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0" colspan="4">
+          <item row="6" column="0" colspan="4">
            <widget class="QPlainTextEdit" name="pte_Route">
             <property name="maximumSize">
              <size>
@@ -558,7 +603,7 @@
             </property>
            </widget>
           </item>
-          <item row="8" column="3">
+          <item row="9" column="3">
            <widget class="QPushButton" name="pb_GetFromGenerator">
             <property name="toolTip">
              <string>copy from generator page</string>
@@ -568,7 +613,7 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="0" alignment="Qt::AlignBottom">
+          <item row="5" column="0" alignment="Qt::AlignBottom">
            <widget class="QLabel" name="lbl_Route">
             <property name="text">
              <string>8. Route</string>
@@ -578,27 +623,7 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="3">
-           <widget class="QLineEdit" name="le_CruiseTrueAirspeed">
-            <property name="maxLength">
-             <number>40</number>
-            </property>
-            <property name="placeholderText">
-             <string>e.g. 100 kts</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="2">
-           <widget class="QLabel" name="lbl_TakeOffTimePlanned">
-            <property name="text">
-             <string>6. Departure time</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="15" column="0" colspan="4">
+          <item row="16" column="0" colspan="4">
            <spacer name="vs_ButtonDistance2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -614,7 +639,7 @@
             </property>
            </spacer>
           </item>
-          <item row="8" column="1">
+          <item row="9" column="1">
            <widget class="QComboBox" name="cb_VoiceCapabilitiesFirstPage">
             <item>
              <property name="text">
@@ -633,7 +658,27 @@
             </item>
            </widget>
           </item>
-          <item row="3" column="1">
+          <item row="1" column="3">
+           <widget class="QLineEdit" name="le_CruiseTrueAirspeed">
+            <property name="maxLength">
+             <number>40</number>
+            </property>
+            <property name="placeholderText">
+             <string>e.g. 100 kts</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLineEdit" name="le_OriginAirport">
+            <property name="maxLength">
+             <number>4</number>
+            </property>
+            <property name="placeholderText">
+             <string>ICAO, e.g. EDDF</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
            <widget class="QLabel" name="lbl_OriginAirport">
             <property name="text">
              <string>5. Departure airport</string>
@@ -643,13 +688,33 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
-           <widget class="QLineEdit" name="le_OriginAirport">
-            <property name="maxLength">
-             <number>4</number>
+          <item row="4" column="2">
+           <widget class="QLabel" name="lbl_TakeOffTimePlanned">
+            <property name="text">
+             <string>6. Departure time</string>
             </property>
-            <property name="placeholderText">
-             <string>ICAO, e.g. EDDF</string>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="lbl_Type">
+            <property name="text">
+             <string>1. Type</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLabel" name="lbl_Callsign">
+            <property name="text">
+             <string>2. Callsign</string>
+            </property>
+            <property name="scaledContents">
+             <bool>false</bool>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
@@ -667,75 +732,10 @@
             </item>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QLabel" name="lbl_Callsign">
-            <property name="text">
-             <string>2. Callsign</string>
-            </property>
-            <property name="scaledContents">
-             <bool>false</bool>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="lbl_Type">
-            <property name="text">
-             <string>1. Type</string>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="2">
-           <widget class="QWidget" name="wi_Aircraft" native="true">
-            <layout class="QHBoxLayout" name="hl_Callsign" stretch="0,0">
-             <property name="leftMargin">
-              <number>0</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="QLineEdit" name="le_AircraftType">
-               <property name="placeholderText">
-                <string>ICAO, e.g. A321</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QToolButton" name="tb_SyncWithSimulator">
-               <property name="toolTip">
-                <string>Synchronize with simulator</string>
-               </property>
-               <property name="whatsThis">
-                <string>Synchronize with simulator</string>
-               </property>
-               <property name="icon">
-                <iconset resource="../../blackmisc/blackmisc.qrc">
-                 <normaloff>:/diagona/icons/diagona/icons/arrow-circle-225.png</normaloff>:/diagona/icons/diagona/icons/arrow-circle-225.png</iconset>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="le_Callsign">
-            <property name="maxLength">
-             <number>40</number>
-            </property>
-            <property name="readOnly">
-             <bool>true</bool>
-            </property>
+           <widget class="QLineEdit" name="le_AircraftType">
             <property name="placeholderText">
-             <string>e.g. DLH1331</string>
+             <string>ICAO, e.g. A321</string>
             </property>
            </widget>
           </item>
@@ -774,8 +774,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>358</width>
-         <height>482</height>
+         <width>383</width>
+         <height>436</height>
         </rect>
        </property>
        <layout class="QVBoxLayout" name="vl_RemarksGeneratorScroll">
@@ -1222,8 +1222,8 @@ p, li { white-space: pre-wrap; }
   <tabstop>sa_FlightPlanTabMain</tabstop>
   <tabstop>cb_FlightRule</tabstop>
   <tabstop>le_Callsign</tabstop>
-  <tabstop>le_AircraftType</tabstop>
   <tabstop>tb_SyncWithSimulator</tabstop>
+  <tabstop>le_AircraftType</tabstop>
   <tabstop>le_CruiseTrueAirspeed</tabstop>
   <tabstop>cb_Heavy</tabstop>
   <tabstop>cb_Tcas</tabstop>