diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index cf714d579cebe5cdffb54d27365344a2b40e85c9..cddca39f97df453b70aa3e33ead6aa773bb052c2 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -269,7 +269,8 @@ FORMS += src/ui/MainWindow.ui \
     src/ui/main/QGCWelcomeMainWindow.ui \
     src/ui/configuration/terminalconsole.ui \
     src/ui/configuration/SerialSettingsDialog.ui \
-    src/ui/configuration/ApmFirmwareConfig.ui
+    src/ui/configuration/ApmFirmwareConfig.ui \
+    src/ui/px4_configuration/QGCPX4AirframeConfig.ui
 
 INCLUDEPATH += src \
     src/ui \
@@ -471,7 +472,8 @@ HEADERS += src/MG.h \
     src/ui/configuration/ApmFirmwareConfig.h \
     src/uas/UASParameterDataModel.h \
     src/uas/UASParameterCommsMgr.h \
-    src/ui/QGCPendingParamWidget.h
+    src/ui/QGCPendingParamWidget.h \
+    src/ui/px4_configuration/QGCPX4AirframeConfig.h
 
 # Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler
 macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010|win32-msvc2012::HEADERS += src/ui/map3D/QGCGoogleEarthView.h
@@ -689,7 +691,8 @@ SOURCES += src/main.cc \
     src/ui/configuration/ApmFirmwareConfig.cc \
     src/uas/UASParameterDataModel.cc \
     src/uas/UASParameterCommsMgr.cc \
-    src/ui/QGCPendingParamWidget.cc
+    src/ui/QGCPendingParamWidget.cc \
+    src/ui/px4_configuration/QGCPX4AirframeConfig.cc
 
 # Enable Google Earth only on Mac OS and Windows with Visual Studio compiler
 macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010|win32-msvc2012::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
diff --git a/src/ui/px4_configuration/QGCPX4AirframeConfig.cc b/src/ui/px4_configuration/QGCPX4AirframeConfig.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6c448b32976e012932f08b7cccd6fde07efd2281
--- /dev/null
+++ b/src/ui/px4_configuration/QGCPX4AirframeConfig.cc
@@ -0,0 +1,14 @@
+#include "QGCPX4AirframeConfig.h"
+#include "ui_QGCPX4AirframeConfig.h"
+
+QGCPX4AirframeConfig::QGCPX4AirframeConfig(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::QGCPX4AirframeConfig)
+{
+    ui->setupUi(this);
+}
+
+QGCPX4AirframeConfig::~QGCPX4AirframeConfig()
+{
+    delete ui;
+}
diff --git a/src/ui/px4_configuration/QGCPX4AirframeConfig.h b/src/ui/px4_configuration/QGCPX4AirframeConfig.h
new file mode 100644
index 0000000000000000000000000000000000000000..5cad0cb9d00e498e24617fa96cbd77ed2277a1c2
--- /dev/null
+++ b/src/ui/px4_configuration/QGCPX4AirframeConfig.h
@@ -0,0 +1,22 @@
+#ifndef QGCPX4AIRFRAMECONFIG_H
+#define QGCPX4AIRFRAMECONFIG_H
+
+#include <QWidget>
+
+namespace Ui {
+class QGCPX4AirframeConfig;
+}
+
+class QGCPX4AirframeConfig : public QWidget
+{
+    Q_OBJECT
+    
+public:
+    explicit QGCPX4AirframeConfig(QWidget *parent = 0);
+    ~QGCPX4AirframeConfig();
+    
+private:
+    Ui::QGCPX4AirframeConfig *ui;
+};
+
+#endif // QGCPX4AIRFRAMECONFIG_H
diff --git a/src/ui/px4_configuration/QGCPX4AirframeConfig.ui b/src/ui/px4_configuration/QGCPX4AirframeConfig.ui
new file mode 100644
index 0000000000000000000000000000000000000000..f5aa09aa93cb549bb6fe72093e9094bafffb2535
--- /dev/null
+++ b/src/ui/px4_configuration/QGCPX4AirframeConfig.ui
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QGCPX4AirframeConfig</class>
+ <widget class="QWidget" name="QGCPX4AirframeConfig">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>602</width>
+    <height>345</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" colspan="2">
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>561</width>
+        <height>299</height>
+       </rect>
+      </property>
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="0" column="0">
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <item>
+          <widget class="QPushButton" name="planePushButton">
+           <property name="text">
+            <string/>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>120</width>
+             <height>120</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="planeComboBox">
+           <item>
+            <property name="text">
+             <string>Please select</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>EasyStar</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>EasyStar 2</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>EasyStar 2 w. Ailerons</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Bixler 2</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Standard Plane</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="0" column="1">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="QPushButton" name="flyingWingPushButton">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="flyingWingComboBox">
+           <item>
+            <property name="text">
+             <string>Bormatec CamFlyer Q</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>FX-61 Phantom</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Flying Wing</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="0" column="2">
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <item>
+          <widget class="QPushButton" name="quadXPushButton">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="quadXComboBox">
+           <item>
+            <property name="text">
+             <string>AR.Drone Frame</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Arducopter C Frame</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>DJI F330 Frame</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>DJI F450 Frame</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Quadrotor X</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="0" column="3">
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <item>
+          <widget class="QPushButton" name="QuadPlusPushButton">
+           <property name="text">
+            <string>PushButton</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_4"/>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_4">
+           <property name="text">
+            <string>Quadrotor +</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="0">
+        <layout class="QVBoxLayout" name="verticalLayout_5">
+         <item>
+          <widget class="QPushButton" name="HexaXPushButton">
+           <property name="text">
+            <string>PushButton</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_5"/>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_5">
+           <property name="text">
+            <string>Hexarotor X</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="1">
+        <layout class="QVBoxLayout" name="verticalLayout_6">
+         <item>
+          <widget class="QPushButton" name="HexaPlusPushButton">
+           <property name="text">
+            <string>PushButton</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_6"/>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_6">
+           <property name="text">
+            <string>Hexarotor +</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="2">
+        <layout class="QVBoxLayout" name="verticalLayout_7">
+         <item>
+          <widget class="QPushButton" name="octoXPushButton">
+           <property name="text">
+            <string>PushButton</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_7"/>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_7">
+           <property name="text">
+            <string>Octorotor X</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="3">
+        <layout class="QVBoxLayout" name="verticalLayout_8">
+         <item>
+          <widget class="QPushButton" name="octoPlusPushButton">
+           <property name="text">
+            <string>PushButton</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_8"/>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_8">
+           <property name="text">
+            <string>Octorotor +</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="0">
+        <layout class="QVBoxLayout" name="verticalLayout_9">
+         <item>
+          <widget class="QPushButton" name="hPushButton">
+           <property name="text">
+            <string>PushButton</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_9">
+           <item>
+            <property name="text">
+             <string>Steadydrone</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>H Frame Custom</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_9">
+           <property name="text">
+            <string>H Frame</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="statusLabel">
+     <property name="text">
+      <string>No changes values</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="applyButton">
+     <property name="text">
+      <string>Apply and Restart</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>