diff --git a/qml/ApmToolBar.qml b/qml/ApmToolBar.qml
index 23a78150796efd1196e6598ca79b92f0d09242ee..6ede1e51d419c6e1a9a554889a20a91837a2e826 100644
--- a/qml/ApmToolBar.qml
+++ b/qml/ApmToolBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.1
+import QtQuick 2.1
 import "./components"
 
 
diff --git a/qml/components/Button.qml b/qml/components/Button.qml
index 798a161076bb015a7845c7ac3254e2c4e7a8e9d8..27b1f9e337c7842362bcb64bf44d7ecb61306fd0 100644
--- a/qml/components/Button.qml
+++ b/qml/components/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.1
+import QtQuick 2.1
 
 Rectangle {
     signal clicked
diff --git a/qml/components/DigitalDisplay.qml b/qml/components/DigitalDisplay.qml
index dc70d0149c9b9e79a4a5dc508815a94dc23c9450..5af486b5a4179118d35dd49703f6f41419a1d44e 100644
--- a/qml/components/DigitalDisplay.qml
+++ b/qml/components/DigitalDisplay.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.1
+import QtQuick 2.1
 
 Rectangle {
 
diff --git a/qml/components/StatusDisplay.qml b/qml/components/StatusDisplay.qml
index 9d4f6ade628325a3025b0e133e63913c9e5314e3..30bb8a848d9ac9cb31f99c36becefffcca8182bf 100644
--- a/qml/components/StatusDisplay.qml
+++ b/qml/components/StatusDisplay.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.1
+import QtQuick 2.1
 
 Rectangle {
     id: statusDisplay
diff --git a/qml/components/TextButton.qml b/qml/components/TextButton.qml
index c7b2b32226103c85779769e3af60df0cda11ab68..24b261cd95e5163c28c4477c5b0bcefb28325739 100644
--- a/qml/components/TextButton.qml
+++ b/qml/components/TextButton.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.1
+import QtQuick 2.1
 
 Rectangle {
     signal clicked
diff --git a/src/ui/configuration/ApmFirmwareConfig.cc b/src/ui/configuration/ApmFirmwareConfig.cc
index a79e4dfcb986fe75b052609e813cf6381cd32ed0..47e1ac72e9d84d1e0402d7d9deac5a4e8f640364 100644
--- a/src/ui/configuration/ApmFirmwareConfig.cc
+++ b/src/ui/configuration/ApmFirmwareConfig.cc
@@ -38,7 +38,7 @@ ApmFirmwareConfig::ApmFirmwareConfig(QWidget *parent) : QWidget(parent)
     ui.progressBar->setValue(0);
 
     ui.textBrowser->setVisible(false);
-    connect(ui.showOutputCheckBox,SIGNAL(clicked(bool)),ui.textBrowser,SLOT(setShown(bool)));
+    connect(ui.showOutputCheckBox,SIGNAL(clicked(bool)),ui.textBrowser,SLOT(setVisible(bool)));
 
     /*addBetaLabel(ui.roverPushButton);
     addBetaLabel(ui.planePushButton);
diff --git a/src/ui/configuration/ApmHardwareConfig.cc b/src/ui/configuration/ApmHardwareConfig.cc
index f576e6fa07ae9013016295f0e4ee8260036b4458..38aef8b6a7f8c0800e2f3145d604db94cb5b0ff3 100644
--- a/src/ui/configuration/ApmHardwareConfig.cc
+++ b/src/ui/configuration/ApmHardwareConfig.cc
@@ -49,13 +49,13 @@ ApmHardwareConfig::ApmHardwareConfig(QWidget *parent) : QWidget(parent)
     ui.osdButton->setVisible(false);
     ui.cameraGimbalButton->setVisible(false);
 
-    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.radio3DRButton,SLOT(setShown(bool)));
-    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.batteryMonitorButton,SLOT(setShown(bool)));
-    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.sonarButton,SLOT(setShown(bool)));
-    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.opticalFlowButton,SLOT(setShown(bool)));
-    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.osdButton,SLOT(setShown(bool)));
-    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.cameraGimbalButton,SLOT(setShown(bool)));
-    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.antennaTrackerButton,SLOT(setShown(bool)));
+    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.radio3DRButton,SLOT(setVisible(bool)));
+    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.batteryMonitorButton,SLOT(setVisible(bool)));
+    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.sonarButton,SLOT(setVisible(bool)));
+    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.opticalFlowButton,SLOT(setVisible(bool)));
+    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.osdButton,SLOT(setVisible(bool)));
+    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.cameraGimbalButton,SLOT(setVisible(bool)));
+    connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.antennaTrackerButton,SLOT(setVisible(bool)));
 
     connect(ui.frameTypeButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget()));
 
@@ -157,27 +157,27 @@ void ApmHardwareConfig::activeUASSet(UASInterface *uas)
     }
     if (uas->getSystemType() == MAV_TYPE_FIXED_WING)
     {
-        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.compassButton,SLOT(setShown(bool)));
-        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.arduPlaneLevelButton,SLOT(setShown(bool)));
-        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.radioCalibrateButton,SLOT(setShown(bool)));
-        connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.airspeedButton,SLOT(setShown(bool)));
+        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.compassButton,SLOT(setVisible(bool)));
+        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.arduPlaneLevelButton,SLOT(setVisible(bool)));
+        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.radioCalibrateButton,SLOT(setVisible(bool)));
+        connect(ui.optionalHardwareButton,SIGNAL(toggled(bool)),ui.airspeedButton,SLOT(setVisible(bool)));
     }
     else if (uas->getSystemType() == MAV_TYPE_QUADROTOR)
     {
-        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.frameTypeButton,SLOT(setShown(bool)));
-        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.compassButton,SLOT(setShown(bool)));
-        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.accelCalibrateButton,SLOT(setShown(bool)));
-        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.radioCalibrateButton,SLOT(setShown(bool)));
+        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.frameTypeButton,SLOT(setVisible(bool)));
+        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.compassButton,SLOT(setVisible(bool)));
+        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.accelCalibrateButton,SLOT(setVisible(bool)));
+        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.radioCalibrateButton,SLOT(setVisible(bool)));
     }
     else if (uas->getSystemType() == MAV_TYPE_GROUND_ROVER)
     {
-        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.compassButton,SLOT(setShown(bool)));
-        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.radioCalibrateButton,SLOT(setShown(bool)));
+        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.compassButton,SLOT(setVisible(bool)));
+        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.radioCalibrateButton,SLOT(setVisible(bool)));
     }
     else
     {
-        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.compassButton,SLOT(setShown(bool)));
-        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.radioCalibrateButton,SLOT(setShown(bool)));
+        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.compassButton,SLOT(setVisible(bool)));
+        connect(ui.manditoryHardware,SIGNAL(toggled(bool)),ui.radioCalibrateButton,SLOT(setVisible(bool)));
     }
     ui.firmwareButton->setVisible(true);
     ui.manditoryHardware->setVisible(true);