diff --git a/src/MissionManager/MissionSettingsItem.h b/src/MissionManager/MissionSettingsItem.h
index 9a511fd..b0cc85e 100644
--- a/src/MissionManager/MissionSettingsItem.h
+++ b/src/MissionManager/MissionSettingsItem.h
@@ -63,8 +63,8 @@ public:
     bool            isStandaloneCoordinate  (void) const final { return false; }
     bool            specifiesCoordinate     (void) const final;
     bool            specifiesAltitudeOnly   (void) const final { return false; }
-    QString         commandDescription      (void) const final { return "Mission Settings"; }
-    QString         commandName             (void) const final { return "Mission Settings"; }
+    QString         commandDescription      (void) const final { return "Mission Start"; }
+    QString         commandName             (void) const final { return "Mission Start"; }
     QString         abbreviation            (void) const final { return "H"; }
     QGeoCoordinate  coordinate              (void) const final { return _plannedHomePositionCoordinate; }
     QGeoCoordinate  exitCoordinate          (void) const final { return _plannedHomePositionCoordinate; }
diff --git a/src/PlanView/MissionSettingsEditor.qml b/src/PlanView/MissionSettingsEditor.qml
index 1575fd6..fcb05f3 100644
--- a/src/PlanView/MissionSettingsEditor.qml
+++ b/src/PlanView/MissionSettingsEditor.qml
@@ -235,11 +235,25 @@ Rectangle {
                 } // GridLayout
             }
 
+            CameraSection {
+                id:         cameraSection
+                checked:    true
+            }
+
+            QGCLabel {
+                anchors.left:           parent.left
+                anchors.right:          parent.right
+                text:                   qsTr("Above camera commands will take affect immediately upon mission start.")
+                wrapMode:               Text.WordWrap
+                horizontalAlignment:    Text.AlignHCenter
+                font.pointSize:         ScreenTools.smallFontPointSize
+                visible:                cameraSection.checked
+            }
+
             SectionHeader {
                 id:         missionEndHeader
                 text:       qsTr("Mission End")
                 checked:    true
-                showSpacer: false
             }
 
             Column {
@@ -254,20 +268,6 @@ Rectangle {
                 }
             }
 
-            CameraSection {
-                id:         cameraSection
-                checked:    missionItem.cameraSection.settingsSpecified
-            }
-
-            QGCLabel {
-                anchors.left:           parent.left
-                anchors.right:          parent.right
-                text:                   qsTr("Above camera commands will take affect immediately upon mission start.")
-                wrapMode:               Text.WordWrap
-                horizontalAlignment:    Text.AlignHCenter
-                font.pointSize:         ScreenTools.smallFontPointSize
-                visible:                cameraSection.checked
-            }
         } // Column
     } // Deferred loader
 } // Rectangle