diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index eb37aeaa..5133288c 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1143,6 +1143,9 @@
     "portsFunction_DJI_FPV": {
         "message": "DJI FPV VTX"
     },
+    "portsFunction_HDZERO_VTX": {
+        "message": "HDZero VTX"
+    },
     "portsFunction_IMU2": {
         "message": "Secondary IMU"
     },
@@ -3604,9 +3607,6 @@
     "platformConfiguration": {
         "message": "Platform configuration"
     },
-    "platformHasFlaps": {
-        "message": "Has flaps"
-    },
     "mixerPreset": {
         "message": "Mixer preset"
     },
diff --git a/js/data_storage.js b/js/data_storage.js
index 5834e52e..3de1a4f2 100755
--- a/js/data_storage.js
+++ b/js/data_storage.js
@@ -2,7 +2,7 @@
 
 var CONFIGURATOR = {
      // all versions are specified and compared using semantic versioning http://semver.org/
-    'minfirmwareVersionAccepted': '3.0.0',
+    'minfirmwareVersionAccepted': '4.1.0',
     'maxFirmwareVersionAccepted': '6.0.0', // Condition is < (lt) so we accept all in 4.x branch
     'connectionValid': false,
     'connectionValidCliOnly': false,
diff --git a/js/defaults_dialog.js b/js/defaults_dialog.js
index 14288aed..b3a978c9 100644
--- a/js/defaults_dialog.js
+++ b/js/defaults_dialog.js
@@ -13,6 +13,7 @@ helper.defaultsDialog = (function () {
 
     let data = [{
         "title": 'Mini Quad with 3"-7" propellers',
+        "id": 2,
         "notRecommended": false,
         "reboot": true,
         "settings": [
@@ -89,6 +90,10 @@ helper.defaultsDialog = (function () {
                 key: "airmode_type",
                 value: "THROTTLE_THRESHOLD"
             },
+            {
+                key: "airmode_throttle_threshold",
+                value: 1150
+            },
             {
                 key: "mc_iterm_relax",
                 value: "RP"
@@ -578,6 +583,7 @@ helper.defaultsDialog = (function () {
     },
     {
         "title": 'Rovers & Boats',
+        "id": 1,
         "notRecommended": false,
         "reboot": true,
         "settings": [
@@ -641,6 +647,7 @@ helper.defaultsDialog = (function () {
     },
     {
         "title": 'Keep current settings (Not recommended)',
+        "id": 0,
         "notRecommended": true,
         "reboot": false,
         "settings": [
@@ -721,6 +728,11 @@ helper.defaultsDialog = (function () {
         let selectedDefaultPreset = data[$(event.currentTarget).data("index")];
         if (selectedDefaultPreset && selectedDefaultPreset.settings) {
 
+            if (selectedDefaultPreset.id == 0) {
+                // Close applying preset dialog if keeping current settings.
+                savingDefaultsModal.close(); 
+            }
+
             mspHelper.loadBfConfig(function () {
                 privateScope.setFeaturesBits(selectedDefaultPreset)
             });
diff --git a/js/fc.js b/js/fc.js
index 7c95327e..26a638d2 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -30,7 +30,7 @@ var CONFIG,
     MOTOR_DATA,
     SERVO_DATA,
     GPS_DATA,
-    MISSION_PLANER,
+    MISSION_PLANNER,
     ANALOG,
     ARMING_CONFIG,
     FC_CONFIG,
@@ -246,7 +246,7 @@ var FC = {
             packetCount: 0
         };
 
-        /* MISSION_PLANER = {
+        /* MISSION_PLANNER = {
             maxWaypoints: 0,
             isValidMission: 0,
             countBusyPoints: 0,
@@ -262,8 +262,8 @@ var FC = {
                 p3: 0
             }
         }; */
-        
-        MISSION_PLANER = new WaypointCollection();
+
+        MISSION_PLANNER = new WaypointCollection();
 
         ANALOG = {
             voltage: 0,
@@ -558,7 +558,7 @@ var FC = {
         OUTPUT_MAPPING = new OutputMappingCollection();
 
         SETTINGS = {};
-        
+
         SAFEHOMES = new SafehomeCollection();
     },
     getOutputUsages: function() {
@@ -819,7 +819,7 @@ var FC = {
                     }
                 }
             };
-        }        
+        }
     },
     getServoRates: function () {
         return {
@@ -999,7 +999,7 @@ var FC = {
             'RC Channel 8',         // 11
             'Gimbal Pitch',         // 12
             'Gimbal Roll',          // 13
-            'Flaps',                // 14
+            'Flaperon Mode',        // 14
             'RC Channel 9',         // 15
             'RC Channel 10',        // 16
             'RC Channel 11',        // 17
@@ -1045,215 +1045,269 @@ var FC = {
         return {
             0: {
                 name: "True",
+                operandType: "Active",
                 hasOperand: [false, false],
                 output: "boolean"
             },
             1: {
                 name: "Equal",
+                operandType: "Comparison",
                 hasOperand: [true, true],
                 output: "boolean"
             },
             2: {
                 name: "Greater Than",
+                operandType: "Comparison",
                 hasOperand: [true, true],
                 output: "boolean"
             },
             3: {
                 name: "Lower Than",
+                operandType: "Comparison",
                 hasOperand: [true, true],
                 output: "boolean"
             },
             4: {
                 name: "Low",
+                operandType: "RC Switch Check",
                 hasOperand: [true, false],
                 output: "boolean"
             },
             5: {
                 name: "Mid",
+                operandType: "RC Switch Check",
                 hasOperand: [true, false],
                 output: "boolean"
             },
             6: {
                 name: "High",
+                operandType: "RC Switch Check",
                 hasOperand: [true, false],
                 output: "boolean"
             },
             7: {
                 name: "AND",
+                operandType: "Logic Switches",
                 hasOperand: [true, true],
                 output: "boolean"
             },
             8: {
                 name: "OR",
+                operandType: "Logic Switches",
                 hasOperand: [true, true],
                 output: "boolean"
             },
             9: {
                 name: "XOR",
+                operandType: "Logic Switches",
                 hasOperand: [true, true],
                 output: "boolean"
             },
             10: {
                 name: "NAND",
+                operandType: "Logic Switches",
                 hasOperand: [true, true],
                 output: "boolean"
             },
             11: {
                 name: "NOR",
+                operandType: "Logic Switches",
                 hasOperand: [true, true],
                 output: "boolean"
             },
             12: {
                 name: "NOT",
+                operandType: "Logic Switches",
                 hasOperand: [true, false],
                 output: "boolean"
             },
             13: {
-                name: "STICKY",
+                name: "Sticky",
+                operandType: "Logic Switches",
                 hasOperand: [true, true],
                 output: "boolean"
             },
             14: {
-                name: "ADD",
+                name: "Basic: Add",
+                operandType: "Maths",
                 hasOperand: [true, true],
                 output: "raw"
             },
             15: {
-                name: "SUB",
+                name: "Basic: Subtract",
+                operandType: "Maths",
                 hasOperand: [true, true],
                 output: "raw"
             },
             16: {
-                name: "MUL",
+                name: "Basic: Multiply",
+                operandType: "Maths",
                 hasOperand: [true, true],
                 output: "raw"
             },
             17: {
-                name: "DIV",
+                name: "Basic: Divide",
+                operandType: "Maths",
                 hasOperand: [true, true],
                 output: "raw"
             },
             40: {
-                name: "MOD",
+                name: "Modulo",
+                operandType: "Maths",
                 hasOperand: [true, true],
                 output: "raw"
             },
             18: {
-                name: "GVAR SET",
+                name: "Set GVAR",
+                operandType: "Variables",
                 hasOperand: [true, true],
                 output: "none"
             },
             19: {
-                name: "GVAR INC",
+                name: "Increase GVAR",
+                operandType: "Variables",
                 hasOperand: [true, true],
                 output: "none"
             },
             20: {
-                name: "GVAR DEC",
+                name: "Decrease GVAR",
+                operandType: "Variables",
                 hasOperand: [true, true],
                 output: "none"
             },
             21: {
-                name: "IO PORT SET",
+                name: "Set IO Port",
+                operandType: "Set Flight Parameter",
                 hasOperand: [true, true],
                 output: "none"
             },
             22: {
-                name: "OVERRIDE ARMING SAFETY",
+                name: "Override Arming Safety",
+                operandType: "Set Flight Parameter",
                 hasOperand: [false, false],
                 output: "boolean"
             },
             23: {
-                name: "OVERRIDE THROTTLE SCALE",
+                name: "Override Throttle Scale",
+                operandType: "Set Flight Parameter",
                 hasOperand: [true, false],
                 output: "boolean"
             },
             29: {
-                name: "OVERRIDE THROTTLE",
+                name: "Override Throttle",
+                operandType: "Set Flight Parameter",
                 hasOperand: [true, false],
                 output: "boolean"
             },
             24: {
-                name: "SWAP ROLL & YAW",
+                name: "Swap Roll & Yaw",
+                operandType: "Set Flight Parameter",
                 hasOperand: [false, false],
                 output: "boolean"
             },
             25: {
-                name: "SET VTX POWER LEVEL",
+                name: "Set VTx Power Level",
+                operandType: "Set Flight Parameter",
                 hasOperand: [true, false],
                 output: "boolean"
             },
             30: {
-                name: "SET VTX BAND",
+                name: "Set VTx Band",
+                operandType: "Set Flight Parameter",
                 hasOperand: [true, false],
                 output: "boolean"
             },
             31: {
-                name: "SET VTX CHANNEL",
+                name: "Set VTx Channel",
+                operandType: "Set Flight Parameter",
                 hasOperand: [true, false],
                 output: "boolean"
             },
             26: {
-                name: "INVERT ROLL",
+                name: "Invert Roll",
+                operandType: "Set Flight Parameter",
                 hasOperand: [false, false],
                 output: "boolean"
             },
             27: {
-                name: "INVERT PITCH",
+                name: "Invert Pitch",
+                operandType: "Set Flight Parameter",
                 hasOperand: [false, false],
                 output: "boolean"
             },
             28: {
-                name: "INVERT YAW",
+                name: "Invert Yaw",
+                operandType: "Set Flight Parameter",
                 hasOperand: [false, false],
                 output: "boolean"
             },
             32: {
-                name: "SET OSD LAYOUT",
+                name: "Set OSD Layout",
+                operandType: "Set Flight Parameter",
                 hasOperand: [true, false],
                 output: "boolean"
             },
             33: {
-                name: "SIN",
+                name: "Trigonometry: Sine",
+                operandType: "Maths",
                 hasOperand: [true, true],
                 output: "raw"
             },
             34: {
-                name: "COS",
+                name: "Trigonometry: Cosine",
+                operandType: "Maths",
                 hasOperand: [true, true],
                 output: "raw"
             },
             35: {
-                name: "TAN",
+                name: "Trigonometry: Tangent",
+                operandType: "Maths",
                 hasOperand: [true, true],
                 output: "raw"
             },
             36: {
-                name: "MAP INPUT",
+                name: "Map Input",
+                operandType: "Maths",
                 hasOperand: [true, true],
                 output: "raw"
             },
             37: {
-                name: "MAP OUTPUT",
+                name: "Map Output",
+                operandType: "Maths",
                 hasOperand: [true, true],
                 output: "raw"
             },
             38: {
-                name: "RC CHANNEL OVERRIDE",
+                name: "Override RC Channel",
+                operandType: "Set Flight Parameter",
                 hasOperand: [true, true],
                 output: "boolean"
             },
 
             41: {
-                name: "LOITER RADIUS OVERRIDE",
+                name: "Override Loiter Radius",
+                operandType: "Set Flight Parameter",
                 hasOperand: [true, false],
                 output: "boolean"
             },
             42: {
-                name: "SET PROFILE",
+                name: "Set Profile",
+                operandType: "Set Flight Parameter",
                 hasOperand: [true, false],
                 output: "boolean"
             },
+            43: {
+                name: "Use Lowest Value",
+                operandType: "Comparison",
+                hasOperand: [true, true],
+                output: "raw"
+            },
+            44: {
+                name: "Use Highest Value",
+                operandType: "Comparison",
+                hasOperand: [true, true],
+                output: "raw"
+            },
         }
     },
     getOperandTypes: function () {
@@ -1314,6 +1368,7 @@ var FC = {
                     34: "GPS Valid Fix",
                     35: "Loiter Radius [cm]",
                     36: "Active Profile",
+                    37: "Battery cells",
                 }
             },
             3: {
diff --git a/js/logicCondition.js b/js/logicCondition.js
index 1db77def..e5a5de3e 100644
--- a/js/logicCondition.js
+++ b/js/logicCondition.js
@@ -256,16 +256,55 @@ let LogicCondition = function (enabled, activatorId, operation, operandAType, op
         $row.find('.logic_cell__operation').html("<select class='logic_element__operation' ></select>");
         let $t = $row.find('.logic_element__operation');
         
-        for (let k in FC.getLogicOperators()) {
-            if (FC.getLogicOperators().hasOwnProperty(k)) {
-                let o = FC.getLogicOperators()[k];
-                if (self.getOperation() == parseInt(k, 10)) {
-                    $t.append('<option value="' + k + '" selected>' + o.name + '</option>');
-                } else {
-                    $t.append('<option value="' + k + '">' + o.name + '</option>');
-                }
+        let lcOperators = [];
+
+        for (let lcID in FC.getLogicOperators()) {
+            if (FC.getLogicOperators().hasOwnProperty(lcID)) {
+                let op = FC.getLogicOperators()[lcID];
+                lcOperators[parseInt(lcID, 10)] = {
+                    id: parseInt(lcID, 10),
+                    name: op.name,
+                    operandType: op.operandType,
+                    hasOperand: op.hasOperand,
+                    output: op.output
+                };
             }
         }
+
+        lcOperators.sort((a, b) => {
+            let lcAT = a.operandType.toLowerCase(),
+                lcBT = b.operandType.toLowerCase(), 
+                lcAN = a.name.toLowerCase(),
+                lcBN = b.name.toLowerCase();
+            
+            if (lcAT == lcBT) {
+                return (lcAN < lcBN) ? -1 : (lcAN > lcBN) ? 1 : 0;
+            } else  {
+                return (lcAT < lcBT) ? -1 : 1;
+            }
+        });
+
+        let section = "";
+
+        lcOperators.forEach( val => {
+            if (section != val.operandType) {
+                if (section != "") {
+                    $t.append('</optgroup>');
+                }
+
+                section = val.operandType;
+                $t.append('<optgroup label="** ' + val.operandType + ' **">');
+            }
+
+            if (self.getOperation() == val.id) {
+                $t.append('<option value="' + val.id + '" selected>' + val.name + '</option>');
+            } else {
+                $t.append('<option value="' + val.id + '">' + val.name + '</option>');
+            }
+        });
+
+        $t.append('</optgroup>');
+
         $t.change(self.onOperatorChange);
 
         self.renderOperand(0);
diff --git a/js/model.js b/js/model.js
index 330bd8fd..273de731 100644
--- a/js/model.js
+++ b/js/model.js
@@ -2,10 +2,12 @@
 
 const SERVO_GIMBAL_PITCH = 0,
     SERVO_GIMBAL_ROLL = 1,
-    SERVO_ELEVATOR = 2,
-    SERVO_FLAPPERON_1 = 3,
-    SERVO_FLAPPERON_2 = 4,
-    SERVO_RUDDER = 5,
+    SERVO_ELEVATOR = 1,
+    SERVO_ELEVON_1 = 1,
+    SERVO_ELEVON_2 = 2,
+    SERVO_FLAPPERON_1 = 2,
+    SERVO_FLAPPERON_2 = 3,
+    SERVO_RUDDER = 4,
     SERVO_BICOPTER_LEFT = 4,
     SERVO_BICOPTER_RIGHT = 5,
     SERVO_DUALCOPTER_LEFT = 4,
@@ -162,10 +164,10 @@ const mixerList = [
             new MotorMixRule(1.0, 0.0, 0.0, 0.0),
         ],
         servoMixer: [
-            new ServoMixRule(SERVO_FLAPPERON_1, INPUT_STABILIZED_ROLL,  50, 0),
-            new ServoMixRule(SERVO_FLAPPERON_1, INPUT_STABILIZED_PITCH, 50, 0),
-            new ServoMixRule(SERVO_FLAPPERON_2, INPUT_STABILIZED_ROLL, -50, 0),
-            new ServoMixRule(SERVO_FLAPPERON_2, INPUT_STABILIZED_PITCH, 50, 0),
+            new ServoMixRule(SERVO_ELEVON_1, INPUT_STABILIZED_ROLL,  50, 0),
+            new ServoMixRule(SERVO_ELEVON_1, INPUT_STABILIZED_PITCH, 50, 0),
+            new ServoMixRule(SERVO_ELEVON_2, INPUT_STABILIZED_ROLL, -50, 0),
+            new ServoMixRule(SERVO_ELEVON_2, INPUT_STABILIZED_PITCH, 50, 0),
         ]
     },     // 8
     {
@@ -181,10 +183,10 @@ const mixerList = [
             new MotorMixRule(1.0, 0.0, 0.0, -0.1)
         ],
         servoMixer: [
-            new ServoMixRule(SERVO_FLAPPERON_1, INPUT_STABILIZED_ROLL,  50, 0),
-            new ServoMixRule(SERVO_FLAPPERON_1, INPUT_STABILIZED_PITCH, 50, 0),
-            new ServoMixRule(SERVO_FLAPPERON_2, INPUT_STABILIZED_ROLL, -50, 0),
-            new ServoMixRule(SERVO_FLAPPERON_2, INPUT_STABILIZED_PITCH, 50, 0),
+            new ServoMixRule(SERVO_ELEVON_1, INPUT_STABILIZED_ROLL,  50, 0),
+            new ServoMixRule(SERVO_ELEVON_1, INPUT_STABILIZED_PITCH, 50, 0),
+            new ServoMixRule(SERVO_ELEVON_2, INPUT_STABILIZED_ROLL, -50, 0),
+            new ServoMixRule(SERVO_ELEVON_2, INPUT_STABILIZED_PITCH, 50, 0),
         ]
     },     // 27
     {
@@ -289,6 +291,7 @@ const mixerList = [
         enabled: true,
         legacy: true,
         platform: PLATFORM_AIRPLANE,
+        hasFlaps: true,
         motorMixer: [
             new MotorMixRule(1.0, 0.0, 0.0, 0.0),
             new MotorMixRule(1.0, 0.0, 0.0, 0.0),
@@ -296,9 +299,9 @@ const mixerList = [
         servoMixer: [
             new ServoMixRule(SERVO_ELEVATOR,    INPUT_STABILIZED_PITCH, 100, 0),
             new ServoMixRule(SERVO_FLAPPERON_1, INPUT_STABILIZED_ROLL,  100, 0),
-            new ServoMixRule(SERVO_FLAPPERON_1, INPUT_FEATURE_FLAPS,    100, 0),
+            /*new ServoMixRule(SERVO_FLAPPERON_1, INPUT_FEATURE_FLAPS,    100, 0),*/
             new ServoMixRule(SERVO_FLAPPERON_2, INPUT_STABILIZED_ROLL,  100, 0),
-            new ServoMixRule(SERVO_FLAPPERON_2, INPUT_FEATURE_FLAPS,   -100, 0),
+            /*new ServoMixRule(SERVO_FLAPPERON_2, INPUT_FEATURE_FLAPS,   -100, 0),*/
             new ServoMixRule(SERVO_RUDDER,      INPUT_STABILIZED_YAW,   100, 0),
         ]
     },           // 14
@@ -448,6 +451,7 @@ const mixerList = [
         enabled: true,
         legacy: false,
         platform: PLATFORM_AIRPLANE,
+        hasFlaps: true,
         motorMixer: [
             new MotorMixRule(1.0, 0.0, 0.0, 0.3),
             new MotorMixRule(1.0, 0.0, 0.0, -0.3)
@@ -455,9 +459,9 @@ const mixerList = [
         servoMixer: [
             new ServoMixRule(SERVO_ELEVATOR,    INPUT_STABILIZED_PITCH, 100, 0),
             new ServoMixRule(SERVO_FLAPPERON_1, INPUT_STABILIZED_ROLL,  100, 0),
-            new ServoMixRule(SERVO_FLAPPERON_1, INPUT_FEATURE_FLAPS,    100, 0),
+            /*new ServoMixRule(SERVO_FLAPPERON_1, INPUT_FEATURE_FLAPS,    100, 0),*/
             new ServoMixRule(SERVO_FLAPPERON_2, INPUT_STABILIZED_ROLL,  100, 0),
-            new ServoMixRule(SERVO_FLAPPERON_2, INPUT_FEATURE_FLAPS,   -100, 0),
+            /*new ServoMixRule(SERVO_FLAPPERON_2, INPUT_FEATURE_FLAPS,   -100, 0),*/
             new ServoMixRule(SERVO_RUDDER,      INPUT_STABILIZED_YAW,   100, 0),
         ]
     },
@@ -469,16 +473,19 @@ const mixerList = [
         enabled: true,
         legacy: false,
         platform: PLATFORM_AIRPLANE,
+        hasFlaps: true,
         motorMixer: [
             new MotorMixRule(1.0, 0.0, 0.0, 0.0),
         ],
         servoMixer: [
+            new ServoMixRule(1, INPUT_STABILIZED_ROLL,  100, 0),
+            /*new ServoMixRule(1, INPUT_FEATURE_FLAPS,    100, 0),*/
             new ServoMixRule(2, INPUT_STABILIZED_ROLL,  100, 0),
-            new ServoMixRule(3, INPUT_STABILIZED_ROLL,  100, 0),
-            new ServoMixRule(4, INPUT_STABILIZED_PITCH, 50, 0),
-            new ServoMixRule(4, INPUT_STABILIZED_YAW,   -50, 0),
-            new ServoMixRule(5, INPUT_STABILIZED_PITCH, -50, 0),
-            new ServoMixRule(5, INPUT_STABILIZED_YAW,   -50, 0)
+            /*new ServoMixRule(2, INPUT_FEATURE_FLAPS,    100, 0),*/
+            new ServoMixRule(3, INPUT_STABILIZED_PITCH, 50, 0),
+            new ServoMixRule(3, INPUT_STABILIZED_YAW,   -50, 0),
+            new ServoMixRule(4, INPUT_STABILIZED_PITCH, -50, 0),
+            new ServoMixRule(4, INPUT_STABILIZED_YAW,   -50, 0)
         ]
     },
     {
@@ -493,11 +500,11 @@ const mixerList = [
             new MotorMixRule(1.0, 0.0, 0.0, 0.0),
         ],
         servoMixer: [
-            new ServoMixRule(2, INPUT_STABILIZED_ROLL,  100, 0),
-            new ServoMixRule(3, INPUT_STABILIZED_PITCH, 50, 0),
+            new ServoMixRule(1, INPUT_STABILIZED_ROLL,  100, 0),
+            new ServoMixRule(2, INPUT_STABILIZED_PITCH, 50, 0),
+            new ServoMixRule(2, INPUT_STABILIZED_YAW,   -50, 0),
+            new ServoMixRule(3, INPUT_STABILIZED_PITCH, -50, 0),
             new ServoMixRule(3, INPUT_STABILIZED_YAW,   -50, 0),
-            new ServoMixRule(4, INPUT_STABILIZED_PITCH, -50, 0),
-            new ServoMixRule(4, INPUT_STABILIZED_YAW,   -50, 0),
         ]
     },
     {
@@ -508,13 +515,16 @@ const mixerList = [
         enabled: true,
         legacy: false,
         platform: PLATFORM_AIRPLANE,
+        hasFlaps: true,
         motorMixer: [
             new MotorMixRule(1.0, 0.0, 0.0, 0.0),
         ],
         servoMixer: [
             new ServoMixRule(SERVO_ELEVATOR,    INPUT_STABILIZED_PITCH, 100, 0),
             new ServoMixRule(SERVO_FLAPPERON_1, INPUT_STABILIZED_ROLL,  100, 0),
+            /*new ServoMixRule(SERVO_FLAPPERON_1, INPUT_FEATURE_FLAPS,    100, 0),*/
             new ServoMixRule(SERVO_FLAPPERON_2, INPUT_STABILIZED_ROLL,  100, 0),
+            /*new ServoMixRule(SERVO_FLAPPERON_2, INPUT_FEATURE_FLAPS,    100, 0),*/
         ]
     },
     {
diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js
index 00e4000e..c1a11975 100644
--- a/js/msp/MSPHelper.js
+++ b/js/msp/MSPHelper.js
@@ -44,6 +44,7 @@ var mspHelper = (function (gui) {
         'DJI_FPV': 21,
         'SMARTPORT_MASTER': 23,
         'IMU2': 24,
+        'HDZERO_VTX': 25,
     };
 
     // Required for MSP_DEBUGMSG because console.log() doesn't allow omitting
@@ -447,7 +448,7 @@ var mspHelper = (function (gui) {
                 }
                 break;
             case MSPCodes.MSP_WP:
-                MISSION_PLANER.put(new Waypoint(
+                MISSION_PLANNER.put(new Waypoint(
                     data.getUint8(0),
                     data.getUint8(1),
                     data.getInt32(2, true),
@@ -1422,9 +1423,9 @@ var mspHelper = (function (gui) {
                 break;
             case MSPCodes.MSP_WP_GETINFO:
                 // Reserved for waypoint capabilities data.getUint8(0);
-                MISSION_PLANER.setMaxWaypoints(data.getUint8(1));
-                MISSION_PLANER.setValidMission(data.getUint8(2));
-                MISSION_PLANER.setCountBusyPoints(data.getUint8(3));
+                MISSION_PLANNER.setMaxWaypoints(data.getUint8(1));
+                MISSION_PLANNER.setValidMission(data.getUint8(2));
+                MISSION_PLANNER.setCountBusyPoints(data.getUint8(3));
                 break;
             case MSPCodes.MSP_SET_WP:
                 console.log('Point saved');
@@ -2988,14 +2989,14 @@ var mspHelper = (function (gui) {
     };
 
     self.loadWaypoints = function (callback) {
-        MISSION_PLANER.reinit();
+        MISSION_PLANNER.reinit();
         let waypointId = 0;
         let startTime = new Date().getTime();
         MSP.send_message(MSPCodes.MSP_WP_GETINFO, false, false, loadWaypoint);
 
         function loadWaypoint() {
             waypointId++;
-            if (waypointId < MISSION_PLANER.getCountBusyPoints()) {
+            if (waypointId < MISSION_PLANNER.getCountBusyPoints()) {
                 MSP.send_message(MSPCodes.MSP_WP, [waypointId], false, loadWaypoint);
             } else {
                 GUI.log('Receive time: ' + (new Date().getTime() - startTime) + 'ms');
@@ -3011,11 +3012,11 @@ var mspHelper = (function (gui) {
 
         function sendWaypoint() {
             waypointId++;
-            if (waypointId < MISSION_PLANER.get().length) {
-                MSP.send_message(MSPCodes.MSP_SET_WP, MISSION_PLANER.extractBuffer(waypointId), false, sendWaypoint);
+            if (waypointId < MISSION_PLANNER.get().length) {
+                MSP.send_message(MSPCodes.MSP_SET_WP, MISSION_PLANNER.extractBuffer(waypointId), false, sendWaypoint);
             }
             else {
-                MSP.send_message(MSPCodes.MSP_SET_WP, MISSION_PLANER.extractBuffer(waypointId), false, endMission);
+                MSP.send_message(MSPCodes.MSP_SET_WP, MISSION_PLANNER.extractBuffer(waypointId), false, endMission);
             }
         };
 
diff --git a/js/settings.js b/js/settings.js
index 41250caf..76049865 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -72,6 +72,14 @@ var Settings = (function () {
                     var multiplier = parseFloat(input.data('setting-multiplier') || 1);
                     input.attr('type', 'number');
                     input.val((s.value / multiplier).toFixed(Math.log10(multiplier)));
+
+                    if (typeof s.setting.min !== 'undefined' && s.setting.min !== null) {
+                        input.attr('min', (s.setting.min / multiplier).toFixed(Math.log10(multiplier)));
+                    }
+
+                    if (typeof s.setting.max !== 'undefined' && s.setting.max !== null) {
+                        input.attr('max', (s.setting.max / multiplier).toFixed(Math.log10(multiplier)));
+                    }
                 }
 
                 // If data is defined, We want to convert this value into 
diff --git a/src/css/tabs/mission_planer.css b/src/css/tabs/mission_planer.css
index 344dcf84..563b0d89 100644
--- a/src/css/tabs/mission_planer.css
+++ b/src/css/tabs/mission_planer.css
@@ -203,7 +203,7 @@
     height: 100%;
 }
 
-/* #missionPlanerElevation {
+/* #missionPlannerElevation {
     height: 40%;
 } */
 
diff --git a/src/css/tabs/mixer.css b/src/css/tabs/mixer.css
index 3d99dba0..08e01e7b 100644
--- a/src/css/tabs/mixer.css
+++ b/src/css/tabs/mixer.css
@@ -84,6 +84,12 @@
 }
 
 .mixer_btn_add {
+    float: right;
+    margin: 15px 0 10px;
+}
+
+.mixer_btn_logic {
+    float: left;
     margin: 15px 0 10px;
 }
 
diff --git a/src/css/tabs/osd.css b/src/css/tabs/osd.css
index 18d98c82..225b4fb2 100644
--- a/src/css/tabs/osd.css
+++ b/src/css/tabs/osd.css
@@ -415,8 +415,42 @@ button {
     border-bottom: 0;
 }
 
+.tab-osd .third_left {
+	float: left;
+	width: calc(50% - 197px);
+}
+
+.tab-osd .third_right {
+    float: right;
+	width: calc(50% - 197px);
+}
+
 .tab-osd .preview {
     width: 360px;
+    left: calc(50% - 197px);
+}
+
+.tab-osd .preview_hd {
+    width: 600px !important;
+    left: calc(50% - 317px) !important;
+}
+
+.tab-osd .hd_43_left {
+	border-left: 1px solid red;
+	position: absolute;
+	left: 60px;
+	height: calc(100% - 27px);
+}
+
+.tab-osd .hd_43_right {
+	border-right: 1px solid red;
+	position: absolute;
+	right: 60px;
+	height: calc(100% - 27px);
+}
+
+.tab-osd .preview_hd_side {
+	width: calc(50% - 317px) !important;
 }
 
 .tab-osd .preview {
diff --git a/tabs/auxiliary.js b/tabs/auxiliary.js
index 6ccc45cf..593912f2 100644
--- a/tabs/auxiliary.js
+++ b/tabs/auxiliary.js
@@ -36,32 +36,19 @@ TABS.auxiliary.initialize = function (callback) {
 
     MSP.send_message(MSPCodes.MSP_BOXNAMES, false, false, get_mode_ranges);
 
+    // This object separates out the dividers. This is also used to order the modes
     const modeSections = {};
-        modeSections["ARM"] = "Arming";
-        modeSections["ANGLE"] = "Flight Modes";
-        modeSections["NAV RTH"] = "Navigation Modes";
-        modeSections["NAV ALTHOLD"] = "Flight Mode Modifiers";
-        modeSections["AUTO TUNE"] = "Fixed Wing";
-        modeSections["FPV ANGLE MIX"] = "Multi-rotor";
-        modeSections["OSD OFF"] = "OSD Modes";
-        modeSections["CAMSTAB"] = "FPV Camera Modes";
-        modeSections["BEEPER"] = "Misc Modes";
+        modeSections["Arming"] = ["ARM", "PREARM"];
+        modeSections["Flight Modes"] = ["ANGLE", "HORIZON", "MANUAL"];
+        modeSections["Navigation Modes"] = ["NAV COURSE HOLD", "NAV CRUISE", "NAV POSHOLD", "NAV RTH", "NAV WP", "GCS NAV"];
+        modeSections["Flight Mode Modifiers"] = ["NAV ALTHOLD", "HEADING HOLD", "AIR MODE", "SOARING", "SURFACE"];
+        modeSections["Fixed Wing"] = ["AUTO TUNE", "SERVO AUTOTRIM", "AUTO LEVEL", "NAV LAUNCH", "LOITER CHANGE", "FLAPERON", "TURN ASSIST"];
+        modeSections["Multi-rotor"] = ["FPV ANGLE MIX", "TURTLE", "MC BRAKING", "HEADFREE", "HEADADJ"];
+        modeSections["OSD Modes"] = ["OSD OFF", "OSD ALT 1", "OSD ALT 2", "OSD ALT 3"];
+        modeSections["FPV Camera Modes"] = ["CAMSTAB", "CAMERA CONTROL 1", "CAMERA CONTROL 2", "CAMERA CONTROL 3"];
+        modeSections["Misc Modes"] = ["BEEPER", "LEDS OFF", "LIGHTS", "HOME RESET", "WP PLANNER", "BLACKBOX", "FAILSAFE", "KILLSWITCH", "TELEMETRY", "MSP RC OVERRIDE", "USER1", "USER2"];
 
     function sort_modes_for_display() {
-        // This array defines the order that the modes are displayed in the configurator modes page
-        const configuratorBoxOrder = [
-            "ARM", "PREARM",                                                                                        // Arming
-            "ANGLE", "HORIZON", "MANUAL",                                                                           // Flight modes
-            "NAV RTH", "NAV COURSE HOLD", "NAV CRUISE", "NAV POSHOLD", "NAV WP", "GCS NAV",                         // Navigation modes
-            "NAV ALTHOLD", "HEADING HOLD", "AIR MODE", "SOARING", "SURFACE",                                        // Flight mode modifiers
-            "AUTO TUNE", "SERVO AUTOTRIM", "AUTO LEVEL", "NAV LAUNCH", "LOITER CHANGE", "FLAPERON", "TURN ASSIST",  // Fixed wing specific
-            "FPV ANGLE MIX", "TURTLE", "MC BRAKING", "HEADFREE", "HEADADJ",                                         // Multi-rotor specific
-            "OSD OFF", "OSD ALT 1", "OSD ALT 2", "OSD ALT 3",                                                       // OSD
-            "CAMSTAB", "CAMERA CONTROL 1", "CAMERA CONTROL 2", "CAMERA CONTROL 3",                                  // FPV Camera
-            "BEEPER", "LEDS OFF", "LIGHTS", "HOME RESET", "WP PLANNER", "BLACKBOX", "FAILSAFE", "KILLSWITCH",       // Misc
-                "TELEMETRY", "MSP RC OVERRIDE", "USER1", "USER2"
-        ];
-
         // Sort the modes
         var tmpAUX_CONFIG = [];
         var tmpAUX_CONFIG_IDS =[];
@@ -76,19 +63,22 @@ TABS.auxiliary.initialize = function (callback) {
         AUX_CONFIG = [];
         AUX_CONFIG_IDS = [];
 
-        for (i=0; i<configuratorBoxOrder.length; i++) {
-            for(j=0; j<tmpAUX_CONFIG.length; j++) {
-                if (configuratorBoxOrder[i] === tmpAUX_CONFIG[j]) {
-                    AUX_CONFIG[sortedID] = tmpAUX_CONFIG[j];
-                    AUX_CONFIG_IDS[sortedID] = tmpAUX_CONFIG_IDS[j];
-                    ORIG_AUX_CONFIG_IDS[sortedID++] = j;
-
-                    break;
+        for (let categoryModesIndex in modeSections) {
+            let categoryModes = modeSections[categoryModesIndex];
+            for (cM=0; cM<categoryModes.length; cM++){
+                for(j=0; j<tmpAUX_CONFIG.length; j++) {
+                    if (categoryModes[cM] === tmpAUX_CONFIG[j]) {
+                        AUX_CONFIG[sortedID] = tmpAUX_CONFIG[j];
+                        AUX_CONFIG_IDS[sortedID] = tmpAUX_CONFIG_IDS[j];
+                        ORIG_AUX_CONFIG_IDS[sortedID++] = j;
+    
+                        break;
+                    }
                 }
             }
         }
 
-        // There are modes that are missing from the configuratorBoxOrder array. Add them to the end until they are ordered correctly.
+        // There are modes that are missing from the modeSections object. Add them to the end until they are ordered correctly.
         if (tmpAUX_CONFIG.length > AUX_CONFIG.length) {
             for (i=0; i<tmpAUX_CONFIG.length; i++) {
                 found = false;
@@ -214,11 +204,23 @@ TABS.auxiliary.initialize = function (callback) {
 
         configureRangeTemplate(auxChannelCount);
 
-        var modeTableBodyElement = $('.tab-auxiliary .modes tbody')
+        var modeTableBodyElement = $('.tab-auxiliary .modes tbody');
+        let modeSelectionID = "";
+        let modeSelectionRange = "";
+
         for (var modeIndex = 0; modeIndex < AUX_CONFIG.length; modeIndex++) {
 
-            if (AUX_CONFIG[modeIndex] in modeSections) {
-                var newSection = createModeSection(modeSections[AUX_CONFIG[modeIndex]]);
+            // Get current mode category
+            for (modeSelectionRange in modeSections) {
+                if (modeSections[modeSelectionRange].indexOf(AUX_CONFIG[modeIndex]) != -1) {
+                    break;
+                }
+            }
+
+            // Create divider if needed
+            if (modeSelectionRange != modeSelectionID) {
+                modeSelectionID = modeSelectionRange;
+                var newSection = createModeSection(modeSelectionRange);
                 modeTableBodyElement.append(newSection);
             }
 
diff --git a/tabs/mission_control.html b/tabs/mission_control.html
index 690aa5f6..aeda5ef1 100644
--- a/tabs/mission_control.html
+++ b/tabs/mission_control.html
@@ -1,11 +1,11 @@
 <div class="tab-mission-control">
     <div style="padding-top: 20px;padding-left: 20px; padding-right: 20px;position: relative;">
-        <div class="tab_title" data-i18n="tabMissionControl">Mission planer</div>
+        <div class="tab_title" data-i18n="tabMissionControl">Mission planner</div>
     </div>
     <div class="content_wrapper">
         <div class="cf_column fourth" id="missionControls">
             <div class="spacer_right">
-                <div id="missionPlanerAction" class="gui_box grey">
+                <div id="missionPlannerAction" class="gui_box grey">
                     <div class="gui_box_titlebar">
                         <div class="spacer_box_title i18n-replaced" data-i18n="missionActionMenuHead">Action Menu</div>
                         <div class="btnMenu btnMenuIcon show_btn"  id="showHideActionButton">
@@ -38,7 +38,7 @@
                     </div>
                 </div>
 
-                <div id="missionPlanerTotalInfo" class="gui_box grey">
+                <div id="missionPlannerTotalInfo" class="gui_box grey">
                     <div class="gui_box_titlebar">
                         <div class="spacer_box_title i18n-replaced" data-i18n="missionTotalInformationHead">Total information</div>
                         <div class="btnMenu btnMenuIcon show_btn"  id="showHideInfoButton">
@@ -65,7 +65,7 @@
                     </div>
                 </div>
 
-                <div id="missionPlanerSettings" class="gui_box grey" style="display: none">
+                <div id="missionPlannerSettings" class="gui_box grey" style="display: none">
                     <div class="gui_box_titlebar">
                         <div class="spacer_box_title i18n-replaced" data-i18n="missionDefaultSettingsHead">Default settings</div>
                         <div class="btnMenu btnMenuIcon  save_btn">
@@ -129,7 +129,7 @@
                     </div>
                 </div>
 
-                <div id="missionPlanerHome" class="gui_box grey" style="display: none">
+                <div id="missionPlannerHome" class="gui_box grey" style="display: none">
                     <div class="gui_box_titlebar">
                         <div class="spacer_box_title i18n-replaced" data-i18n="missionHomeHead">Take Off home</div>
                         <div class="btnMenu btnMenuIcon  save_btn">
@@ -170,7 +170,7 @@
                     </div>
                 </div>
 
-                <div id="missionPlanerSafehome" class="gui_box grey" style="display: none">
+                <div id="missionPlannerSafehome" class="gui_box grey" style="display: none">
                     <div class="gui_box_titlebar">
                         <div class="spacer_box_title i18n-replaced" data-i18n="missionSafehomeHead">Safe Home manager</div>
                         <div class="btnMenu btnMenuIcon  save_btn">
@@ -331,7 +331,7 @@
         </div>
         <div class="cf_column threefourth_left" style="height: 100%;">
             <div id="missionMap"></div>
-            <div id="missionPlanerElevation" class="gui_box grey" style="display: none">
+            <div id="missionPlannerElevation" class="gui_box grey" style="display: none">
                     <div class="gui_box_titlebar">
                         <div class="spacer_box_title i18n-replaced" data-i18n="missionDefaultElevationHead">Elevation Profile</div>
                         <div class="btnMenu btnMenuIcon  save_btn">
diff --git a/tabs/mission_control.js b/tabs/mission_control.js
index 8beec403..59cb1823 100644
--- a/tabs/mission_control.js
+++ b/tabs/mission_control.js
@@ -301,9 +301,9 @@ TABS.mission_control.initialize = function (callback) {
               //update RTH every 5th GPS update since it really shouldn't change
               if(rthUpdateInterval >= 5)
               {
-                MISSION_PLANER.bufferPoint.number = -1; //needed to get point 0 which id RTH
+                MISSION_PLANNER.bufferPoint.number = -1; //needed to get point 0 which id RTH
                 MSP.send_message(MSPCodes.MSP_WP, mspHelper.crunch(MSPCodes.MSP_WP), false, function rth_update() {
-                    var coord = ol.proj.fromLonLat([MISSION_PLANER.bufferPoint.lon, MISSION_PLANER.bufferPoint.lat]);
+                    var coord = ol.proj.fromLonLat([MISSION_PLANNER.bufferPoint.lon, MISSION_PLANNER.bufferPoint.lat]);
                     rthGeo.setCoordinates(coord);
                   });
                 rthUpdateInterval = 0;
@@ -433,16 +433,16 @@ TABS.mission_control.initialize = function (callback) {
     //
     /////////////////////////////////////////////
     function loadSettings() {
-        chrome.storage.local.get('missionPlanerSettings', function (result) {
-            if (result.missionPlanerSettings) {
-                settings = result.missionPlanerSettings;
+        chrome.storage.local.get('missionPlannerSettings', function (result) {
+            if (result.missionPlannerSettings) {
+                settings = result.missionPlannerSettings;
             }
             refreshSettings();
         });
     }
 
     function saveSettings() {
-        chrome.storage.local.set({'missionPlanerSettings': settings});
+        chrome.storage.local.set({'missionPlannerSettings': settings});
     }
 
     function refreshSettings() {
@@ -452,7 +452,7 @@ TABS.mission_control.initialize = function (callback) {
     }
 
     function closeSettingsPanel() {
-        $('#missionPlanerSettings').hide();
+        $('#missionPlannerSettings').hide();
     }
 
     /////////////////////////////////////////////
@@ -461,7 +461,7 @@ TABS.mission_control.initialize = function (callback) {
     //
     /////////////////////////////////////////////
     function closeSafehomePanel() {
-        $('#missionPlanerSafehome').hide();
+        $('#missionPlannerSafehome').hide();
         cleanSafehomeLayers();
     }
 
@@ -636,8 +636,8 @@ TABS.mission_control.initialize = function (callback) {
     //
     /////////////////////////////////////////////
     function closeHomePanel() {
-        $('#missionPlanerHome').hide();
-        $('#missionPlanerElevation').hide();
+        $('#missionPlannerHome').hide();
+        $('#missionPlannerElevation').hide();
         cleanHomeLayers();
     }
 
@@ -784,14 +784,14 @@ TABS.mission_control.initialize = function (callback) {
                     totalmultimissionWPs = multimission.get().length + mission.get().length;
                     $("#updateMultimissionButton").removeClass('disabled');
                     $("#setActiveMissionButton").removeClass('disabled');
-                    $('#missionPlanerElevation').show();
+                    $('#missionPlannerElevation').show();
                 } else {
                     $('#missionDistance').text('N/A');
                     totalmultimissionWPs = mission.get().length;
                     $("#editMission").show();
                     $("#updateMultimissionButton").addClass('disabled');
                     $("#setActiveMissionButton").addClass('disabled');
-                    $('#missionPlanerElevation').hide();
+                    $('#missionPlannerElevation').hide();
                     setMultimissionEditControl(true);
                 }
                 $('#multimissionInfo').text(multimissionCount + ' missions (' + totalmultimissionWPs + '/' + mission.getMaxWaypoints() + ' WPs)');
@@ -1443,7 +1443,7 @@ TABS.mission_control.initialize = function (callback) {
             button.style = 'background: url(\'../images/CF_settings_white.svg\') no-repeat 1px -1px;background-color: rgba(0,60,136,.5);';
 
             var handleShowSettings = function () {
-                $('#missionPlanerSettings').fadeIn(300);
+                $('#missionPlannerSettings').fadeIn(300);
             };
 
             button.addEventListener('click', handleShowSettings, false);
@@ -1476,7 +1476,7 @@ TABS.mission_control.initialize = function (callback) {
             button.style = 'background: url(\'../images/icons/cf_icon_safehome_white.svg\') no-repeat 1px -1px;background-color: rgba(0,60,136,.5);';
 
             var handleShowSafehome = function () {
-                $('#missionPlanerSafehome').fadeIn(300);
+                $('#missionPlannerSafehome').fadeIn(300);
                 //SAFEHOMES.flush();
                 //mspHelper.loadSafehomes();
                 cleanSafehomeLayers();
@@ -1514,11 +1514,11 @@ TABS.mission_control.initialize = function (callback) {
             button.style = 'background: url(\'../images/icons/cf_icon_elevation_white.svg\') no-repeat 1px -1px;background-color: rgba(0,60,136,.5);';
 
             var handleShowSettings = function () {
-                $('#missionPlanerHome').fadeIn(300);
+                $('#missionPlannerHome').fadeIn(300);
                 cleanHomeLayers();
                 renderHomeTable();
                 renderHomeOnMap();
-                $('#missionPlanerElevation').fadeIn(300);
+                $('#missionPlannerElevation').fadeIn(300);
                 plotElevation();
             };
 
@@ -1775,7 +1775,7 @@ TABS.mission_control.initialize = function (callback) {
         // save map view settings when user moves it
         //////////////////////////////////////////////////////////////////////////
         map.on('moveend', function (evt) {
-            chrome.storage.local.set({'missionPlanerLastValues': {
+            chrome.storage.local.set({'missionPlannerLastValues': {
                 center: ol.proj.toLonLat(map.getView().getCenter()),
                 zoom: map.getView().getZoom()
             }});
@@ -1783,10 +1783,10 @@ TABS.mission_control.initialize = function (callback) {
         //////////////////////////////////////////////////////////////////////////
         // load map view settings on startup
         //////////////////////////////////////////////////////////////////////////
-        chrome.storage.local.get('missionPlanerLastValues', function (result) {
-            if (result.missionPlanerLastValues && result.missionPlanerLastValues.center) {
-                map.getView().setCenter(ol.proj.fromLonLat(result.missionPlanerLastValues.center));
-                map.getView().setZoom(result.missionPlanerLastValues.zoom);
+        chrome.storage.local.get('missionPlannerLastValues', function (result) {
+            if (result.missionPlannerLastValues && result.missionPlannerLastValues.center) {
+                map.getView().setCenter(ol.proj.fromLonLat(result.missionPlannerLastValues.center));
+                map.getView().setZoom(result.missionPlannerLastValues.zoom);
             }
         });
 
@@ -2642,7 +2642,7 @@ TABS.mission_control.initialize = function (callback) {
     /////////////////////////////////////////////
     //
     // Load/Save FC mission Toolbox
-    // mission = configurator store, WP number indexed from 0, MISSION_PLANER = FC NVM store, WP number indexed from 1
+    // mission = configurator store, WP number indexed from 0, MISSION_PLANNER = FC NVM store, WP number indexed from 1
     /////////////////////////////////////////////
     function getWaypointsFromFC(loadEeprom) {
         if (loadEeprom) {
@@ -2660,12 +2660,12 @@ TABS.mission_control.initialize = function (callback) {
                 } else {
                     $('#loadMissionButton').removeClass('disabled');
                 }
-                if (!MISSION_PLANER.getCountBusyPoints()) {
+                if (!MISSION_PLANNER.getCountBusyPoints()) {
                     alert(chrome.i18n.getMessage('no_waypoints_to_load'));
                     return;
                 }
                 mission.reinit();
-                mission.copy(MISSION_PLANER);
+                mission.copy(MISSION_PLANNER);
                 mission.update(false, true);
 
                 /* check multimissions */
@@ -2691,9 +2691,9 @@ TABS.mission_control.initialize = function (callback) {
     }
 
     function sendWaypointsToFC(saveEeprom) {
-        MISSION_PLANER.reinit();
-        MISSION_PLANER.copy(mission);
-        MISSION_PLANER.update(false, true, true);
+        MISSION_PLANNER.reinit();
+        MISSION_PLANNER.copy(mission);
+        MISSION_PLANNER.update(false, true, true);
         mspHelper.saveWaypoints(function() {
             GUI.log('End send point');
             if (saveEeprom) {
@@ -2703,13 +2703,13 @@ TABS.mission_control.initialize = function (callback) {
             } else {
                 $('#saveMissionButton').removeClass('disabled');
             }
-            mission.setMaxWaypoints(MISSION_PLANER.getMaxWaypoints());
-            mission.setValidMission(MISSION_PLANER.getValidMission());
-            mission.setCountBusyPoints(MISSION_PLANER.getCountBusyPoints());
+            mission.setMaxWaypoints(MISSION_PLANNER.getMaxWaypoints());
+            mission.setValidMission(MISSION_PLANNER.getValidMission());
+            mission.setCountBusyPoints(MISSION_PLANNER.getCountBusyPoints());
             multimission.setMaxWaypoints(mission.getMaxWaypoints());
             updateTotalInfo();
             mission.reinit();
-            mission.copy(MISSION_PLANER);
+            mission.copy(MISSION_PLANNER);
             mission.update(false, true);
             refreshLayers();
             $('#MPeditPoint').fadeOut(300);
@@ -2783,7 +2783,7 @@ TABS.mission_control.initialize = function (callback) {
     }
 
     function plotElevation() {
-        if ($('#missionPlanerElevation').is(":visible") && !disableMarkerEdit) {
+        if ($('#missionPlannerElevation').is(":visible") && !disableMarkerEdit) {
             if (mission.isEmpty()) {
                 var data = [[0], [0]];
                 var layout = {showlegend: true,
diff --git a/tabs/mixer.html b/tabs/mixer.html
index 844a4923..777a6f01 100644
--- a/tabs/mixer.html
+++ b/tabs/mixer.html
@@ -15,12 +15,6 @@
                                 <span data-i18n="platformType"></span>
                             </label>
                         </div>
-                        <div id="has-flaps-wrapper" class="checkbox">
-                            <input type="checkbox" id="has-flaps" class="toggle" />
-                            <label for="has-flaps">
-                                <span data-i18n="platformHasFlaps"></span>
-                            </label>
-                        </div>
                     </div>
                 </div>
             </div>
@@ -118,12 +112,12 @@
 
                     </tbody>
                 </table>
-                <div class="btn default_btn narrow pull-left mixer_btn_add">
-                    <a href="#" data-role="role-logic-conditions-open" data-i18n="tabLogicConditions"></a>
-                </div>
                 <div class="btn default_btn narrow pull-right green mixer_btn_add">
                     <a href="#" data-role="role-servo-add" data-i18n="servoMixerAdd"></a>
                 </div>
+                <div class="btn default_btn narrow pull-left mixer_btn_logic">
+                    <a href="#" data-role="role-logic-conditions-open" data-i18n="tabLogicConditions"></a>
+                </div>
             </div>
         </div>
 
diff --git a/tabs/mixer.js b/tabs/mixer.js
index 00822794..b1e727e2 100644
--- a/tabs/mixer.js
+++ b/tabs/mixer.js
@@ -124,6 +124,10 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
 
                 GUI.fillSelect($row.find(".mix-rule-input"), FC.getServoMixInputNames(), servoRule.getInput());
 
+                if (!MIXER_CONFIG.hasFlaps) {
+                    $row.find(".mix-rule-input").children('option[value="14"]').remove();
+                }
+
                 $row.find(".mix-rule-input").val(servoRule.getInput()).change(function () {
                     servoRule.setInput($(this).val());
                     updateFixedValueVisibility($row, $(this));
@@ -272,8 +276,6 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
 
         let $platformSelect = $('#platform-type'),
             platforms = helper.platform.getList(),
-            $hasFlapsWrapper = $('#has-flaps-wrapper'),
-            $hasFlaps = $('#has-flaps'),
             $mixerPreset = $('#mixer-preset'),
             $wizardButton = $("#mixer-wizard");
 
@@ -354,30 +356,12 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
             }
         }
 
-        $hasFlaps.prop("checked", MIXER_CONFIG.hasFlaps);
-        $hasFlaps.change(function () {
-            if ($(this).is(":checked")) {
-                MIXER_CONFIG.hasFlaps = 1;
-            } else {
-                MIXER_CONFIG.hasFlaps = 0;
-            }
-        });
-        $hasFlaps.change();
-
         $platformSelect.change(function () {
             MIXER_CONFIG.platformType = parseInt($platformSelect.val(), 10);
             currentPlatform = helper.platform.getById(MIXER_CONFIG.platformType);
 
             var $platformSelectParent = $platformSelect.parent('.select');
 
-            if (currentPlatform.flapsPossible) {
-                $hasFlapsWrapper.removeClass('is-hidden');
-                $platformSelectParent.removeClass('no-bottom-border');
-            } else {
-                $hasFlapsWrapper.addClass('is-hidden');
-                $platformSelectParent.addClass('no-bottom-border');
-            }
-
             fillMixerPreset();
             $mixerPreset.change();
         });
@@ -430,6 +414,7 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
         $('#load-mixer-button').click(function () {
             helper.mixer.loadServoRules(currentMixerPreset);
             helper.mixer.loadMotorRules(currentMixerPreset);
+            MIXER_CONFIG.hasFlaps = (currentMixerPreset.hasFlaps === true) ? true : false;
             renderServoMixRules();
             renderMotorMixRules();
             renderOutputMapping();
diff --git a/tabs/osd.html b/tabs/osd.html
index 832bdc1a..e739e1d7 100644
--- a/tabs/osd.html
+++ b/tabs/osd.html
@@ -25,251 +25,251 @@
                     </div>
                 </div>
             </div>
-            <div class="cf_column twothird">
-                <div class="gui_box grey preview" style="float: left; position: fixed;">
-                    <div class="gui_box_titlebar image">
-                        <div class="spacer_box_title" data-i18n="osd_preview_title"></div>
-                    </div>
-                    <div class="display-layout">
-                        <div class="col right">
-                            <div class="preview">
-                            </div>
+            <div class="gui_box preview" style="float: left; position: fixed;">
+                <div class="gui_box_titlebar">
+                    <div class="spacer_box_title" data-i18n="osd_preview_title"></div>
+                </div>
+                <div class="display-layout">
+                    <div class="col right">
+	                    <div class="left_43_margin"></div>
+    	                <div class="right_43_margin"></div>
+                        <div class="preview">
                         </div>
                     </div>
                 </div>
-                <div class="cf_column third_right" style="width: calc(100% - 377px);">
-                    <div class="gui_box grey">
-                        <div class="gui_box_titlebar">
-                            <div class="spacer_box_title" data-i18n="osd_video_format"></div>
-                        </div>
-                        <div class="spacer_box">
-                            <div class="video-types"></div>
-                        </div>
+            </div>
+            <div class="cf_column third_right">
+                <div class="gui_box grey">
+                    <div class="gui_box_titlebar">
+                        <div class="spacer_box_title" data-i18n="osd_video_format"></div>
                     </div>
-                    <div class="gui_box grey settings-container">
-                        <div class="gui_box_titlebar">
-                            <div class="spacer_box_title" data-i18n="settings"></div>
-                        </div>
-                        <div class="spacer_box">
-                            <div class="settings">
-                                <label class="units">
-                                    <select id="unit_mode" name="unit_mode"></select>
-                                    <span data-i18n="osd_units"></span>
-                                    <div class="helpicon cf_tip" style="margin-top: 2px"></div>
-                                </label>
-                                <label>
-                                    <select class="update_preview" data-setting="osd_main_voltage_decimals" data-live="true"></select>
-                                    <span data-i18n="osd_main_voltage_decimals"></span>
-                                </label>
-                                <label>
-                                    <select class="update_preview" data-setting="osd_coordinate_digits" data-live="true"></select>
-                                    <span data-i18n="osd_coordinate_digits"></span>
-                                </label>
-                                <div class="helpicon cf_tip" data-i18n_title="osdSettingPLUS_CODE_DIGITS_HELP"></div>
-                                <label>
-                                    <select class="update_preview" data-setting="osd_plus_code_digits" data-live="true"></select>
-                                    <span data-i18n="osd_plus_code_digits"></span>
-                                </label>
-                                <div class="helpicon cf_tip" data-i18n_title="osdSettingPLUS_CODE_SHORT_HELP"></div>
-                                <label>
-                                    <select class="update_preview" data-setting="osd_plus_code_short" data-live="true"></select>
-                                    <span data-i18n="osd_plus_code_short"></span> 
-                                </label>
-                                <div class="helpicon cf_tip" data-i18n_title="osd_esc_rpm_precision_help"></div>
-                                <label>
-                                    <select class="update_preview" data-setting="osd_esc_rpm_precision" data-live="true"></select>
-                                    <span data-i18n="osd_esc_rpm_precision"></span> 
-                                </label>
-                                <label>
-                                    <select class="update_preview" data-setting="osd_crosshairs_style" data-live="true"></select>
-                                    <span data-i18n="osd_crosshairs_style"></span>
-                                </label>
-                                <label>
-                                    <select class="update_preview" data-setting="osd_left_sidebar_scroll" data-live="true"></select>
-                                    <span data-i18n="osd_left_sidebar_scroll"></span>
-                                </label>
-                                <label>
-                                    <select class="update_preview" data-setting="osd_right_sidebar_scroll" data-live="true"></select>
-                                    <span data-i18n="osd_right_sidebar_scroll"></span>
-                                </label>
-                                <div class="helpicon cf_tip" data-i18n_title="osdSettingCRSF_LQ_FORMAT_HELP"></div>
-                                <label>
-                                    <select class="update_preview" data-setting="osd_crsf_lq_format" data-live="true"></select>
-                                    <span data-i18n="osd_crsf_lq_format"></span>
-                                </label>
-                                <label>
-                                    <input type="checkbox" class="toggle update_preview" data-setting="osd_sidebar_scroll_arrows" data-live="true">
-                                    <span data-i18n="osd_sidebar_scroll_arrows"></span>
-                                </label>
-                                <label>
-                                    <input type="checkbox" class="toggle update_preview" data-setting="osd_home_position_arm_screen" data-live="true">
-                                    <span data-i18n="osd_home_position_arm_screen"></span>
-                                </label>
-                            </div>
-                        </div>
+                    <div class="spacer_box">
+                        <div class="video-types"></div>
                     </div>
-                    <div class="gui_box grey alarms-container">
-                        <div class="gui_box_titlebar">
-                            <div class="spacer_box_title" data-i18n="osd_alarms"></div>
-                        </div>
-                        <div class="spacer_box settings">
-                            <label for="rssi_alarm">
-                                <input id="osd_rssi_alarm" data-setting="osd_rssi_alarm" data-setting-multiplier="1" type="number" data-step="1" />
-                                <span data-i18n="osd_rssi_alarm"></span>
-                            </label>
-                            <label for="time_alarm">
-                                <input id="osd_time_alarm" data-setting="osd_time_alarm" data-setting-multiplier="1" type="number" data-step="1" />
-                                <span data-i18n="osd_time_alarm"></span>
-                            </label>
-                            <label for="osd_alt_alarm">
-                                <input id="osd_alt_alarm" data-setting="osd_alt_alarm" data-setting-multiplier="1" type="number" data-step="1" />
-                                <span data-i18n="osd_alt_alarm"></span>
-                            </label>
-                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmMAX_NEG_ALTITUDE_HELP"></div>
-                            <label for="osd_neg_alt_alarm">
-                                <input id="osd_neg_alt_alarm" data-setting="osd_neg_alt_alarm" data-setting-multiplier="1" type="number" data-step="1" />
-                                <span data-i18n="osd_neg_alt_alarm"></span>
-                            </label>
-                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmDIST_HELP"></div>
-                            <label for="osd_dist_alarm">
-                                <input id="osd_dist_alarm" data-setting="osd_dist_alarm" data-setting-multiplier="1" type="number" data-step="1" />
-                                <span data-i18n="osd_dist_alarm"></span>
-                            </label>
-                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_HELP"></div>
-                            <label for="osd_gforce_alarm">
-                                <input id="osd_gforce_alarm" data-setting="osd_gforce_alarm" data-setting-multiplier="1" type="number" data-step="0.1" />
-                                <span data-i18n="osd_gforce_alarm"></span>
-                            </label>
-                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_AXIS_MIN_HELP"></div>
-                            <label for="osd_gforce_axis_alarm_min">
-                                <input id="osd_gforce_axis_alarm_min" data-setting="osd_gforce_axis_alarm_min" data-setting-multiplier="1" type="number" data-step="0.1" />
-                                <span data-i18n="osd_gforce_axis_alarm_min"></span>
-                            </label>
-                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_AXIS_MAX_HELP"></div>
-                            <label for="osd_gforce_axis_alarm_max">
-                                <input id="osd_gforce_axis_alarm_max" data-setting="osd_gforce_axis_alarm_max" data-setting-multiplier="1" type="number" data-step="0.1" />
-                                <span data-i18n="osd_gforce_axis_alarm_max"></span>
-                            </label>
-                            <div class="helpicon cf_tip" data-i18n_title="osdAlarmCURRENT_HELP"></div>
-                            <label for="osd_current_alarm">
-                                <input id="osd_current_alarm" data-setting="osd_current_alarm" data-setting-multiplier="1" type="number" data-step="1" />
-                                <span data-i18n="osd_current_alarm"></span>
-                            </label>
-                            <label for="imu_temp_alarm_min">
-                                <input id="imu_temp_alarm_min" data-setting="osd_imu_temp_alarm_min" data-setting-multiplier="10" type="number" data-step="0.5" />
-                                <span data-i18n="osd_imu_temp_alarm_min"></span>
-                            </label>
-                            <label for="imu_temp_alarm_max">
-                                <input id="imu_temp_alarm_max" data-setting="osd_imu_temp_alarm_max" data-setting-multiplier="10" type="number" data-step="0.5" />
-                                <span data-i18n="osd_imu_temp_alarm_max"></span>
-                            </label>
-                            <label for="baro_temp_alarm_min">
-                                <input id="baro_temp_alarm_min" data-setting="osd_baro_temp_alarm_min" data-setting-multiplier="10" type="number" data-step="0.5" />
-                                <span data-i18n="osd_baro_temp_alarm_min"></span>
-                            </label>
-                            <label for="baro_temp_alarm_max">
-                                <input id="baro_temp_alarm_max" data-setting="osd_baro_temp_alarm_max" data-setting-multiplier="10" type="number" data-step="0.5" />
-                                <span data-i18n="osd_baro_temp_alarm_max"></span>
-                            </label>
-                            <label for="esc_temp_alarm_min">
-                                <input id="esc_temp_alarm_min" data-setting="osd_esc_temp_alarm_min" data-setting-multiplier="10" type="number" data-step="0.5" />
-                                <span data-i18n="osd_esc_temp_alarm_min"></span>
-                            </label>
-                            <label for="esc_temp_alarm_max">
-                                <input id="esc_temp_alarm_max" data-setting="osd_esc_temp_alarm_max" data-setting-multiplier="10" type="number" data-step="0.5" />
-                                <span data-i18n="osd_esc_temp_alarm_max"></span>
-                            </label>
-                            <div class="helpicon cf_tip" data-i18n_title="osdalarmLQ_HELP"></div>
-                            <label for="link_quality_alarm">
-                                <input id="link_quality_alarm" data-setting="osd_link_quality_alarm" data-setting-multiplier="1" type="number" data-step="1" />
-                                <span data-i18n="osd_link_quality_alarm"></span>
-                            </label>
-                            <div class="helpicon cf_tip" data-i18n_title="osd_rssi_dbm_alarm_HELP"></div>
-                            <label for="rssi_dbm_alarm">
-                                <input id="rssi_dbm_alarm" data-setting="osd_rssi_dbm_alarm" data-setting-multiplier="1" type="number" data-step="1" />
-                                <span data-i18n="osd_rssi_dbm_alarm"></span>
-                            </label>
-                            <div class="helpicon cf_tip" data-i18n_title="osdalarmSNR_HELP"></div>
-                            <label for="snr_alarm">
-                                <input id="snr_alarm" data-setting="osd_snr_alarm" data-setting-multiplier="1" type="number" data-step="1" />
-                                <span data-i18n="osd_snr_alarm"></span>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="gui_box grey dji-hd-container"> 
-                        <div class="gui_box_titlebar">
-                            <div class="spacer_box_title" data-i18n="osd_dji_HD_FPV"></div>
-                        </div>
-                        <div class="spacer_box settings">
-                            <label id="djiUnsupportedElements">
-                               <span data-i18n="osd_dji_hide_unsupported"></span>
-                            </label>
-                            <label>
-                                <select id="djiEscTempSource" data-setting="dji_esc_temp_source" data-live="true"></select>
-                                <span data-i18n="osd_dji_ESC_temp"></span>
-                            </label>
-                            <label>
-                                <select id="djiRssiSource" data-setting="dji_rssi_source" data-live="true"></select>
-                                <span data-i18n="osd_dji_RSSI_source"></span>
-                            </label>
-                            <label>
-                                <select data-setting="osd_speed_source" data-live="true"></select>
-                                <span data-i18n="osd_dji_GPS_source"></span>
-                            </label>
-                            <label>
-                                <select data-setting="dji_message_speed_source" data-live="true"></select> 
-                                <span data-i18n="osd_dji_speed_source"></span>
-                            </label>
-                            <div class="djiCraftNameElements">
-                                <input type="checkbox" id="useCraftnameForMessages" data-setting="dji_use_name_for_messages" data-live="true" class="toggle"/>
-                                <span data-i18n="osd_dji_use_craft_name_elements"></span> 
-
-                            </div>
-                            <label>
-                                <input type="checkbox" id="djiAdjustments" data-setting="dji_use_adjustments" data-live="true" class="toggle"></select>
-                                <span data-i18n="osd_dji_adjustments"></span>
-                            </label>
-                            <label for="cn_alternating_duration">
-                                <input id="cn_alternating_duration" data-setting="dji_cn_alternating_duration" data-setting-multiplier="1" type="number" data-step="1"></input>
-                                <span data-i18n="osd_dji_cn_alternating_duration"></span>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="gui_box grey switch-indicator-container"> 
-                        <div class="gui_box_titlebar">
-                            <div class="spacer_box_title" data-i18n="osd_switch_indicator_settings"></div>
-                        </div>
-                        <div class="spacer_box settings">
-                            <label>
-                                <input type="checkbox" id="switchIndicators_alignLeft" data-setting="osd_switch_indicators_align_left" data-live="true" class="toggle"></select>
-                                <span data-i18n="osd_switch_indicators_align_left"></span>
-                            </label>
-                            <label>
-                                <input type="text" class="osdSwitchIndName" id="osdSwitchInd0_name" data-setting="osd_switch_indicator_zero_name" />
-                                <select class="osdSwitchInd_channel" data-setting="osd_switch_indicator_zero_channnel" data-live="true"></select>
-                                <span data-i18n="osdSwitchInd0"></span>
-                            </label>
-
-                            <label>
-                                <input type="text" class="osdSwitchIndName" id="osdSwitchInd1_name" data-setting="osd_switch_indicator_one_name" />
-                                <select class="osdSwitchInd_channel" data-setting="osd_switch_indicator_one_channnel" data-live="true"></select>
-                                <span data-i18n="osdSwitchInd1"></span>
-                            </label>
-
-                            <label>
-                                <input type="text" class="osdSwitchIndName" id="osdSwitchInd2_name" data-setting="osd_switch_indicator_two_name" />
-                                <select class="osdSwitchInd_channel" data-setting="osd_switch_indicator_two_channnel" data-live="true"></select>
-                                <span data-i18n="osdSwitchInd2"></span>
-                            </label>
-
-                            <label>
-                                <input type="text" class="osdSwitchIndName" id="osdSwitchInd3_name" data-setting="osd_switch_indicator_three_name" />
-                                <select class="osdSwitchInd_channel" data-setting="osd_switch_indicator_three_channnel" data-live="true"></select>
-                                <span data-i18n="osdSwitchInd3"></span>
-                            </label>
-                        </div>
-                    </div> 
                 </div>
+                <div class="gui_box grey settings-container">
+                    <div class="gui_box_titlebar">
+                        <div class="spacer_box_title" data-i18n="settings"></div>
+                    </div>
+                    <div class="spacer_box">
+                        <div class="settings">
+                            <label class="units">
+                                <select id="unit_mode" name="unit_mode"></select>
+                                <span data-i18n="osd_units"></span>
+                                <div class="helpicon cf_tip" style="margin-top: 2px"></div>
+                            </label>
+                            <label>
+                                <select class="update_preview" data-setting="osd_main_voltage_decimals" data-live="true"></select>
+                                <span data-i18n="osd_main_voltage_decimals"></span>
+                            </label>
+                            <label>
+                                <select class="update_preview" data-setting="osd_coordinate_digits" data-live="true"></select>
+                                <span data-i18n="osd_coordinate_digits"></span>
+                            </label>
+                            <div class="helpicon cf_tip" data-i18n_title="osdSettingPLUS_CODE_DIGITS_HELP"></div>
+                            <label>
+                                <select class="update_preview" data-setting="osd_plus_code_digits" data-live="true"></select>
+                                <span data-i18n="osd_plus_code_digits"></span>
+                            </label>
+                            <div class="helpicon cf_tip" data-i18n_title="osdSettingPLUS_CODE_SHORT_HELP"></div>
+                            <label>
+                                <select class="update_preview" data-setting="osd_plus_code_short" data-live="true"></select>
+                                <span data-i18n="osd_plus_code_short"></span> 
+                            </label>
+                            <div class="helpicon cf_tip" data-i18n_title="osd_esc_rpm_precision_help"></div>
+                            <label>
+                                <select class="update_preview" data-setting="osd_esc_rpm_precision" data-live="true"></select>
+                                <span data-i18n="osd_esc_rpm_precision"></span> 
+                            </label>
+                            <label>
+                                <select class="update_preview" data-setting="osd_crosshairs_style" data-live="true"></select>
+                                <span data-i18n="osd_crosshairs_style"></span>
+                            </label>
+                            <label>
+                                <select class="update_preview" data-setting="osd_left_sidebar_scroll" data-live="true"></select>
+                                <span data-i18n="osd_left_sidebar_scroll"></span>
+                            </label>
+                            <label>
+                                <select class="update_preview" data-setting="osd_right_sidebar_scroll" data-live="true"></select>
+                                <span data-i18n="osd_right_sidebar_scroll"></span>
+                            </label>
+                            <div class="helpicon cf_tip" data-i18n_title="osdSettingCRSF_LQ_FORMAT_HELP"></div>
+                            <label>
+                                <select class="update_preview" data-setting="osd_crsf_lq_format" data-live="true"></select>
+                                <span data-i18n="osd_crsf_lq_format"></span>
+                            </label>
+                            <label>
+                                <input type="checkbox" class="toggle update_preview" data-setting="osd_sidebar_scroll_arrows" data-live="true">
+                                <span data-i18n="osd_sidebar_scroll_arrows"></span>
+                            </label>
+                            <label>
+                                <input type="checkbox" class="toggle update_preview" data-setting="osd_home_position_arm_screen" data-live="true">
+                                <span data-i18n="osd_home_position_arm_screen"></span>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+                <div class="gui_box grey alarms-container">
+                    <div class="gui_box_titlebar">
+                        <div class="spacer_box_title" data-i18n="osd_alarms"></div>
+                    </div>
+                    <div class="spacer_box settings">
+                        <label for="rssi_alarm">
+                            <input id="osd_rssi_alarm" data-setting="osd_rssi_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                            <span data-i18n="osd_rssi_alarm"></span>
+                        </label>
+                        <label for="time_alarm">
+                            <input id="osd_time_alarm" data-setting="osd_time_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                            <span data-i18n="osd_time_alarm"></span>
+                        </label>
+                        <label for="osd_alt_alarm">
+                            <input id="osd_alt_alarm" data-setting="osd_alt_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                            <span data-i18n="osd_alt_alarm"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="osdAlarmMAX_NEG_ALTITUDE_HELP"></div>
+                        <label for="osd_neg_alt_alarm">
+                            <input id="osd_neg_alt_alarm" data-setting="osd_neg_alt_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                            <span data-i18n="osd_neg_alt_alarm"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="osdAlarmDIST_HELP"></div>
+                        <label for="osd_dist_alarm">
+                            <input id="osd_dist_alarm" data-setting="osd_dist_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                            <span data-i18n="osd_dist_alarm"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_HELP"></div>
+                        <label for="osd_gforce_alarm">
+                            <input id="osd_gforce_alarm" data-setting="osd_gforce_alarm" data-setting-multiplier="1" type="number" data-step="0.1" />
+                            <span data-i18n="osd_gforce_alarm"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_AXIS_MIN_HELP"></div>
+                        <label for="osd_gforce_axis_alarm_min">
+                            <input id="osd_gforce_axis_alarm_min" data-setting="osd_gforce_axis_alarm_min" data-setting-multiplier="1" type="number" data-step="0.1" />
+                            <span data-i18n="osd_gforce_axis_alarm_min"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_AXIS_MAX_HELP"></div>
+                        <label for="osd_gforce_axis_alarm_max">
+                            <input id="osd_gforce_axis_alarm_max" data-setting="osd_gforce_axis_alarm_max" data-setting-multiplier="1" type="number" data-step="0.1" />
+                            <span data-i18n="osd_gforce_axis_alarm_max"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="osdAlarmCURRENT_HELP"></div>
+                        <label for="osd_current_alarm">
+                            <input id="osd_current_alarm" data-setting="osd_current_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                            <span data-i18n="osd_current_alarm"></span>
+                        </label>
+                        <label for="imu_temp_alarm_min">
+                            <input id="imu_temp_alarm_min" data-setting="osd_imu_temp_alarm_min" data-setting-multiplier="10" type="number" data-step="0.5" />
+                            <span data-i18n="osd_imu_temp_alarm_min"></span>
+                        </label>
+                        <label for="imu_temp_alarm_max">
+                            <input id="imu_temp_alarm_max" data-setting="osd_imu_temp_alarm_max" data-setting-multiplier="10" type="number" data-step="0.5" />
+                            <span data-i18n="osd_imu_temp_alarm_max"></span>
+                        </label>
+                        <label for="baro_temp_alarm_min">
+                            <input id="baro_temp_alarm_min" data-setting="osd_baro_temp_alarm_min" data-setting-multiplier="10" type="number" data-step="0.5" />
+                            <span data-i18n="osd_baro_temp_alarm_min"></span>
+                        </label>
+                        <label for="baro_temp_alarm_max">
+                            <input id="baro_temp_alarm_max" data-setting="osd_baro_temp_alarm_max" data-setting-multiplier="10" type="number" data-step="0.5" />
+                            <span data-i18n="osd_baro_temp_alarm_max"></span>
+                        </label>
+                        <label for="esc_temp_alarm_min">
+                            <input id="esc_temp_alarm_min" data-setting="osd_esc_temp_alarm_min" data-setting-multiplier="10" type="number" data-step="0.5" />
+                            <span data-i18n="osd_esc_temp_alarm_min"></span>
+                        </label>
+                        <label for="esc_temp_alarm_max">
+                            <input id="esc_temp_alarm_max" data-setting="osd_esc_temp_alarm_max" data-setting-multiplier="10" type="number" data-step="0.5" />
+                            <span data-i18n="osd_esc_temp_alarm_max"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="osdalarmLQ_HELP"></div>
+                        <label for="link_quality_alarm">
+                            <input id="link_quality_alarm" data-setting="osd_link_quality_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                            <span data-i18n="osd_link_quality_alarm"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="osd_rssi_dbm_alarm_HELP"></div>
+                        <label for="rssi_dbm_alarm">
+                            <input id="rssi_dbm_alarm" data-setting="osd_rssi_dbm_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                            <span data-i18n="osd_rssi_dbm_alarm"></span>
+                        </label>
+                        <div class="helpicon cf_tip" data-i18n_title="osdalarmSNR_HELP"></div>
+                        <label for="snr_alarm">
+                            <input id="snr_alarm" data-setting="osd_snr_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                            <span data-i18n="osd_snr_alarm"></span>
+                        </label>
+                    </div>
+                </div>
+                <div class="gui_box grey dji-hd-container"> 
+                    <div class="gui_box_titlebar">
+                        <div class="spacer_box_title" data-i18n="osd_dji_HD_FPV"></div>
+                    </div>
+                    <div class="spacer_box settings">
+                        <label id="djiUnsupportedElements">
+                           <span data-i18n="osd_dji_hide_unsupported"></span>
+                        </label>
+                        <label>
+                            <select id="djiEscTempSource" data-setting="dji_esc_temp_source" data-live="true"></select>
+                            <span data-i18n="osd_dji_ESC_temp"></span>
+                        </label>
+                        <label>
+                            <select id="djiRssiSource" data-setting="dji_rssi_source" data-live="true"></select>
+                            <span data-i18n="osd_dji_RSSI_source"></span>
+                        </label>
+                        <label>
+                            <select data-setting="osd_speed_source" data-live="true"></select>
+                            <span data-i18n="osd_dji_GPS_source"></span>
+                        </label>
+                        <label>
+                            <select data-setting="dji_message_speed_source" data-live="true"></select> 
+                            <span data-i18n="osd_dji_speed_source"></span>
+                        </label>
+                        <div class="djiCraftNameElements">
+                            <input type="checkbox" id="useCraftnameForMessages" data-setting="dji_use_name_for_messages" data-live="true" class="toggle"/>
+                            <span data-i18n="osd_dji_use_craft_name_elements"></span> 
+
+                        </div>
+                        <label>
+                            <input type="checkbox" id="djiAdjustments" data-setting="dji_use_adjustments" data-live="true" class="toggle"></select>
+                            <span data-i18n="osd_dji_adjustments"></span>
+                        </label>
+                        <label for="cn_alternating_duration">
+                            <input id="cn_alternating_duration" data-setting="dji_cn_alternating_duration" data-setting-multiplier="1" type="number" data-step="1"></input>
+                            <span data-i18n="osd_dji_cn_alternating_duration"></span>
+                        </label>
+                    </div>
+                </div>
+                <div class="gui_box grey switch-indicator-container"> 
+                    <div class="gui_box_titlebar">
+                        <div class="spacer_box_title" data-i18n="osd_switch_indicator_settings"></div>
+                    </div>
+                    <div class="spacer_box settings">
+                        <label>
+                            <input type="checkbox" id="switchIndicators_alignLeft" data-setting="osd_switch_indicators_align_left" data-live="true" class="toggle"></select>
+                            <span data-i18n="osd_switch_indicators_align_left"></span>
+                        </label>
+                        <label>
+                            <input type="text" class="osdSwitchIndName" id="osdSwitchInd0_name" data-setting="osd_switch_indicator_zero_name" />
+                            <select class="osdSwitchInd_channel" data-setting="osd_switch_indicator_zero_channnel" data-live="true"></select>
+                            <span data-i18n="osdSwitchInd0"></span>
+                        </label>
+
+                        <label>
+                            <input type="text" class="osdSwitchIndName" id="osdSwitchInd1_name" data-setting="osd_switch_indicator_one_name" />
+                            <select class="osdSwitchInd_channel" data-setting="osd_switch_indicator_one_channnel" data-live="true"></select>
+                            <span data-i18n="osdSwitchInd1"></span>
+                        </label>
+
+                        <label>
+                            <input type="text" class="osdSwitchIndName" id="osdSwitchInd2_name" data-setting="osd_switch_indicator_two_name" />
+                            <select class="osdSwitchInd_channel" data-setting="osd_switch_indicator_two_channnel" data-live="true"></select>
+                            <span data-i18n="osdSwitchInd2"></span>
+                        </label>
+
+                        <label>
+                            <input type="text" class="osdSwitchIndName" id="osdSwitchInd3_name" data-setting="osd_switch_indicator_three_name" />
+                            <select class="osdSwitchInd_channel" data-setting="osd_switch_indicator_three_channnel" data-live="true"></select>
+                            <span data-i18n="osdSwitchInd3"></span>
+                        </label>
+                    </div>
+                </div> 
             </div>
             <div id="fontmanagercontent" style="display:none; width:712px;">
                 <div class="font-picker" style="margin-bottom: 10px;">
@@ -297,9 +297,7 @@
                 </div>
             </div>
             <div class="clear-both"></div>
-
         </div>
-
     </div>
     <div class="content_toolbar supported hide">
         <div class="btn">
diff --git a/tabs/osd.js b/tabs/osd.js
index b17b165b..cca0a567 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -455,7 +455,6 @@ OSD.initData = function () {
         item_count: 0,
         items: [],
         groups: {},
-        display_items: [],
         preview: [],
         isDjiHdFpv: false
     };
@@ -513,19 +512,27 @@ OSD.DjiElements =  {
 };
 
 OSD.constants = {
-    VISIBLE: 0x0800,
+    VISIBLE: 0x2000,
     VIDEO_TYPES: [
         'AUTO',
         'PAL',
-        'NTSC'
+        'NTSC',
+        'HD'
     ],
     VIDEO_LINES: {
         PAL: 16,
-        NTSC: 13
+        NTSC: 13,
+        HD: 18
+    },
+    VIDEO_COLS: {
+        PAL: 30,
+        NTSC: 30,
+        HD: 50
     },
     VIDEO_BUFFER_CHARS: {
         PAL: 480,
-        NTSC: 390
+        NTSC: 390,
+        HD: 900
     },
     UNIT_TYPES: [
         {name: 'osdUnitImperial', value: 0},
@@ -2033,14 +2040,39 @@ OSD.updateDisplaySize = function () {
     if (video_type == 'AUTO') {
         video_type = 'PAL';
     }
-    // compute the size
+
+	// save the original OSD element positions.
+	var origPos = [];
+    for (var ii = 0; ii < OSD.data.items.length; ii++) {
+        origPos.push(OSD.msp.helpers.pack.position(OSD.data.items[ii]));
+    }
+
+	// save the new video type and cols per line
+    FONT.constants.SIZES.LINE = OSD.constants.VIDEO_COLS[video_type];
+    OSD.constants.VIDEO_TYPES[OSD.data.video_system] = video_type;
+
+    // set the new display size
     OSD.data.display_size = {
         x: FONT.constants.SIZES.LINE,
         y: OSD.constants.VIDEO_LINES[video_type],
-        total: null
+        total: OSD.constants.VIDEO_BUFFER_CHARS[video_type]
     };
 
-    OSD.constants.VIDEO_TYPES[OSD.data.video_system] = video_type;
+	// recalculate the OSD element positions for the new cols per line
+    for (var ii = 0; ii < OSD.data.items.length; ii++) {
+		var item = OSD.msp.helpers.unpack.position(origPos[ii]);
+		// do not recalculate anything not visible or outside of the screen
+		if (item.isVisible && item.x < OSD.data.display_size.x && item.y < OSD.data.display_size.y) {
+			OSD.data.items[ii] = item;
+		}
+	}
+	
+	// set the preview size
+    $('.third_left').toggleClass('preview_hd_side', (video_type == 'HD'))
+    $('.preview').toggleClass('preview_hd cut43_left', (video_type == 'HD'))
+    $('.third_right').toggleClass('preview_hd_side', (video_type == 'HD'))
+    $('.left_43_margin').toggleClass('hd_43_left', (video_type == 'HD'))
+    $('.right_43_margin').toggleClass('hd_43_right', (video_type == 'HD'))
 };
 
 OSD.saveAlarms = function(callback) {
@@ -2064,27 +2096,36 @@ OSD.saveItem = function(item, callback) {
 //noinspection JSUnusedLocalSymbols
 OSD.msp = {
     /**
-     * Note, unsigned 16 bit int for position ispacked:
+     * Unsigned 16 bit int for position is packed:
      * 0: unused
      * v: visible flag
      * b: blink flag
      * y: y coordinate
      * x: x coordinate
-     * 0000 vbyy yyyx xxxx
+     * 00vb yyyy yyxx xxxx
      */
     helpers: {
         unpack: {
             position: function (bits) {
                 var display_item = {};
-                // size * y + x
-                display_item.position = FONT.constants.SIZES.LINE * ((bits >> 5) & 0x001F) + (bits & 0x001F);
+                display_item.x = bits & 0x3F;
+				display_item.y = (bits >> 6) & 0x3F;
+                display_item.position = (display_item.y) * FONT.constants.SIZES.LINE + (display_item.x);
                 display_item.isVisible = (bits & OSD.constants.VISIBLE) != 0;
                 return display_item;
             }
         },
+        calculate: {
+        	coords: function(display_item) {
+        		display_item.x = (display_item.position % FONT.constants.SIZES.LINE) & 0x3F;
+        		display_item.y = (display_item.position / FONT.constants.SIZES.LINE) & 0x3F;
+        		return display_item;
+        	}
+        },
         pack: {
             position: function (display_item) {
-                return (display_item.isVisible ? 0x0800 : 0) | (((display_item.position / FONT.constants.SIZES.LINE) & 0x001F) << 5) | (display_item.position % FONT.constants.SIZES.LINE);
+                return (display_item.isVisible ? 0x2000 : 0)
+                	| ((display_item.y & 0x3F) << 6) | (display_item.x & 0x3F);
             }
         }
     },
@@ -2469,8 +2510,8 @@ OSD.GUI.updateFields = function() {
                             // Ensure the element is inside the viewport, at least partially.
                             // In that case move it to the very first row/col, otherwise there's
                             // no way to reposition items that are outside the viewport.
-                            if (itemData.position >= OSD.data.preview.length) {
-                                itemData.position = 0;
+                            if (itemData.x > OSD.data.display_size.x || itemData.y > OSD.data.display_size.y) {
+                                itemData.x = itemData.y = itemData.position = 0;
                             }
                             $position.show();
                         } else {
@@ -2491,6 +2532,7 @@ OSD.GUI.updateFields = function() {
                             var item = $(this).data('item');
                             var itemData = OSD.data.items[item.id];
                             itemData.position = parseInt($(this).val());
+                            OSD.msp.helpers.calculate.coords(itemData);
                             OSD.GUI.saveItem(item);
                         }))
                 );
@@ -2610,14 +2652,6 @@ OSD.GUI.updateMapPreview = function(mapCenter, name, directionSymbol, centerSymb
 OSD.GUI.updatePreviews = function() {
     // buffer the preview;
     OSD.data.preview = [];
-    OSD.data.display_size.total = OSD.data.display_size.x * OSD.data.display_size.y;
-    for (var ii = 0; ii < OSD.data.display_items.length; ii++) {
-        var field = OSD.data.display_items[ii];
-        // reset fields that somehow end up off the screen
-        if (field.position > OSD.data.display_size.total) {
-            field.position = 0;
-        }
-    }
 
     // clear the buffer
     for (i = 0; i < OSD.data.display_size.total; i++) {
@@ -2634,6 +2668,12 @@ OSD.GUI.updatePreviews = function() {
         if (!itemData.isVisible) {
             continue;
         }
+
+		if (itemData.x >= OSD.data.display_size.x)
+		{
+			continue;
+		}
+
         // DJI HD FPV: Hide elements that only appear in craft name
         if (OSD.DjiElements.craftNameElements.includes(item.name) &&
         $('#djiUnsupportedElements').find('input').is(':checked')) {
@@ -2683,16 +2723,16 @@ OSD.GUI.updatePreviews = function() {
         item.preview_img.style.pointerEvents = 'none';
     }
 
-    var centerishPosition = 255;
 
-    // AHI is one line up with NTSC (less lines) compared to PAL
-    if (OSD.constants.VIDEO_TYPES[OSD.data.video_system] == 'NTSC')
-      centerishPosition -= OSD.data.display_size.x;
+    var centerPosition = (OSD.data.display_size.x * OSD.data.display_size.y / 2);
+    if (OSD.data.display_size.y % 2 == 0) {
+        centerPosition += OSD.data.display_size.x / 2;
+    }
 
     // artificial horizon
     if ($('input[name="ARTIFICIAL_HORIZON"]').prop('checked')) {
         for (i = 0; i < 9; i++) {
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition - 4 + i, SYM.AH_BAR9_0 + 4);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition - 4 + i, SYM.AH_BAR9_0 + 4);
         }
     }
 
@@ -2701,21 +2741,21 @@ OSD.GUI.updatePreviews = function() {
         crsHNumber = Settings.getInputValue('osd_crosshairs_style');
        if (crsHNumber == 1) {
             // AIRCRAFT style
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition - 2, SYM.AH_AIRCRAFT0);
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition - 1, SYM.AH_AIRCRAFT1);
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition, SYM.AH_AIRCRAFT2);
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition + 1, SYM.AH_AIRCRAFT3);
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition + 2, SYM.AH_AIRCRAFT4);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition - 2, SYM.AH_AIRCRAFT0);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition - 1, SYM.AH_AIRCRAFT1);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition, SYM.AH_AIRCRAFT2);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition + 1, SYM.AH_AIRCRAFT3);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition + 2, SYM.AH_AIRCRAFT4);
         } else if ((crsHNumber > 1) && (crsHNumber < 8)) {
             // TYPES 3 to 8 (zero indexed)
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition - 1, SYM.AH_CROSSHAIRS[crsHNumber][0]);
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition, SYM.AH_CROSSHAIRS[crsHNumber][1]);
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition + 1, SYM.AH_CROSSHAIRS[crsHNumber][2]);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition - 1, SYM.AH_CROSSHAIRS[crsHNumber][0]);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition, SYM.AH_CROSSHAIRS[crsHNumber][1]);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition + 1, SYM.AH_CROSSHAIRS[crsHNumber][2]);
         } else {
             // DEFAULT or unknown style
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition - 1, SYM.AH_CENTER_LINE);
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition, SYM.AH_CROSSHAIRS[crsHNumber]);
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition + 1, SYM.AH_CENTER_LINE_RIGHT);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition - 1, SYM.AH_CENTER_LINE);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition, SYM.AH_CROSSHAIRS[crsHNumber]);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition + 1, SYM.AH_CENTER_LINE_RIGHT);
         }
     }
 
@@ -2724,21 +2764,17 @@ OSD.GUI.updatePreviews = function() {
         var hudwidth = OSD.constants.AHISIDEBARWIDTHPOSITION;
         var hudheight = OSD.constants.AHISIDEBARHEIGHTPOSITION;
         for (i = -hudheight; i <= hudheight; i++) {
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition - hudwidth + (i * FONT.constants.SIZES.LINE), SYM.AH_DECORATION);
-            OSD.GUI.checkAndProcessSymbolPosition(centerishPosition + hudwidth + (i * FONT.constants.SIZES.LINE), SYM.AH_DECORATION);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition - hudwidth + (i * FONT.constants.SIZES.LINE), SYM.AH_DECORATION);
+            OSD.GUI.checkAndProcessSymbolPosition(centerPosition + hudwidth + (i * FONT.constants.SIZES.LINE), SYM.AH_DECORATION);
         }
         // AH level indicators
-        OSD.GUI.checkAndProcessSymbolPosition(centerishPosition - hudwidth + 1, SYM.AH_LEFT);
-        OSD.GUI.checkAndProcessSymbolPosition(centerishPosition + hudwidth - 1, SYM.AH_RIGHT);
+        OSD.GUI.checkAndProcessSymbolPosition(centerPosition - hudwidth + 1, SYM.AH_LEFT);
+        OSD.GUI.checkAndProcessSymbolPosition(centerPosition + hudwidth - 1, SYM.AH_RIGHT);
     }
 
-    var mapCenter = (OSD.data.display_size.x * OSD.data.display_size.y / 2);
-    if (OSD.data.display_size.y % 2 == 0) {
-        mapCenter += OSD.data.display_size.x / 2;
-    }
-    OSD.GUI.updateMapPreview(mapCenter, 'MAP_NORTH', 'N', SYM.HOME);
-    OSD.GUI.updateMapPreview(mapCenter, 'MAP_TAKEOFF', 'T', SYM.HOME);
-    OSD.GUI.updateMapPreview(mapCenter, 'RADAR', null, SYM.DIR_TO_HOME);
+    OSD.GUI.updateMapPreview(centerPosition, 'MAP_NORTH', 'N', SYM.HOME);
+    OSD.GUI.updateMapPreview(centerPosition, 'MAP_TAKEOFF', 'T', SYM.HOME);
+    OSD.GUI.updateMapPreview(centerPosition, 'RADAR', null, SYM.DIR_TO_HOME);
 
     // render
     var $preview = $('.display-layout .preview').empty();
diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js
index c1dca964..7e6c3e26 100755
--- a/tabs/pid_tuning.js
+++ b/tabs/pid_tuning.js
@@ -190,6 +190,9 @@ TABS.pid_tuning.initialize = function (callback) {
         // UI Hooks
 
         $('a.refresh').click(function () {
+            $("#content-watermark").remove();
+            $(".tab-pid_tuning").remove();
+
             GUI.tab_switch_cleanup(function () {
                 GUI.log(chrome.i18n.getMessage('pidTuningDataRefreshed'));
                 TABS.pid_tuning.initialize();
diff --git a/tabs/ports.js b/tabs/ports.js
index aad48592..d00df0f2 100644
--- a/tabs/ports.js
+++ b/tabs/ports.js
@@ -93,6 +93,12 @@ TABS.ports.initialize = function (callback) {
         maxPorts: 1 }
     );
 
+    functionRules.push({
+        name: 'HDZERO_VTX',
+        groups: ['peripherals'],
+        maxPorts: 1 }
+    );
+
     functionRules.push({
         name: 'SMARTPORT_MASTER',
         groups: ['peripherals'],