diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 4f177b83..064c4818 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2486,7 +2486,10 @@
         "message": "Wireless mode"
     },
     "rthConfiguration": {
-        "message": "RTH and Landing Settings"
+        "message": "RTH settings"
+    },
+    "autoLandingSettings": {
+        "message": "Automatic landing settings"
     },
     "minRthDistance": {
         "message": "Min. RTH distance [cm]"
@@ -2536,17 +2539,26 @@
     "rthHomeAltitudeHelp": {
         "message": "Used when not landing at the home point. Upon arriving at home, the plane will loiter and change altitude to the RTH Home Altitude. Default is 0, which is feature disabled."
     },
-    "landMinAltVspd": {
-        "message": "Vertical descent velocity under min. vertical landing speed altitude [cm/s]"
-    },
     "landMaxAltVspd": {
-        "message": "Vertical descent velocity above slowdown altitude [cm/s]"
+        "message": "<strong>Initial landing speed</strong> until <strong>Slow down altitude</strong> is reached"
     },
-    "landSlowdownMinAlt": {
-        "message": "Min. vertical landing speed at altitude [cm]"
+    "landMaxAltVspdHelp": {
+        "message": "After RTH if autolanding is enabled the aircraft will start to descend at this speed until reaching <strong>Slow down altitude</strong>"
     },
     "landSlowdownMaxAlt": {
-        "message": "Vertical landing speed slowdown at altitude [cm]"
+        "message": "<strong>Slow down altitude</strong>. Altitude bellow which the aircraft will start to slow down"
+    },
+    "landSlowdownMaxAltHelp": {
+        "message": "When the aircraft reaches this altitude it will start to slow down linearly between the <strong>Initial landing speed</strong> and <strong>Final landing speed</strong> to reach it at <strong>Final approach altitude</strong>"
+    },
+    "landMinAltVspd": {
+        "message": "<strong>Final landing speed</strong>. Speed the aircraft will take until touchdown when the <strong>Final approach altitutde</strong> is reached"
+    },
+    "landMinAltVspdHelp": {
+        "message": "The aircraft vertical speed target will be this value when the aircraft reaches the <strong>Final approach altitude</strong> after having slowed down linearly from the <strong>Slow down altitude</strong> at <strong>Initial landing speed</strong>"
+    },
+    "landSlowdownMinAlt": {
+        "message": "<strong>Final approach altitude</strong>. Altitude under which the aircraft will go down at <strong>Final landing speed</strong> until touchdown"
     },
     "emergencyDescentRate": {
         "message": "Emergency landing speed [cm/s]"
diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html
index 2dca16a9..f24e55ed 100644
--- a/tabs/advanced_tuning.html
+++ b/tabs/advanced_tuning.html
@@ -114,7 +114,7 @@
                         <div class="spacer_box_title" data-i18n="fixedWingNavigationConfiguration"></div>
                     </div>
                     <div class="spacer_box">
-    
+
                         <div class="number">
                             <input id="cruiseThrottle" type="number" data-setting="nav_fw_cruise_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" />
                             <label for="cruiseThrottle"><span data-i18n="cruiseThrottle"></span></label>
@@ -147,25 +147,25 @@
                             <label for="pitchToThrottleSmoothing"><span data-i18n="pitchToThrottleSmoothing"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="pitchToThrottleSmoothingHelp"></div>
                         </div>
-                        
+
                         <div class="number">
                             <input id="pitchToThrottleThreshold" type="number" data-setting="nav_fw_pitch2thr_threshold" data-setting-multiplier="1" step="1" min="0" max="900" />
                             <label for="pitchToThrottleThreshold"><span data-i18n="pitchToThrottleThreshold"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="pitchToThrottleThresholdHelp"></div>
                         </div>
-    
+
                         <div class="number">
                             <input type="number" id="cruiseYawRate" data-setting="nav_fw_cruise_yaw_rate" data-setting-multiplier="1" step="1" min="0" max="60" />
                             <label for="cruiseYawRate"><span data-i18n="cruiseYawRateLabel"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="cruiseYawRateHelp"></div>
                         </div>
-    
+
                         <div class="number">
                             <input id="maxBankAngle" type="number" data-setting="nav_fw_bank_angle" data-setting-multiplier="1" step="1" min="5" max="80" />
                             <label for="maxBankAngle"><span data-i18n="maxBankAngle"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="maxBankAngleHelp"></div>
                         </div>
-    
+
                         <div class="number">
                             <input id="maxClimbAngle" type="number" data-setting="nav_fw_climb_angle" data-setting-multiplier="1" step="1" min="5" max="80" />
                             <label for="maxClimbAngle"><span data-i18n="maxClimbAngle"></span></label>
@@ -177,24 +177,24 @@
                             <label for="maxDiveAngle"><span data-i18n="maxDiveAngle"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="maxDiveAngleHelp"></div>
                         </div>
-    
+
                         <div class="number">
                             <input id="loiterRadius" type="number" data-setting="nav_fw_loiter_radius" data-setting-multiplier="1" step="1" min="0" max="30000" />
                             <label for="loiterRadius"><span data-i18n="loiterRadius"></span></label>
                         </div>
-    
+
                         <div class="select">
                             <select id="loiterDirection" data-setting="fw_loiter_direction"></select>
                             <label for="loiterDirection"><span data-i18n="loiterDirectionLabel"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="loiterDirectionHelp"></div>
                         </div>
-    
+
                         <div class="number">
                             <input type="number" id="controlSmoothness" data-setting="nav_fw_control_smoothness" data-setting-multiplier="1" step="1" min="0" max="9" />
                             <label for="controlSmoothness"><span data-i18n="controlSmoothness"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="controlSmoothnessHelp"></div>
                         </div>
-    
+
                     </div>
                 </div>
 
@@ -251,55 +251,55 @@
                         <div class="spacer_box_title" data-i18n="multirotorBrakingConfiguration"></div>
                     </div>
                     <div class="spacer_box">
-    
+
                         <div class="number">
                             <input id="brakingSpeedThreshold" type="number" data-setting="nav_mc_braking_speed_threshold" data-setting-multiplier="1" step="1" min="0" max="1000" />
                             <label for="brakingSpeedThreshold"><span data-i18n="brakingSpeedThreshold"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="brakingSpeedThresholdTip"></div>
                         </div>
-    
+
                         <div class="number">
                             <input id="brakingDisengageSpeed" type="number" data-setting="nav_mc_braking_disengage_speed" data-setting-multiplier="1" step="1" min="0" max="1000" />
                             <label for="brakingDisengageSpeed"><span data-i18n="brakingDisengageSpeed"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="brakingDisengageSpeedTip"></div>
                         </div>
-    
+
                         <div class="number">
                             <input id="brakingTimeout" type="number" data-setting="nav_mc_braking_timeout" data-setting-multiplier="1" step="1" min="100" max="5000" />
                             <label for="brakingTimeout"><span data-i18n="brakingTimeout"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="brakingTimeoutTip"></div>
                         </div>
-    
+
                         <div class="number">
                             <input id="brakingBoostFactor" type="number" data-setting="nav_mc_braking_boost_factor" data-setting-multiplier="1" step="1" min="0" max="200" />
                             <label for="brakingBoostFactor"><span data-i18n="brakingBoostFactor"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="brakingBoostFactorTip"></div>
                         </div>
-    
+
                         <div class="number">
                             <input id="brakingBoostTimeout" type="number" data-setting="nav_mc_braking_boost_timeout" data-setting-multiplier="1" step="1" min="0" max="5000" />
                             <label for="brakingBoostTimeout"><span data-i18n="brakingBoostTimeout"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="brakingBoostTimeoutTip"></div>
                         </div>
-    
+
                         <div class="number">
                             <input id="brakingBoostSpeedThreshold" type="number" data-setting="nav_mc_braking_boost_speed_threshold" data-setting-multiplier="1" step="1" min="100" max="1000" />
                             <label for="brakingBoostSpeedThreshold"><span data-i18n="brakingBoostSpeedThreshold"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="brakingBoostSpeedThresholdTip"></div>
                         </div>
-    
+
                         <div class="number">
                             <input id="brakingBoostDisengageSpeed" type="number" data-setting="nav_mc_braking_boost_disengage_speed" data-setting-multiplier="1" step="1" min="100" max="1000" />
                             <label for="brakingBoostDisengageSpeed"><span data-i18n="brakingBoostDisengageSpeed"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="brakingBoostDisengageSpeedTip"></div>
                         </div>
-    
+
                         <div class="number">
                             <input id="brakingBankAngle" type="number" data-setting="nav_mc_braking_bank_angle" data-setting-multiplier="1" step="1" min="15" max="60" />
                             <label for="brakingBankAngle"><span data-i18n="brakingBankAngle"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="brakingBankAngleTip"></div>
                         </div>
-    
+
                     </div>
                 </div>
             </div> <!-- right wrapper -->
@@ -317,30 +317,30 @@
                         <div class="spacer_box_title" data-i18n="rthConfiguration"></div>
                     </div>
                     <div class="spacer_box">
-    
+
                         <div class="select">
                             <select id="rthAltControlMode" data-setting="nav_rth_alt_mode"></select>
                             <label for="rthAltControlMode"><span data-i18n="rthAltControlMode"></span></label>
                         </div>
-    
+
                         <div class="number">
                             <input type="number" id="rthAltitude" data-setting="nav_rth_altitude" data-setting-multiplier="1" step="1" min="0" max="65000" />
                             <label for="rthAltitude"><span data-i18n="rthAltitude"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="rthAltitudeHelp"></div>
                         </div>
-                        
+
                          <div class="number">
                             <input type="number" id="rthHomeAltitude" data-setting="nav_rth_home_altitude" data-setting-multiplier="1" step="1" min="0" max="65000" />
                             <label for="rthHomeAltitude"><span data-i18n="rthHomeAltitudeLabel"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="rthHomeAltitudeHelp"></div>
                         </div>
-    
+
                         <div class="select">
                             <select id="rth-climb-first" data-setting="nav_rth_climb_first"></select>
                             <label for="rth-climb-first"><span data-i18n="rthClimbFirst"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="rthClimbFirstHelp"></div>
                         </div>
-    
+
                         <div class="checkbox">
                             <input type="checkbox" class="toggle update_preview" id="rthClimbIgnoreEmergency" data-setting="nav_rth_climb_ignore_emerg" data-live="true" />
                             <label for="rthClimbIgnoreEmergency"><span data-i18n="rthClimbIgnoreEmergency"></span></label>
@@ -351,56 +351,32 @@
                             <label for="rthAltControlOverride"><span data-i18n="rthAltControlOverride"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="rthAltControlOverrideHelp"></div>
                         </div>
-                        
+
                         <div class="checkbox notFixedWingTuning">
                             <input type="checkbox" class="toggle update_preview" id="rthTailFirst" data-setting="nav_rth_tail_first" data-live="true" />
                             <label for="rthTailFirst"><span data-i18n="rthTailFirst"></span></label>
                         </div>
-    
+
                         <div class="select">
                             <select id="rthAllowLanding" data-setting="nav_rth_allow_landing"></select>
                             <label for="rthAllowLanding"><span data-i18n="rthAllowLanding"></span></label>
                         </div>
-    
-                        <div class="number">
-                            <input id="landMinAltVspd" type="number" data-setting="nav_landing_minalt_vspd" data-setting-multiplier="1" step="1" min="50" max="500" />
-                            <label for="landMinAltVspd"><span data-i18n="landMinAltVspd"></span></label>
-                        </div>
-    
-                        <div class="number">
-                            <input id="landMaxAltVspd" type="number" data-setting="nav_landing_maxalt_vspd" data-setting-multiplier="1" step="1" min="100" max="2000" />
-                            <label for="landMaxAltVspd"><span data-i18n="landMaxAltVspd"></span></label>
-                        </div>
-    
-                        <div class="number">
-                            <input id="landSlowdownMinAlt" type="number" data-setting="nav_land_slowdown_minalt" data-setting-multiplier="1" step="1" min="50" max="1000" />
-                            <label for="landSlowdownMinAlt"><span data-i18n="landSlowdownMinAlt"></span></label>
-                        </div>
-    
-                        <div class="number">
-                            <input id="landSlowdownMaxAlt" type="number" data-setting="nav_land_slowdown_maxalt" data-setting-multiplier="1" step="1" min="500" max="4000" />
-                            <label for="landSlowdownMaxAlt"><span data-i18n="landSlowdownMaxAlt"></span></label>
-                        </div>
-    
+
                         <div class="number">
                             <input id="rth-min-distance" type="number" data-setting="nav_min_rth_distance" data-setting-multiplier="1" step="1" min="0" max="5000" />
                             <label for="rth-min-distance"><span data-i18n="minRthDistance"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="minRthDistanceHelp"></div>
                         </div>
-    
+
                         <div class="number">
                             <input id="rthAbortThreshold" type="number" data-setting="nav_rth_abort_threshold" data-setting-multiplier="1" step="1" min="0" max="65000" />
                             <label for="rthAbortThreshold"><span data-i18n="rthAbortThreshold"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="rthAbortThresholdHelp"></div>
                         </div>
-    
-                        <div class="number">
-                            <input id="emergencyDescentRate" type="number" data-setting="nav_emerg_landing_speed" data-setting-multiplier="1" step="1" min="10" max="2000" />
-                            <label for="emergencyDescentRate"><span data-i18n="emergencyDescentRate"></span></label>
-                        </div>
+
                     </div>
                 </div>
-   
+
             </div> <!-- Left wrapper -->
 
             <div class="rightWrapper">
@@ -429,19 +405,55 @@
                         <div class="spacer_box_title" data-i18n="waypointConfiguration"></div>
                     </div>
                     <div class="spacer_box">
-    
+
                         <div class="number">
                             <input type="number" id="waypointRadius" data-setting="nav_wp_radius" data-setting-multiplier="1" step="1" min="10" max="10000" />
                             <label for="waypointRadius"><span data-i18n="waypointRadius"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="waypointRadiusHelp"></div>
                         </div>
-    
+
                         <div class="number">
                             <input type="number" id="waypointSafeDistance" data-setting="nav_wp_safe_distance" data-setting-multiplier="1" step="1" min="0" max="65000" />
                             <label for="waypointSafeDistance"><span data-i18n="waypointSafeDistance"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="waypointSafeDistanceHelp"></div>
                         </div>
-    
+
+                    </div>
+                </div>
+
+                <div class="config-setion gui_box grey">
+                    <div class="gui_box_titlebar">
+                        <div class="spacer_box_title" data-i18n="autoLandingSettings"></div>
+                    </div>
+                    <div class="spacer_box">
+
+                        <div class="number">
+                            <input id="landMaxAltVspd" type="number" data-setting="nav_land_maxalt_vspd" data-setting-multiplier="1" step="1" min="100" max="2000" />
+                            <label for="landMaxAltVspd"><span data-i18n="landMaxAltVspd"></span></label>
+                            <div class="helpicon cf_tip" data-i18n_title="landMaxAltVspdHelp"></div>
+                        </div>
+
+                        <div class="number">
+                            <input id="landSlowdownMaxAlt" type="number" data-setting="nav_land_slowdown_maxalt" data-setting-multiplier="1" step="1" min="500" max="4000" />
+                            <label for="landSlowdownMaxAlt"><span data-i18n="landSlowdownMaxAlt"></span></label>
+                            <div class="helpicon cf_tip" data-i18n_title="landSlowdownMaxAltHelp"></div>
+                        </div>
+
+                        <div class="number">
+                            <input id="landMinAltVspd" type="number" data-setting="nav_land_minalt_vspd" data-setting-multiplier="1" step="1" min="50" max="500" />
+                            <label for="landMinAltVspd"><span data-i18n="landMinAltVspd"></span></label>
+                            <div class="helpicon cf_tip" data-i18n_title="landMinAltVspdHelp"></div>
+                        </div>
+
+                        <div class="number">
+                            <input id="landSlowdownMinAlt" type="number" data-setting="nav_land_slowdown_minalt" data-setting-multiplier="1" step="1" min="50" max="1000" />
+                            <label for="landSlowdownMinAlt"><span data-i18n="landSlowdownMinAlt"></span></label>
+                        </div>
+
+                        <div class="number">
+                            <input id="emergencyDescentRate" type="number" data-setting="nav_emerg_landing_speed" data-setting-multiplier="1" step="1" min="10" max="2000" />
+                            <label for="emergencyDescentRate"><span data-i18n="emergencyDescentRate"></span></label>
+                        </div>
                     </div>
                 </div>