diff --git a/src/tabs/configuration.html b/src/tabs/configuration.html
index 7166d88d..e269350f 100644
--- a/src/tabs/configuration.html
+++ b/src/tabs/configuration.html
@@ -1,426 +1,418 @@
 <div class="tab-configuration toolbar_fixed_bottom">
     <div class="content_wrapper">
         <div class="tab_title" i18n="tabConfiguration"></div>
-            <div class="cf_doc_version_bt">
-                <a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank" rel="noopener noreferrer"></a>
-            </div>
-            <div class="note">
-                <p i18n="configurationFeaturesHelp"></p>
-            </div>
+        <div class="cf_doc_version_bt">
+            <a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank" rel="noopener noreferrer"></a>
+        </div>
+        <div class="note">
+            <p i18n="configurationFeaturesHelp"></p>
+        </div>
 
-            <div class="grid-row">
+        <div class="grid-row">
 
-                <div class="grid-col col6">
+            <div class="grid-col col6">
 
-                    <!-- SYSTEM CONFIGURATION -->
-                    <div class="systemconfig">
-                        <div class="gui_box grey">
-                            <div class="gui_box_titlebar">
-                                <div class="spacer_box_title" i18n="configurationSystem"></div>
+                <!-- SYSTEM CONFIGURATION -->
+                <div class="systemconfig">
+                    <div class="gui_box grey">
+                        <div class="gui_box_titlebar">
+                            <div class="spacer_box_title" i18n="configurationSystem"></div>
+                        </div>
+                        <div class="spacer_box">
+                            <div class="note">
+                                <p class="systemconfigNote" i18n="configurationLoopTimeHelp"></p>
                             </div>
-                            <div class="spacer_box">
-                                <div class="note">
-                                    <p class="systemconfigNote" i18n="configurationLoopTimeHelp"></p>
-                                </div>
-                                <div class="select gyroUse32kHz">
+                            <div class="select">
+                                <input type="text" class="gyroFrequency" readonly />
+                                <select class="gyroSyncDenom">
+                                    <!-- list generated here -->
+                                </select>
+                                <span i18n="configurationGyroSyncDenom"></span>
+                            </div>
+                            <div class="select">
+                                <select class="pidProcessDenom">
+                                    <!-- list generated here -->
+                                </select>
+                                <span i18n="configurationPidProcessDenom"></span>
+                                <div class="helpicon cf_tip" i18n_title="configurationPidProcessDenomHelp"></div>
+                            </div>
+                            <div class="hardwareSelection">
+                                <div class="select">
                                     <div style="float: left; height: 20px; margin-right: 15px; margin-left: 3px;">
-                                        <input type="checkbox" id="gyroUse32kHz" class="toggle" />
+                                        <input type="checkbox" id="accHardwareSwitch" class="toggle" />
                                     </div>
-                                    <span class="freelabel" i18n="configurationGyroUse32kHz"></span>
-                                    <div class="helpicon cf_tip" i18n_title="configurationGyroUse32kHzHelp"></div>
+                                    <span class="freelabel" i18n="configurationAccHardware"></span>
                                 </div>
                                 <div class="select">
-                                    <input type="text" class="gyroFrequency" readonly />
-                                    <select class="gyroSyncDenom">
-                                        <!-- list generated here -->
-                                    </select>
-                                    <span i18n="configurationGyroSyncDenom"></span>
+                                    <div style="float: left; height: 20px; margin-right: 15px; margin-left: 3px;">
+                                        <input type="checkbox" id="baroHardwareSwitch" class="toggle" />
+                                    </div>
+                                    <span class="freelabel" i18n="configurationBaroHardware"></span>
                                 </div>
                                 <div class="select">
-                                    <select class="pidProcessDenom">
-                                        <!-- list generated here -->
-                                    </select>
-                                    <span i18n="configurationPidProcessDenom"></span>
-                                    <div class="helpicon cf_tip" i18n_title="configurationPidProcessDenomHelp"></div>
-                                </div>
-                                <div class="hardwareSelection">
-                                    <div class="select">
-                                        <div style="float: left; height: 20px; margin-right: 15px; margin-left: 3px;">
-                                            <input type="checkbox" id="accHardwareSwitch" class="toggle" />
-                                        </div>
-                                        <span class="freelabel" i18n="configurationAccHardware"></span>
-                                    </div>
-                                    <div class="select">
-                                        <div style="float: left; height: 20px; margin-right: 15px; margin-left: 3px;">
-                                            <input type="checkbox" id="baroHardwareSwitch" class="toggle" />
-                                        </div>
-                                        <span class="freelabel" i18n="configurationBaroHardware"></span>
-                                    </div>
-                                    <div class="select">
-                                        <div style="float: left; height: 20px; margin-right: 15px; margin-left: 3px;">
-                                            <input type="checkbox" id="magHardwareSwitch" class="toggle" />
-                                        </div>
-                                        <span class="freelabel" i18n="configurationMagHardware"></span>
+                                    <div style="float: left; height: 20px; margin-right: 15px; margin-left: 3px;">
+                                        <input type="checkbox" id="magHardwareSwitch" class="toggle" />
                                     </div>
+                                    <span class="freelabel" i18n="configurationMagHardware"></span>
                                 </div>
                             </div>
                         </div>
                     </div>
-                    <!-- END SYSTEM CONFIGURATION-->
+                </div>
+                <!-- END SYSTEM CONFIGURATION-->
 
-                    <!-- PERSONALIZATION-->
-                    <div class="gui_box grey miscSettings">
-                        <div class="gui_box_titlebar">
-                            <div class="spacer_box_title" i18n="configurationPersonalization"></div>
+                <!-- PERSONALIZATION-->
+                <div class="gui_box grey miscSettings">
+                    <div class="gui_box_titlebar">
+                        <div class="spacer_box_title" i18n="configurationPersonalization"></div>
+                    </div>
+                    <div class="spacer_box">
+                        <div class="number">
+                            <label> <input type="text" name="craftName" maxlength="32" style="width:100px;"/> <span
+                                i18n="craftName"></span>
+                            </label>
+                            <div class="helpicon cf_tip" i18n_title="configurationCraftNameHelp"></div>
                         </div>
-                        <div class="spacer_box">
+                        <div class="number pilotName">
+                            <label> <input type="text" name="pilotName" maxlength="32" style="width:100px;"/> <span
+                                i18n="configurationPilotName"></span>
+                            </label>
+                            <div class="helpicon cf_tip" i18n_title="configurationPilotNameHelp"></div>
+                        </div>
+                    </div>
+                </div> <!-- END PERSONALIZATION-->
+
+                <!-- CAMERA -->
+                <div class="gui_box grey miscSettings accelNeeded">
+                    <div class="gui_box_titlebar">
+                        <div class="spacer_box_title" i18n="configurationCamera"></div>
+                    </div>
+                    <div class="spacer_box">
+                        <div class="number fpvCamAngleDegrees">
+                            <label> <input type="number" name="fpvCamAngleDegrees" step="1" min="0" max="50" /> <span
+                                i18n="configurationFpvCamAngleDegrees"></span>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+                <!-- END CAMERA -->
+
+                <!-- MAXIMUM ARMING ANGLE-->
+                <div class="gui_box grey accelNeeded">
+                    <div class="gui_box_titlebar">
+                        <div class="spacer_box_title" i18n="configurationArming"></div>
+                        <div class="helpicon cf_tip" i18n_title="configurationArmingHelp"></div>
+                    </div>
+                    <div class="spacer_box">
+                        <div class="_smallAngle">
                             <div class="number">
-                                <label> <input type="text" name="craftName" maxlength="32" style="width:100px;"/> <span
-                                    i18n="craftName"></span>
-                                </label>
-                                <div class="helpicon cf_tip" i18n_title="configurationCraftNameHelp"></div>
-                            </div>
-                            <div class="number pilotName">
-                                <label> <input type="text" name="pilotName" maxlength="32" style="width:100px;"/> <span
-                                    i18n="configurationPilotName"></span>
-                                </label>
-                                <div class="helpicon cf_tip" i18n_title="configurationPilotNameHelp"></div>
-                            </div>
-                        </div>
-                    </div> <!-- END PERSONALIZATION-->
-
-                    <!-- CAMERA -->
-                    <div class="gui_box grey miscSettings accelNeeded">
-                        <div class="gui_box_titlebar">
-                            <div class="spacer_box_title" i18n="configurationCamera"></div>
-                        </div>
-                        <div class="spacer_box">
-                            <div class="number fpvCamAngleDegrees">
-                                <label> <input type="number" name="fpvCamAngleDegrees" step="1" min="0" max="50" /> <span
-                                    i18n="configurationFpvCamAngleDegrees"></span>
+                                <label>
+                                    <input type="number" id="configurationSmallAngle" step="1" min="1" max="180" />
+                                    <span i18n="configurationSmallAngle"></span>
+                                    <div class="helpicon cf_tip" i18n_title="configurationSmallAngleHelp"></div>
                                 </label>
                             </div>
                         </div>
                     </div>
-                    <!-- END CAMERA -->
+                </div>
+                <!-- END MAXIMUM ARMING ANGLE-->
 
-                    <!-- MAXIMUM ARMING ANGLE-->
-                    <div class="gui_box grey accelNeeded">
+                <!-- OTHER FEATURES -->
+                <div class="featuresOther">
+                    <div class="gui_box grey">
                         <div class="gui_box_titlebar">
-                            <div class="spacer_box_title" i18n="configurationArming"></div>
-                            <div class="helpicon cf_tip" i18n_title="configurationArmingHelp"></div>
+                            <div class="spacer_box_title" i18n="configurationFeatures"></div>
                         </div>
                         <div class="spacer_box">
-                            <div class="_smallAngle">
-                                <div class="number">
+                            <div class="note">
+                                <p i18n="configurationOtherFeaturesHelp"></p>
+                            </div>
+                            <table class="featuresMultiple">
+                                <thead>
+                                    <tr>
+                                        <th i18n="configurationFeatureEnabled"></th>
+                                        <th i18n="configurationFeatureDescription"></th>
+                                        <th i18n="configurationFeatureName"></th>
+                                    </tr>
+                                </thead>
+                                <tbody class="features other" id="noline">
+                                    <!-- table generated here -->
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+                <!-- END OTHER FUTURES-->
+
+                <!-- GPS -->
+                <div class="gps">
+                    <div class="gui_box grey gps">
+                        <div class="gui_box_titlebar">
+                            <div class="spacer_box_title" i18n="configurationGPS"></div>
+                        </div>
+                        <div class="spacer_box">
+                            <table class="featuresMultiple">
+                                <thead>
+                                    <tr>
+                                        <th i18n="configurationFeatureEnabled"></th>
+                                        <th i18n="configurationFeatureDescription"></th>
+                                        <th i18n="configurationFeatureName"></th>
+                                    </tr>
+                                </thead>
+                                <tbody class="features gps">
+                                    <!-- table generated here -->
+                                </tbody>
+                            </table>
+                            <div class="gpsSettings">
+                                <div style="float:left; width:100%;">
+                                    <div class="note">
+                                        <p i18n="configurationGPSHelp"></p>
+                                    </div>
+
+                                    <div class="select line">
+                                        <select class="gps_protocol">
+                                            <!-- list generated here -->
+                                        </select>
+                                        <span i18n="configurationGPSProtocol"></span>
+                                    </div>
+                                    <div class="select line">
+                                        <select class="gps_baudrate">
+                                            <!-- list generated here -->
+                                        </select>
+                                        <span i18n="configurationGPSBaudrate"></span>
+                                    </div>
+                                    <div class="select gps_auto_baud">
+                                        <div>
+                                            <input type="checkbox" name="gps_auto_baud" class="toggle" />
+                                        </div>
+                                        <span class="freelabel" i18n="configurationGPSAutoBaud"></span>
+                                    </div>
+                                    <div class="select gps_auto_config">
+                                        <div>
+                                            <input type="checkbox" name="gps_auto_config" class="toggle" />
+                                        </div>
+                                        <span class="freelabel" i18n="configurationGPSAutoConfig"></span>
+                                    </div>
+                                    <div class="select gps_ublox_galileo">
+                                        <div>
+                                            <input type="checkbox" name="gps_ublox_galileo" class="toggle" />
+                                        </div>
+                                        <span class="freelabel" i18n="configurationGPSGalileo"></span>
+                                        <div class="helpicon cf_tip" i18n_title="configurationGPSGalileoHelp"></div>
+                                    </div>
+                                    <div class="select gps_home_once">
+                                        <div>
+                                            <input type="checkbox" name="gps_home_once" class="toggle" />
+                                        </div>
+                                        <span class="freelabel" i18n="configurationGPSHomeOnce"></span>
+                                        <div class="helpicon cf_tip" i18n_title="configurationGPSHomeOnceHelp"></div>
+                                    </div>
+                                    <div class="select line gps_ubx_sbas">
+                                        <select class="gps_ubx_sbas">
+                                            <!-- list generated here -->
+                                        </select>
+                                        <span i18n="configurationGPSubxSbas"></span>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!-- END GPS-->
+            </div> <!-- END grid-col col6 -->
+
+            <div class="grid-col col6">
+
+                <!-- BOARD ORIENTATION -->
+                <div class="board acc">
+                    <div class="gui_box grey">
+                        <div class="gui_box_titlebar">
+                            <div class="spacer_box_title" i18n="configurationBoardAlignment"></div>
+                            <div class="helpicon cf_tip" i18n_title="configHelp2"></div>
+                        </div>
+                        <div class="spacer_box">
+                            <div class="board_align_content">
+                                <div class="board_align_inputs">
+                                    <div class="alignicon roll"></div>
                                     <label>
-                                        <input type="number" id="configurationSmallAngle" step="1" min="1" max="180" />
-                                        <span i18n="configurationSmallAngle"></span>
-                                        <div class="helpicon cf_tip" i18n_title="configurationSmallAngleHelp"></div>
+                                        <input type="number" name="board_align_roll" step="1" min="-180" max="360" />
+                                        <span i18n="configurationBoardAlignmentRoll"></span>
+                                    </label>
+                                </div>
+
+                                <div class="board_align_inputs">
+                                    <div class="alignicon pitch"></div>
+                                    <label>
+                                        <input type="number" name="board_align_pitch" step="1" min="-180" max="360" />
+                                        <span i18n="configurationBoardAlignmentPitch"></span>
+                                    </label>
+                                </div>
+
+                                <div class="board_align_inputs">
+                                    <div class="alignicon yaw"></div>
+                                    <label>
+                                        <input type="number" name="board_align_yaw" step="1" min="-180" max="360" />
+                                        <span i18n="configurationBoardAlignmentYaw"></span>
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="gyro_align_content">
+                                <div class="gyro_alignment_inputs gyro_alignment_inputs_selection">
+                                    <label>
+                                        <select class="gyro_to_use">
+                                            <!-- list generated here -->
+                                        </select>
+                                        <span i18n="configurationSensorGyroToUse"></span>
+                                    </label>
+                                </div>
+                                <div class="gyro_alignment_inputs gyro_alignment_inputs_first">
+                                    <label>
+                                        <span>
+                                            <select class="gyro_1_align">
+                                                <option i18n="configurationSensorAlignmentDefaultOption" value="0"></option>
+                                                <!-- list generated here -->
+                                            </select>
+                                            <span i18n="configurationSensorAlignmentGyro1"></span>
+                                        </span>
+                                    </label>
+                                </div>
+                                <div class="gyro_alignment_inputs gyro_alignment_inputs_second">
+                                    <label>
+                                        <select class="gyro_2_align">
+                                            <option i18n="configurationSensorAlignmentDefaultOption" value="0"></option>
+                                            <!-- list generated here -->
+                                        </select>
+                                        <span i18n="configurationSensorAlignmentGyro2"></span>
+                                    </label>
+                                </div>
+                                <div class="gyro_alignment_inputs gyro_alignment_inputs_notfound">
+                                    <span class="message-negative" i18n="configurationSensorGyroToUseNotFound"></span>
+                                </div>
+                            </div>
+                            <div class="sensor_align_content">
+                                <div class="legacy_gyro_alignment select">
+                                    <label>
+                                        <span i18n="configurationSensorAlignmentGyro"></span>
+                                        <select class="gyroalign">
+                                            <option i18n="configurationSensorAlignmentDefaultOption" value="0"></option>
+                                            <!-- list generated here -->
+                                        </select>
+                                    </label>
+                                </div>
+                                <div class="legacy_accel_alignment select">
+                                    <label>
+                                        <span i18n="configurationSensorAlignmentAcc"></span>
+                                        <select class="accalign">
+                                            <option i18n="configurationSensorAlignmentDefaultOption" value="0"></option>
+                                            <!-- list generated here -->
+                                        </select>
+                                    </label>
+                                </div>
+                                <div class="select">
+                                    <label>
+                                        <span i18n="configurationSensorAlignmentMag"></span>
+                                        <select class="magalign">
+                                            <option value="0" i18n="configurationSensorAlignmentDefaultOption"></option>
+                                            <!-- list generated here -->
+                                        </select>
                                     </label>
                                 </div>
                             </div>
                         </div>
                     </div>
-                    <!-- END MAXIMUM ARMING ANGLE-->
+                </div>
 
-                    <!-- OTHER FEATURES -->
-                    <div class="featuresOther">
-                        <div class="gui_box grey">
-                            <div class="gui_box_titlebar">
-                                <div class="spacer_box_title" i18n="configurationFeatures"></div>
-                            </div>
-                            <div class="spacer_box">
-                                <div class="note">
-                                    <p i18n="configurationOtherFeaturesHelp"></p>
-                                </div>
-                                <table class="featuresMultiple">
-                                    <thead>
-                                        <tr>
-                                            <th i18n="configurationFeatureEnabled"></th>
-                                            <th i18n="configurationFeatureDescription"></th>
-                                            <th i18n="configurationFeatureName"></th>
-                                        </tr>
-                                    </thead>
-                                    <tbody class="features other" id="noline">
-                                        <!-- table generated here -->
-                                    </tbody>
-                                </table>
-                            </div>
+                <!-- ACCELEROMETER TRIM -->
+                <div class="gui_box grey accelNeeded">
+                    <div class="gui_box_titlebar">
+                        <div class="spacer_box_title" i18n="configurationAccelTrims"></div>
+                    </div>
+                    <div class="spacer_box">
+                        <div class="number">
+                            <label> <input type="number" name="roll" min="-300" max="300" /> <span
+                                i18n="configurationAccelTrimRoll"></span>
+                            </label>
+                        </div>
+                        <div class="number">
+                            <label> <input type="number" name="pitch" min="-300" max="300" /> <span
+                                i18n="configurationAccelTrimPitch"></span>
+                            </label>
                         </div>
                     </div>
-                    <!-- END OTHER FUTURES-->
+                </div> <!-- END ACCELEROMETER TRIM -->
 
-                    <!-- GPS -->
-                    <div class="gps">
-                        <div class="gui_box grey gps">
-                            <div class="gui_box_titlebar">
-                                <div class="spacer_box_title" i18n="configurationGPS"></div>
-                            </div>
-                            <div class="spacer_box">
-                                <table class="featuresMultiple">
-                                    <thead>
-                                        <tr>
-                                            <th i18n="configurationFeatureEnabled"></th>
-                                            <th i18n="configurationFeatureDescription"></th>
-                                            <th i18n="configurationFeatureName"></th>
-                                        </tr>
-                                    </thead>
-                                    <tbody class="features gps">
-                                        <!-- table generated here -->
-                                    </tbody>
-                                </table>
-                                <div class="gpsSettings">
-                                    <div style="float:left; width:100%;">
-                                        <div class="note">
-                                            <p i18n="configurationGPSHelp"></p>
-                                        </div>
-
-                                        <div class="select line">
-                                            <select class="gps_protocol">
-                                                <!-- list generated here -->
-                                            </select>
-                                            <span i18n="configurationGPSProtocol"></span>
-                                        </div>
-                                        <div class="select line">
-                                            <select class="gps_baudrate">
-                                                <!-- list generated here -->
-                                            </select>
-                                            <span i18n="configurationGPSBaudrate"></span>
-                                        </div>
-                                        <div class="select gps_auto_baud">
-                                            <div>
-                                                <input type="checkbox" name="gps_auto_baud" class="toggle" />
-                                            </div>
-                                            <span class="freelabel" i18n="configurationGPSAutoBaud"></span>
-                                        </div>
-                                        <div class="select gps_auto_config">
-                                            <div>
-                                                <input type="checkbox" name="gps_auto_config" class="toggle" />
-                                            </div>
-                                            <span class="freelabel" i18n="configurationGPSAutoConfig"></span>
-                                        </div>
-                                        <div class="select gps_ublox_galileo">
-                                            <div>
-                                                <input type="checkbox" name="gps_ublox_galileo" class="toggle" />
-                                            </div>
-                                            <span class="freelabel" i18n="configurationGPSGalileo"></span>
-                                            <div class="helpicon cf_tip" i18n_title="configurationGPSGalileoHelp"></div>
-                                        </div>
-                                        <div class="select gps_home_once">
-                                            <div>
-                                                <input type="checkbox" name="gps_home_once" class="toggle" />
-                                            </div>
-                                            <span class="freelabel" i18n="configurationGPSHomeOnce"></span>
-                                            <div class="helpicon cf_tip" i18n_title="configurationGPSHomeOnceHelp"></div>
-                                        </div>
-                                        <div class="select line gps_ubx_sbas">
-                                            <select class="gps_ubx_sbas">
-                                                <!-- list generated here -->
-                                            </select>
-                                            <span i18n="configurationGPSubxSbas"></span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <!-- END GPS-->
-                </div> <!-- END grid-col col6 -->
-
-                <div class="grid-col col6">
-
-                    <!-- BOARD ORIENTATION -->
-                    <div class="board acc">
-                        <div class="gui_box grey">
-                            <div class="gui_box_titlebar">
-                                <div class="spacer_box_title" i18n="configurationBoardAlignment"></div>
-                                <div class="helpicon cf_tip" i18n_title="configHelp2"></div>
-                            </div>
-                            <div class="spacer_box">
-                               <div class="board_align_content">
-                                    <div class="board_align_inputs">
-                                        <div class="alignicon roll"></div>
-                                        <label>
-                                            <input type="number" name="board_align_roll" step="1" min="-180" max="360" />
-                                            <span i18n="configurationBoardAlignmentRoll"></span>
-                                        </label>
-                                    </div>
-
-                                    <div class="board_align_inputs">
-                                        <div class="alignicon pitch"></div>
-                                        <label>
-                                            <input type="number" name="board_align_pitch" step="1" min="-180" max="360" />
-                                            <span i18n="configurationBoardAlignmentPitch"></span>
-                                        </label>
-                                    </div>
-
-                                    <div class="board_align_inputs">
-                                        <div class="alignicon yaw"></div>
-                                        <label>
-                                            <input type="number" name="board_align_yaw" step="1" min="-180" max="360" />
-                                            <span i18n="configurationBoardAlignmentYaw"></span>
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="gyro_align_content">
-                                    <div class="gyro_alignment_inputs gyro_alignment_inputs_selection">
-                                        <label>
-                                            <select class="gyro_to_use">
-                                                <!-- list generated here -->
-                                            </select>
-                                            <span i18n="configurationSensorGyroToUse"></span>
-                                        </label>
-                                    </div>
-                                    <div class="gyro_alignment_inputs gyro_alignment_inputs_first">
-                                        <label>
-                                            <span>
-                                                <select class="gyro_1_align">
-                                                    <option i18n="configurationSensorAlignmentDefaultOption" value="0"></option>
-                                                    <!-- list generated here -->
-                                                </select>
-                                                <span i18n="configurationSensorAlignmentGyro1"></span>
-                                            </span>
-                                        </label>
-                                    </div>
-                                    <div class="gyro_alignment_inputs gyro_alignment_inputs_second">
-                                        <label>
-                                            <select class="gyro_2_align">
-                                                <option i18n="configurationSensorAlignmentDefaultOption" value="0"></option>
-                                                <!-- list generated here -->
-                                            </select>
-                                            <span i18n="configurationSensorAlignmentGyro2"></span>
-                                        </label>
-                                    </div>
-                                    <div class="gyro_alignment_inputs gyro_alignment_inputs_notfound">
-                                        <span class="message-negative" i18n="configurationSensorGyroToUseNotFound"></span>
-                                    </div>
-                                </div>
-                                <div class="sensor_align_content">
-                                    <div class="legacy_gyro_alignment select">
-                                        <label>
-                                            <span i18n="configurationSensorAlignmentGyro"></span>
-                                            <select class="gyroalign">
-                                                <option i18n="configurationSensorAlignmentDefaultOption" value="0"></option>
-                                                <!-- list generated here -->
-                                            </select>
-                                        </label>
-                                    </div>
-                                    <div class="legacy_accel_alignment select">
-                                        <label>
-                                            <span i18n="configurationSensorAlignmentAcc"></span>
-                                            <select class="accalign">
-                                                <option i18n="configurationSensorAlignmentDefaultOption" value="0"></option>
-                                                <!-- list generated here -->
-                                            </select>
-                                        </label>
-                                    </div>
-                                    <div class="select">
-                                        <label>
-                                            <span i18n="configurationSensorAlignmentMag"></span>
-                                            <select class="magalign">
-                                                <option value="0" i18n="configurationSensorAlignmentDefaultOption"></option>
-                                                <!-- list generated here -->
-                                            </select>
-                                        </label>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- ACCELEROMETER TRIM -->
-                    <div class="gui_box grey accelNeeded">
+                <!-- DSHOT BEEPER -->
+                <div class="dshotBeeper">
+                    <div class="gui_box grey">
                         <div class="gui_box_titlebar">
-                            <div class="spacer_box_title" i18n="configurationAccelTrims"></div>
+                            <div class="spacer_box_title" i18n="configurationDshotBeeper"></div>
+                            <div class="helpicon cf_tip" i18n_title="configurationDshotBeaconHelp"></div>
                         </div>
                         <div class="spacer_box">
-                            <div class="number">
-                                <label> <input type="number" name="roll" min="-300" max="300" /> <span
-                                    i18n="configurationAccelTrimRoll"></span>
-                                </label>
-                            </div>
-                            <div class="number">
-                                <label> <input type="number" name="pitch" min="-300" max="300" /> <span
-                                    i18n="configurationAccelTrimPitch"></span>
-                                </label>
-                            </div>
+                            <table>
+                                <tbody class="dshot-beeper-configuration" id="noline">
+                                    <tr class="dshotBeaconSwitch">
+                                        <td>
+                                            <div class="number">
+                                                <div style="float: left; height: 20px; margin-right: 34px;">
+                                                    <input class="dshot-beeper toggle" id="dshotBeeperSwitch" type="checkbox" />
+                                                </div>
+                                                <span i18n="configurationUseDshotBeeper"></span>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr class="dshotbeacon">
+                                        <td>
+                                            <div class="select">
+                                                <div style="float: left; height: 20px; margin-right: 10px;">
+                                                    <select class="dshotBeeperBeaconTone">
+                                                        <option value="0" hidden></option>
+                                                        <!-- list generated here -->
+                                                    </select>
+                                                </div>
+                                                <span i18n="configurationDshotBeaconTone"></span>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <table>
+                                <tbody class="dshotBeaconConditions" id="noline">
+                                    <!-- table generated here -->
+                                </tbody>
+                            </table>
                         </div>
-                    </div> <!-- END ACCELEROMETER TRIM -->
+                    </div>
+                </div>
 
-                    <!-- DSHOT BEEPER -->
-                    <div class="dshotBeeper">
+                <div class="beepers">
+                    <!-- BEEPER -->
+                    <div class="beepers">
                         <div class="gui_box grey">
                             <div class="gui_box_titlebar">
-                                <div class="spacer_box_title" i18n="configurationDshotBeeper"></div>
-                                <div class="helpicon cf_tip" i18n_title="configurationDshotBeaconHelp"></div>
+                                <div class="spacer_box_title" i18n="configurationBeeper"></div>
                             </div>
                             <div class="spacer_box">
                                 <table>
-                                    <tbody class="dshot-beeper-configuration" id="noline">
-                                        <tr class="dshotBeaconSwitch">
+                                    <tbody class="beeper-configuration" id="noline">
+                                        <tr class="beeper-template" style="display:none">
                                             <td>
-                                                <div class="number">
-                                                    <div style="float: left; height: 20px; margin-right: 34px;">
-                                                        <input class="dshot-beeper toggle" id="dshotBeeperSwitch" type="checkbox" />
-                                                    </div>
-                                                    <span i18n="configurationUseDshotBeeper"></span>
-                                                </div>
+                                                <input class="condition toggle" id="" name="" title="" type="checkbox" />
+                                            </td>
+                                            <td>
+                                                <div></div>
+                                                <span class="xs"></span>
+                                            </td>
+                                            <td>
+                                                <span class="sm-min"></span>
                                             </td>
                                         </tr>
-                                        <tr class="dshotbeacon">
-                                            <td>
-                                                <div class="select">
-                                                    <div style="float: left; height: 20px; margin-right: 10px;">
-                                                        <select class="dshotBeeperBeaconTone">
-                                                            <option value="0" hidden></option>
-                                                            <!-- list generated here -->
-                                                        </select>
-                                                    </div>
-                                                    <span i18n="configurationDshotBeaconTone"></span>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                                <table>
-                                    <tbody class="dshotBeaconConditions" id="noline">
                                         <!-- table generated here -->
                                     </tbody>
                                 </table>
                             </div>
                         </div>
                     </div>
-
-                    <div class="beepers">
-                        <!-- BEEPER -->
-                        <div class="beepers">
-                            <div class="gui_box grey">
-                                <div class="gui_box_titlebar">
-                                    <div class="spacer_box_title" i18n="configurationBeeper"></div>
-                                </div>
-                                <div class="spacer_box">
-                                    <table>
-                                        <tbody class="beeper-configuration" id="noline">
-                                            <tr class="beeper-template" style="display:none">
-                                                <td>
-                                                    <input class="condition toggle" id="" name="" title="" type="checkbox" />
-                                                </td>
-                                                <td>
-                                                    <div></div>
-                                                    <span class="xs"></span>
-                                                </td>
-                                                <td>
-                                                    <span class="sm-min"></span>
-                                                </td>
-                                            </tr>
-                                            <!-- table generated here -->
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/tabs/firmware_flasher.html b/src/tabs/firmware_flasher.html
index bfb3951a..a5b01adf 100644
--- a/src/tabs/firmware_flasher.html
+++ b/src/tabs/firmware_flasher.html
@@ -206,7 +206,7 @@
                     <div style="width: 49%; float: left;">
                         <strong i18n="firmwareFlasherBuildCustomDefines"></strong>
                         <div id="customDefinesInfo" class="build-options-wrapper">
-                            <input id="customDefines" name="customDefines"></input>
+                            <input id="customDefines" name="customDefines" />
                             <div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherCustomDefinesDescription"></div>
                         </div>
                     </div>
diff --git a/src/tabs/gps.html b/src/tabs/gps.html
index a93579b8..04b5e6ed 100644
--- a/src/tabs/gps.html
+++ b/src/tabs/gps.html
@@ -66,7 +66,7 @@
                         <div class="default_btn" style="width:50px; margin-left:auto; margin-right:auto; float:none;"><a id="check">retry</a></div>
                     </div>
                     <div id="waiting" >
-                        <div class="info" i18n="gpsMapMessage2"></span>
+                        <div class="info" i18n="gpsMapMessage2">
                         </div>
                     </div>
                     <div id="loadmap">
diff --git a/src/tabs/landing.html b/src/tabs/landing.html
index 488af976..1fa5bacb 100644
--- a/src/tabs/landing.html
+++ b/src/tabs/landing.html
@@ -28,7 +28,6 @@
                         <a href="https://paypal.me/betaflight" rel="noopener noreferrer"
                             target="_blank" i18n_title="defaultDonate"><img src="./images/btn-donate.png" alt="Paypal"
                             height="30" /></a>
-                        </li>
                     </div>
                     <div i18n="defaultDonateBottom"></div>
                 </div>
diff --git a/src/tabs/pid_tuning.html b/src/tabs/pid_tuning.html
index f33295e5..3118e881 100644
--- a/src/tabs/pid_tuning.html
+++ b/src/tabs/pid_tuning.html
@@ -1696,23 +1696,22 @@
                                         <label>
                                             <span i18n="pidTuningMaxCutoffFrequency"></span>
                                         </label>
-                                        </span>
+                                    </span>
                     
-                                        <span class="suboption dynamic">
-                                            <span class="inputValue"><input type="number" name="dtermLowpassExpo" step="1" min="1" max="10"/></span>
-                                            <label>
-                                                <span i18n="pidTuningDTermLowpassDynExpo"></span>
-                                            </label>
-                                        </span>
-    
-                                        <span class="suboption">
-                                            <select name="dtermLowpassType">
-                                                <!--  Populated on execution -->
-                                            </select>
-                                            <label>
-                                                <span i18n="pidTuningLowpassFilterType"></span>
-                                            </label>
-                                        </span>
+                                    <span class="suboption dynamic">
+                                        <span class="inputValue"><input type="number" name="dtermLowpassExpo" step="1" min="1" max="10"/></span>
+                                        <label>
+                                            <span i18n="pidTuningDTermLowpassDynExpo"></span>
+                                        </label>
+                                    </span>
+
+                                    <span class="suboption">
+                                        <select name="dtermLowpassType">
+                                            <!--  Populated on execution -->
+                                        </select>
+                                        <label>
+                                            <span i18n="pidTuningLowpassFilterType"></span>
+                                        </label>
                                     </span>
                                 </td>
                             </tr>