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 28c15bf..643810b 100644
--- a/src/PlanView/MissionSettingsEditor.qml
+++ b/src/PlanView/MissionSettingsEditor.qml
@@ -83,12 +83,10 @@ Rectangle {
             anchors.right:  parent ? parent.right : undefined
             anchors.top:    parent ? parent.top   : undefined
             spacing:        _margin
-
             SectionHeader {
                 id:         missionDefaultsSectionHeader
                 text:       qsTr("Mission Defaults")
                 checked:    true
-                showSpacer: false
             }
 
             Column {
@@ -126,18 +124,42 @@ Rectangle {
                         enabled:            flightSpeedCheckBox.checked
                     }
                 } // GridLayout
-
-                QGCCheckBox {
-                    text:       qsTr("RTL after mission end")
-                    checked:    missionItem.missionEndRTL
-                    onClicked:  missionItem.missionEndRTL = checked
-                }
             }
 
             CameraSection {
-                checked: missionItem.cameraSection.settingsSpecified
+                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
             }
 
+            Column {
+                anchors.left:   parent.left
+                anchors.right:  parent.right
+                spacing:        _margin
+                visible:        missionEndHeader.checked
+
+                FactCheckBox {
+                    text:   qsTr("Return To Launch")
+                    fact:   missionItem.missionEndRTL
+                }
+            }
+
+
             SectionHeader {
                 id:         vehicleInfoSectionHeader
                 text:       qsTr("Vehicle Info")