diff --git a/src/VehicleSetup/SetupView.cc b/src/VehicleSetup/SetupView.cc
index 7d244743d04349b38a11b257e7cbfc977bab392e..1ba00d1c8cfe1d7bcb205ca9ea021f5aa0370770 100644
--- a/src/VehicleSetup/SetupView.cc
+++ b/src/VehicleSetup/SetupView.cc
@@ -110,7 +110,7 @@ void SetupView::_changeSetupWidget(QWidget* newWidget)
         delete _currentSetupWidget;
     }
     _currentSetupWidget = newWidget;
-    _ui->setupWidgetLayout->addWidget(newWidget);
+    _ui->horizontalLayout->addWidget(newWidget);
 }
 
 void SetupView::firmwareButtonClicked(void)
diff --git a/src/VehicleSetup/SetupView.ui b/src/VehicleSetup/SetupView.ui
index 074686aa85026ecd60515978cab7710fccf949df..ca38a2c364b393b19e2b4254bf7e4f59ed4251d3 100644
--- a/src/VehicleSetup/SetupView.ui
+++ b/src/VehicleSetup/SetupView.ui
@@ -39,42 +39,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QWidget" name="setupWidget">
-        <property name="geometry">
-            <rect>
-                <x>0</x>
-                <y>0</y>
-                <width>400</width>
-                <height>300</height>
-            </rect>
-        </property>
-        <property name="windowTitle">
-            <string>Form</string>
-        </property>
-        <property name="autoFillBackground">
-            <bool>true</bool>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-            <item>
-                <layout class="QVBoxLayout" name="setupWidgetLayout"/>
-            </item>
-            <item>
-                <spacer name="verticalSpacer">
-                    <property name="orientation">
-                        <enum>Qt::Vertical</enum>
-                    </property>
-                    <property name="sizeHint" stdset="0">
-                        <size>
-                            <width>20</width>
-                            <height>40</height>
-                        </size>
-                    </property>
-                </spacer>
-            </item>
-        </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/src/ui/px4_configuration/PX4RCCalibration.ui b/src/ui/px4_configuration/PX4RCCalibration.ui
index 2babb5fea0a60505371850e0b00339330b5c2229..b80d09fe73919017384bdd4566f505f1573970cb 100644
--- a/src/ui/px4_configuration/PX4RCCalibration.ui
+++ b/src/ui/px4_configuration/PX4RCCalibration.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
diff --git a/src/ui/px4_configuration/QGCPX4AirframeConfig.ui b/src/ui/px4_configuration/QGCPX4AirframeConfig.ui
index 0194fc072e47e761f5a1fbd5ae27c757b8a9e25a..2c9f5d8195013c61c84a394db32f300f4b1bb524 100644
--- a/src/ui/px4_configuration/QGCPX4AirframeConfig.ui
+++ b/src/ui/px4_configuration/QGCPX4AirframeConfig.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>