diff --git a/src/MissionEditor/SurveyItemEditor.qml b/src/MissionEditor/SurveyItemEditor.qml
index ca6e369af8b492a6d4ecd86ce6ae243c12cc62a5..55d57223ace8230e73c2f2f8fcf39cf82391b39c 100644
--- a/src/MissionEditor/SurveyItemEditor.qml
+++ b/src/MissionEditor/SurveyItemEditor.qml
@@ -54,6 +54,22 @@ Rectangle {
         missionItem.cameraTriggerDistance.rawValue = cameraTriggerDistance
     }
 
+    Connections {
+        target: editorMap.polygonDraw
+
+        onPolygonCaptureStarted: {
+            missionItem.clearPolygon()
+        }
+
+        onPolygonCaptureFinished: {
+            for (var i=0; i<coordinates.length; i++) {
+                missionItem.addPolygonCoordinate(coordinates[i])
+            }
+        }
+
+        onPolygonAdjustVertex: missionItem.adjustPolygonCoordinate(vertexIndex, vertexCoordinate)
+    }
+
     QGCPalette { id: qgcPal; colorGroupEnabled: true }
 
     ExclusiveGroup {
@@ -106,52 +122,6 @@ Rectangle {
             onClicked:      missionItem.gridAltitudeRelative = checked
         }
 
-        QGCCheckBox {
-            id:                 cameraTrigger
-            anchors.left:       parent.left
-            text:               qsTr("Camera trigger:")
-            checked:            missionItem.cameraTrigger
-            onClicked:          missionItem.cameraTrigger = checked
-        }
-
-        Item {
-            id:             distanceItem
-            anchors.left:   parent.left
-            anchors.right:  parent.right
-            height:         textField.height
-            enabled:        cameraTrigger.checked
-
-            QGCLabel {
-                anchors.baseline:   textField.baseline
-                anchors.left:       parent.left
-                text:               qsTr("Distance:")
-            }
-
-            FactTextField {
-                id:             textField
-                anchors.right:  parent.right
-                width:          _editFieldWidth
-                showUnits:      true
-                fact:           missionItem.cameraTriggerDistance
-            }
-        }
-
-        Connections {
-            target: editorMap.polygonDraw
-
-            onPolygonCaptureStarted: {
-                missionItem.clearPolygon()
-            }
-
-            onPolygonCaptureFinished: {
-                for (var i=0; i<coordinates.length; i++) {
-                    missionItem.addPolygonCoordinate(coordinates[i])
-                }
-            }
-
-            onPolygonAdjustVertex: missionItem.adjustPolygonCoordinate(vertexIndex, vertexCoordinate)
-        }
-
         QGCLabel { text: qsTr("Camera:") }
 
         Rectangle {
@@ -164,7 +134,6 @@ Rectangle {
         Row {
             spacing: ScreenTools.defaultFontPixelWidth
 
-
             QGCRadioButton {
                 id:             cameraOrientationLandscape
                 text:           "Landscape"
@@ -184,6 +153,20 @@ Rectangle {
             spacing: ScreenTools.defaultFontPixelWidth
             verticalItemAlignment: Grid.AlignVCenter
 
+            QGCCheckBox {
+                id:         cameraTrigger
+                text:       qsTr("Trigger:")
+                checked:    missionItem.cameraTrigger
+                onClicked:  missionItem.cameraTrigger = checked
+            }
+
+            FactTextField {
+                width:      _editFieldWidth
+                showUnits:  true
+                fact:       missionItem.cameraTriggerDistance
+                enabled:    missionItem.cameraTrigger
+            }
+
             QGCLabel { text: qsTr("Focal length:") }
             QGCTextField {
                 id:         focalLengthField
diff --git a/src/MissionManager/MissionCommandTree.cc b/src/MissionManager/MissionCommandTree.cc
index 06f8c5e040d8954e97b89dba1ff04cacde637979..2c6e4fed84283c50cffa4d7e760bd528d853eb3a 100644
--- a/src/MissionManager/MissionCommandTree.cc
+++ b/src/MissionManager/MissionCommandTree.cc
@@ -174,7 +174,11 @@ QString MissionCommandTree::friendlyName(MAV_CMD command)
     MissionCommandList *    commandList =   _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_GENERIC];
     MissionCommandUIInfo*   uiInfo =        commandList->getUIInfo(command);
 
-    return uiInfo->friendlyName();
+    if (uiInfo) {
+        return uiInfo->friendlyName();
+    } else {
+        return QString("MAV_CMD(%1)").arg((int)command);
+    }
 }
 
 QString MissionCommandTree::rawName(MAV_CMD command)
@@ -182,7 +186,11 @@ QString MissionCommandTree::rawName(MAV_CMD command)
     MissionCommandList *    commandList =   _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_GENERIC];
     MissionCommandUIInfo*   uiInfo =        commandList->getUIInfo(command);
 
-    return uiInfo->rawName();
+    if (uiInfo) {
+        return uiInfo->rawName();
+    } else {
+        return QString("MAV_CMD(%1)").arg((int)command);
+    }
 }
 
 const QList<MAV_CMD>& MissionCommandTree::allCommandIds(void) const