diff --git a/src/ui/QGCHilXPlaneConfiguration.cc b/src/ui/QGCHilXPlaneConfiguration.cc
index 6ba50eda41f33ebfe44154a1c7c73322a73c56a6..9e1e015dfafa971d60906ebaf471586d9efbe202 100644
--- a/src/ui/QGCHilXPlaneConfiguration.cc
+++ b/src/ui/QGCHilXPlaneConfiguration.cc
@@ -26,10 +26,10 @@ QGCHilXPlaneConfiguration::QGCHilXPlaneConfiguration(QGCHilLink* link, QWidget *
 //        connect(ui->randomAttitudeButton, SIGNAL(clicked()), link, SLOT(setRandomAttitude()));
 //        connect(ui->randomPositionButton, SIGNAL(clicked()), link, SLOT(setRandomPosition()));
 
-        ui->airframeComboBox->setCurrentIndex(link->getAirFrameIndex());
-        connect(ui->airframeComboBox, SIGNAL(activated(QString)), link, SLOT(selectAirframe(QString)));
+        //ui->airframeComboBox->setCurrentIndex(link->getAirFrameIndex());
+        //connect(ui->airframeComboBox, SIGNAL(activated(QString)), link, SLOT(selectAirframe(QString)));
         // XXX not implemented yet
-        ui->airframeComboBox->hide();
+        //ui->airframeComboBox->hide();
         ui->sensorHilCheckBox->setChecked(xplane->sensorHilEnabled());
         connect(xplane, SIGNAL(sensorHilChanged(bool)), ui->sensorHilCheckBox, SLOT(setChecked(bool)));
         connect(ui->sensorHilCheckBox, SIGNAL(clicked(bool)), xplane, SLOT(enableSensorHIL(bool)));
diff --git a/src/ui/QGCHilXPlaneConfiguration.ui b/src/ui/QGCHilXPlaneConfiguration.ui
index 278f35eb25701eaf1d5495d0af9466b6b5fb8c90..1f5007d7ff4b24d56987604aa3d6f8dadaa3dd4f 100644
--- a/src/ui/QGCHilXPlaneConfiguration.ui
+++ b/src/ui/QGCHilXPlaneConfiguration.ui
@@ -6,89 +6,27 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>570</width>
-    <height>238</height>
+    <width>226</width>
+    <height>150</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,100" columnstretch="20,40,40,20">
-   <property name="margin">
+  <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0" columnstretch="20,0,0">
+   <property name="leftMargin">
     <number>0</number>
    </property>
-   <item row="3" column="0" colspan="2">
-    <widget class="QPushButton" name="startButton">
-     <property name="text">
-      <string>Start</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="3">
-    <widget class="QComboBox" name="airframeComboBox">
-     <property name="editable">
-      <bool>true</bool>
-     </property>
-     <item>
-      <property name="text">
-       <string>X-Plane default</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>QRO_X/MK</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>QRO_X/Ardrone</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>QRO_X/PWM</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Unlimited</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Twinjet</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Early Bird</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Reno Racer</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Slowstick</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Tiny</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="3" column="2" colspan="2">
-    <widget class="QPushButton" name="setHomeButton">
-     <property name="text">
-      <string>Set HOME</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" colspan="3">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item row="0" column="1" colspan="2">
     <widget class="QComboBox" name="hostComboBox">
      <property name="editable">
       <bool>true</bool>
@@ -100,28 +38,21 @@
      </item>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="0" column="0">
     <widget class="QLabel" name="hostLabel">
      <property name="text">
       <string>Host</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Airframe</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="4">
+   <item row="3" column="0" colspan="3">
     <widget class="QCheckBox" name="sensorHilCheckBox">
      <property name="text">
       <string>Enable sensor level HIL</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="4">
+   <item row="4" column="0" colspan="3">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -134,6 +65,13 @@
      </property>
     </spacer>
    </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="QPushButton" name="startButton">
+     <property name="text">
+      <string>Start</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>