diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 653583039d8a736f68f457a0f6d94dbd90ecc1be..b0ef52eefc2e7313a263f587358d966ec97fd2de 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -572,8 +572,8 @@ Item {
             anchors.left:       isInstrumentRight() ? _mapAndVideo.left : undefined
             anchors.rightMargin:isInstrumentRight() ? undefined : ScreenTools.defaultFontPixelWidth
             anchors.right:      isInstrumentRight() ? undefined : _mapAndVideo.right
-            anchors.topMargin:  ScreenTools.toolbarHeight + anchors.leftMargin
-            anchors.top:        _mapAndVideo.top
+            anchors.topMargin:  mainWindow.header.height + (ScreenTools.defaultFontPixelHeight * 0.5)
+            anchors.top:        parent.top
             z:                  _mapAndVideo.z + 4
             maxHeight:          (_flightVideo.visible ? _flightVideo.y : parent.height) - toolStrip.y
 
diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 3ddf355ee2d630bad409da947f649b48efc409dc..657ea1102539015b67202a11fc03d32be3dbfd28 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -8,7 +8,7 @@
  ****************************************************************************/
 
 
-import QtQuick          2.3
+import QtQuick          2.4
 import QtQuick.Controls 1.2
 import QtLocation       5.3
 import QtPositioning    5.3
@@ -166,7 +166,6 @@ FlightMap {
     QGCMapPalette { id: mapPal; lightColors: isSatelliteMap }
 
     Connections {
-        enabled:                missionController !== null
         target:                 missionController
         ignoreUnknownSignals:   true
         onNewItemsFromVehicle: {
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index 59d75d45d6bde40e27c16702f944c303e5e2f8a2..d276cd9e8b8068897618673a10ce5473ad207f2f 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -530,12 +530,12 @@ Item {
         //-----------------------------------------------------------
         // Left tool strip
             ToolStrip {
-                id:                 toolStrip
+            id:                 toolStrip
             anchors.leftMargin: ScreenTools.defaultFontPixelWidth * 2
-                anchors.left:       parent.left
-            anchors.topMargin:  _toolButtonTopMargin + anchors.leftMargin
-                anchors.top:        parent.top
-                z:                  QGroundControl.zOrderWidgets
+            anchors.left:       parent.left
+            anchors.topMargin:  ScreenTools.defaultFontPixelHeight * 0.5
+            anchors.top:        parent.top
+            z:                  QGroundControl.zOrderWidgets
 
             showAlternateIcon:  [ false, _planMasterController.dirty, false, false, false, false, false, false ]
             rotateImage:        [ false, _planMasterController.syncInProgress, false, false, false, false, false, false ]
diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml
index 50f6fd0e5ceef4167930a2f2b48926bdee154d68..742e0133f71ba91b90c8e2f0c3614f0fe27fe702 100644
--- a/src/QmlControls/ToolStrip.qml
+++ b/src/QmlControls/ToolStrip.qml
@@ -36,7 +36,6 @@ Rectangle {
 
     signal clicked(int index, bool checked)
 
-    QGCPalette { id: qgcPal }
     ButtonGroup {
         id: buttonGroup
         exclusive: false
@@ -59,7 +58,7 @@ Rectangle {
                 anchors.right:  toolStripColumn.right
                 height:         width
                 radius:         ScreenTools.defaultFontPixelWidth / 2
-                fontPointSize:  ScreenTools.isMobile ? ScreenTools.smallFontPointSize : ScreenTools.defaultFontPointSize
+                fontPointSize:  ScreenTools.smallFontPointSize
 
                 enabled:        _root.buttonEnabled ? _root.buttonEnabled[index] : true
                 visible:        _root.buttonVisible ? _root.buttonVisible[index] : true
diff --git a/src/Settings/VideoSettings.cc b/src/Settings/VideoSettings.cc
index 2759b976bc946259da429811ec8c54c7cae154de..78b0c6f1fb0c3890cfffff3f5a7919fd6a593501 100644
--- a/src/Settings/VideoSettings.cc
+++ b/src/Settings/VideoSettings.cc
@@ -130,16 +130,16 @@ bool VideoSettings::streamConfigured(void)
 #if !defined(QGC_GST_STREAMING)
     return false;
 #endif
-    //-- First, check if it's disabled
-    QString vSource = videoSource()->rawValue().toString();
-    if(vSource == videoSourceNoVideo || vSource == videoDisabled) {
-        return false;
-    }
-    //-- Check if it's autoconfigured
+    //-- First, check if it's autoconfigured
     if(qgcApp()->toolbox()->videoManager()->autoStreamConfigured()) {
         qCDebug(VideoManagerLog) << "Stream auto configured";
         return true;
     }
+    //-- Check if it's disabled
+    QString vSource = videoSource()->rawValue().toString();
+    if(vSource == videoSourceNoVideo || vSource == videoDisabled) {
+        return false;
+    }
     //-- If UDP, check if port is set
     if(vSource == videoSourceUDP) {
         qCDebug(VideoManagerLog) << "Testing configuration for UDP Stream:" << udpPort()->rawValue().toInt();
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index 35e0db7fd53409e4f281eaa40e7dadba5e12737a..4921d4155d5e9aeab412e6355182a095d991e7c0 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -504,8 +504,7 @@ void Vehicle::_commonInit(void)
     _flightTimeFact.setRawValue(0);
 
     // Set video stream to udp if running ArduSub and Video is disabled
-    if (sub() && _settingsManager->videoSettings()->videoSource()->rawValue() == VideoSettings::videoDisabled)
-    {
+    if (sub() && _settingsManager->videoSettings()->videoSource()->rawValue() == VideoSettings::videoDisabled) {
         _settingsManager->videoSettings()->videoSource()->setRawValue(VideoSettings::videoSourceUDP);
     }