diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index fed9d42387d1f12dd30521834827cfad0bd86f24..3eb5c47fd9053f2d9654ff1a2ad44c494db255bd 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -87,7 +87,7 @@ FlightMap {
         buttonVisible:      [ true, true, _showZoom, _showZoom ]
         maxHeight:          (_flightVideo.visible ? _flightVideo.y : parent.height) - toolStrip.y   // Massive reach across hack
 
-        property bool _showZoom: !ScreenTools.isShortScreen
+        property bool _showZoom: !ScreenTools.isMobile
 
         model: [
             {
diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index c466f2fef95e2b79b6759c0edd5f2169b8160268..d3ca1e72c9da13f138fe535bfcb23c0ce795fea9 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -250,7 +250,6 @@ QGCView {
 
     function setCurrentItem(sequenceNumber) {
         if (sequenceNumber !== _currentMissionIndex) {
-            console.log("setCurrentItem", sequenceNumber)
             _currentMissionItem = undefined
             _currentMissionIndex = -1
             for (var i=0; i<_visualItems.count; i++) {
@@ -712,7 +711,7 @@ QGCView {
                     buttonVisible:      [ true, true, true, true, true, _showZoom, _showZoom ]
                     maxHeight:          mapScale.y - toolStrip.y
 
-                    property bool _showZoom: !ScreenTools.isShortScreen
+                    property bool _showZoom: !ScreenTools.isMobile
 
                     model: [
                         {
diff --git a/src/MissionEditor/SurveyItemEditor.qml b/src/MissionEditor/SurveyItemEditor.qml
index 0d84de9176a439fedb88e84daa7e41243ee7b786..349e54fb9db2e421227bbe277b5132b72e5a388c 100644
--- a/src/MissionEditor/SurveyItemEditor.qml
+++ b/src/MissionEditor/SurveyItemEditor.qml
@@ -214,6 +214,12 @@ Rectangle {
                 recalcFromCameraValues()
             }
         }
+
+        onIsCurrentItemChanged: {
+            if (!missionItem.isCurrentItem) {
+                polygonEditor.cancelPolygonEdit()
+            }
+        }
     }
 
     Connections {
diff --git a/src/MissionManager/MissionCommandTree.cc b/src/MissionManager/MissionCommandTree.cc
index cbb41630d3eaf0e7b13d7ea7e154e1ca679d02f2..9e21355af0bfd82ea05f1b14129371ed317ae851 100644
--- a/src/MissionManager/MissionCommandTree.cc
+++ b/src/MissionManager/MissionCommandTree.cc
@@ -23,6 +23,7 @@
 
 MissionCommandTree::MissionCommandTree(QGCApplication* app, bool unitTest)
     : QGCTool(app)
+    , _allCommandsCategory(tr("All commands"))
     , _settingsManager(NULL)
     , _unitTest(unitTest)
 {
@@ -168,6 +169,7 @@ void MissionCommandTree::_buildAvailableCommands(Vehicle* vehicle)
             _availableCategories[baseFirmwareType][baseVehicleType].append(newCategory);
         }
     }
+    _availableCategories[baseFirmwareType][baseVehicleType].append(_allCommandsCategory);
 }
 
 QStringList MissionCommandTree::_availableCategoriesForVehicle(Vehicle* vehicle)
@@ -238,7 +240,7 @@ QVariantList MissionCommandTree::getCommandsForCategory(Vehicle* vehicle, const
     QMap<MAV_CMD, MissionCommandUIInfo*> commandMap = _availableCommands[baseFirmwareType][baseVehicleType];
     foreach (MAV_CMD command, commandMap.keys()) {
         MissionCommandUIInfo* uiInfo = commandMap[command];
-        if (uiInfo->category() == category) {
+        if (uiInfo->category() == category || category == _allCommandsCategory) {
             list.append(QVariant::fromValue(uiInfo));
         }
     }
diff --git a/src/MissionManager/MissionCommandTree.h b/src/MissionManager/MissionCommandTree.h
index 2ac32379306139cc249efbe0e1296a370c993002..ea892bd103241afa6155dac0967996f9535d14f1 100644
--- a/src/MissionManager/MissionCommandTree.h
+++ b/src/MissionManager/MissionCommandTree.h
@@ -76,11 +76,13 @@ private:
     void _baseVehicleInfo(Vehicle* vehicle, MAV_AUTOPILOT& baseFirmwareType, MAV_TYPE& baseVehicleType) const;
 
 private:
-    /// List of all known command ids (not vehicle specific)
-    QList<int> _allCommandIds;
+    QString             _allCommandsCategory;   ///< Category which contains all available commands
+    QList<int>          _allCommandIds;         ///< List of all known command ids (not vehicle specific)
+    SettingsManager*    _settingsManager;
+    bool                _unitTest;              ///< true: running in unit test mode
 
     /// Full hierarchy
-    QMap<MAV_AUTOPILOT, QMap<MAV_TYPE, MissionCommandList*>>                   _staticCommandTree;
+    QMap<MAV_AUTOPILOT, QMap<MAV_TYPE, MissionCommandList*>>                    _staticCommandTree;
 
     /// Collapsed hierarchy for specific vehicle type
     QMap<MAV_AUTOPILOT, QMap<MAV_TYPE, QMap<MAV_CMD, MissionCommandUIInfo*>>>   _availableCommands;
@@ -88,8 +90,6 @@ private:
     /// Collapsed hierarchy for specific vehicle type
     QMap<MAV_AUTOPILOT, QMap<MAV_TYPE, QStringList>>                            _availableCategories;
 
-    SettingsManager*    _settingsManager;
-    bool                _unitTest; ///< true: running in unit test mode
 
 #ifdef UNITTEST_BUILD
     friend class MissionCommandTreeTest;