diff --git a/tabs/cli.html b/tabs/cli.html
index 5bae7795..d3f36e88 100644
--- a/tabs/cli.html
+++ b/tabs/cli.html
@@ -1,13 +1,13 @@
 <div class="tab-cli">
-    
-    <div class="note" style="margin-bottom:20px;">
-          <div class="note_spacer"><p i18n="cliInfo"></p></div>
-        </div>     
-         
-    <div class="backdrop">
-      <div class="window">
-          <div class="wrapper"></div>
-      </div>
+  <div class="note" style="margin-bottom:20px;">
+    <div class="note_spacer">
+      <p i18n="cliInfo"></p>
     </div>
-    <textarea name="commands" i18n_placeholder="cliInputPlaceholder" rows="1" cols="0"></textarea>
+  </div>
+  <div class="backdrop">
+    <div class="window">
+      <div class="wrapper"></div>
+    </div>
+  </div>
+  <textarea name="commands" i18n_placeholder="cliInputPlaceholder" rows="1" cols="0"></textarea>
 </div>
\ No newline at end of file
diff --git a/tabs/configuration.html b/tabs/configuration.html
index f1eb99bb..9610f9ea 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -1,443 +1,431 @@
-
 <div class="tab-configuration">
-  
-  
-   <div class="tab_title" i18n="tabConfiguration">Configuration</div>
- <div class="cf_doc_version_bt">
-	<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a></div>
-
-     <div class="note" style="margin-bottom:20px;">
-          <div class="note_spacer"><p i18n="configurationFeaturesHelp"></p></div>
-        </div>
-        
-    
-
-    <div class="leftWrapper mixer">
+  <div class="tab_title" i18n="tabConfiguration">Configuration</div>
+  <div class="cf_doc_version_bt">
+    <a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
+  </div>
+  <div class="note" style="margin-bottom:20px;">
+    <div class="note_spacer">
+      <p i18n="configurationFeaturesHelp"></p>
+    </div>
+  </div>
+  <div class="leftWrapper mixer">
     <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationMixer"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
-
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationMixer"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
         <div class="mixerPreview">
-            <img src="./resources/motor_order/custom.svg" />
+          <img src="./resources/motor_order/custom.svg" />
         </div>
         <select class="mixerList">
-            <!-- list generated here -->
+          <!-- list generated here -->
         </select>
+      </div>
     </div>
-    
-        </div></div>
-
-    
-    
-    <div class="rightWrapper motorstop">        
-        
-            <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationEscFeatures"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
-
-
+  </div>
+  <div class="rightWrapper motorstop">
+    <div class="gui_box grey">
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationEscFeatures"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
         <table cellpadding="0" cellspacing="0">
-            <thead style="display:none;">
-                <tr>
-                    <th i18n="configurationFeatureEnabled"></th>
-                    <th i18n="configurationFeatureDescription"></th>
-                    <th i18n="configurationFeatureName"></th>
-                </tr>
-            </thead>
-            <tbody class="features esc">
-                <!-- table generated here -->
-            </tbody>
+          <thead style="display:none;">
+            <tr>
+              <th i18n="configurationFeatureEnabled"></th>
+              <th i18n="configurationFeatureDescription"></th>
+              <th i18n="configurationFeatureName"></th>
+            </tr>
+          </thead>
+          <tbody class="features esc">
+            <!-- table generated here -->
+          </tbody>
         </table>
         <!--   -->
         <div class="disarm">
-            
-            <div class="checkbox">
-                <label><div style="float:left; width:57px; height:20px;">
-                        <input type="checkbox" name="disarmkillswitch" id="toggle"/></div>
-                    <div class="freelabel" i18n="configurationDisarmKillSwitch"></div>
-                </label>
-            </div> 
-            <div class="number disarmdelay" style="display:none; margin-bottom:5px;">
-                <label><div class="numberspacer">
-                    <input type="number" name="autodisarmdelay" min="0" max="60" /></div>
-                    <span i18n="configurationAutoDisarmDelay"></span>
-                </label>
-            </div>
-        </div>       
+          <div class="checkbox">
+            <label>
+              <div style="float:left; width:57px; height:20px;">
+                <input type="checkbox" name="disarmkillswitch" id="toggle"/>
+              </div>
+              <div class="freelabel" i18n="configurationDisarmKillSwitch"></div>
+            </label>
+          </div>
+          <div class="number disarmdelay" style="display:none; margin-bottom:5px;">
+            <label>
+              <div class="numberspacer">
+                <input type="number" name="autodisarmdelay" min="0" max="60" />
+              </div>
+              <span i18n="configurationAutoDisarmDelay"></span>
+            </label>
+          </div>
+        </div>
         <!--   -->
         <div class="number">
-            <label><div class="numberspacer">
-                <input type="number" name="minthrottle" min="0" max="2000" />
-               </div> <span i18n="configurationThrottleMinimum"></span>
-            </label>
+          <label>
+            <div class="numberspacer">
+              <input type="number" name="minthrottle" min="0" max="2000" />
+            </div>
+            <span i18n="configurationThrottleMinimum"></span>
+          </label>
         </div>
         <div class="number">
-            <label><div class="numberspacer">
-                <input type="number" name="midthrottle" min="0" max="2000" />
-                </div><span i18n="configurationThrottleMid"></span>
-            </label>
+          <label>
+            <div class="numberspacer">
+              <input type="number" name="midthrottle" min="0" max="2000" />
+            </div>
+            <span i18n="configurationThrottleMid"></span>
+          </label>
         </div>
         <div class="number">
-            <label><div class="numberspacer">
-                <input type="number" name="maxthrottle" min="0" max="2000" />
-                </div><span i18n="configurationThrottleMaximum"></span>
-            </label>
+          <label>
+            <div class="numberspacer">
+              <input type="number" name="maxthrottle" min="0" max="2000" />
+            </div>
+            <span i18n="configurationThrottleMaximum"></span>
+          </label>
         </div>
         <div class="number">
-            <label><div class="numberspacer">
+          <label>
+            <div class="numberspacer">
               <input type="number" name="mincommand" min="0" max="2000" />
-               </div><span i18n="configurationThrottleMinimumCommand"></span>
-            </label>
+            </div>
+            <span i18n="configurationThrottleMinimumCommand"></span>
+          </label>
         </div>
+      </div>
     </div>
-    
-    
-    
-    
-    </div></div>
-    
-    
-    
-  
-    
-    
-    <div class="clear-both"></div>
-    
-    <div class="leftWrapper">
-    
-     <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationBoardAlignment"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
+  </div>
+  <div class="clear-both"></div>
+  <div class="leftWrapper">
+    <div class="gui_box grey">
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationBoardAlignment"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
         <div class="number">
-            <label>
-                <input type="number" name="board_align_roll" step="1" min="-180" max="360" />
-                <span i18n="configurationBoardAlignmentRoll"></span>
-            </label>
+          <label>
+          <input type="number" name="board_align_roll" step="1" min="-180" max="360" />
+          <span i18n="configurationBoardAlignmentRoll"></span>
+          </label>
         </div>
         <div class="number">
-            <label>
-                <input type="number" name="board_align_pitch" step="1" min="-180" max="360" />
-                <span i18n="configurationBoardAlignmentPitch"></span>
-            </label>
+          <label>
+          <input type="number" name="board_align_pitch" step="1" min="-180" max="360" />
+          <span i18n="configurationBoardAlignmentPitch"></span>
+          </label>
         </div>
         <div class="number">
-            <label>
-                <input type="number" name="board_align_yaw" step="1" min="-180" max="360" />
-                <span i18n="configurationBoardAlignmentYaw"></span>
-            </label>
+          <label>
+          <input type="number" name="board_align_yaw" step="1" min="-180" max="360" />
+          <span i18n="configurationBoardAlignmentYaw"></span>
+          </label>
         </div>
-    </div></div></div>
-    
-    
-    <div class="rightWrapper acc">
-     <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationAccelTrims"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
+      </div>
+    </div>
+  </div>
+  <div class="rightWrapper acc">
+    <div class="gui_box grey">
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationAccelTrims"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
         <div class="number">
-            <label>
-                <input type="number" name="roll"   min="-300" max="300" />
-                <span i18n="configurationAccelTrimRoll"></span>
-            </label>
+          <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>
+          <label>
+          <input type="number" name="pitch" min="-300" max="300" />
+          <span i18n="configurationAccelTrimPitch"></span>
+          </label>
         </div>
-    </div></div></div>
-    
-    
-    <div class="clear-both"></div>
-    
-    <div class="leftWrapper">
-      <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationReceiver"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
+      </div>
+    </div>
+  </div>
+  <div class="clear-both"></div>
+  <div class="leftWrapper">
+    <div class="gui_box grey">
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationReceiver"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
         <table cellpadding="0" cellspacing="0">
-            <thead>
-                <tr>
-                    <th i18n="configurationFeatureEnabled"></th>
-                    <th i18n="configurationFeatureDescription"></th>
-                    <th i18n="configurationFeatureName"></th>
-                </tr>
-            </thead>
-            <tbody class="features rxMode">
-                <!-- table generated here -->
-            </tbody>
+          <thead>
+            <tr>
+              <th i18n="configurationFeatureEnabled"></th>
+              <th i18n="configurationFeatureDescription"></th>
+              <th i18n="configurationFeatureName"></th>
+            </tr>
+          </thead>
+          <tbody class="features rxMode">
+            <!-- table generated here -->
+          </tbody>
         </table>
-                
-                     </div></div>
-
-                
-                
-                 <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationSerialRX"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
-<div class="note">
-          <div class="note_spacer"><p i18n="configurationSerialRXHelp"></p></div>        </div>
-          
+      </div>
+    </div>
+    <div class="gui_box grey">
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationSerialRX"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
+        <div class="note">
+          <div class="note_spacer">
+            <p i18n="configurationSerialRXHelp"></p>
+          </div>
+        </div>
         <select class="serialRX" size="4">
-            <!-- list generated here -->
+          <!-- list generated here -->
         </select>
-        
-        
-        </div></div>
-       
-        
-          <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationFailsafe"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
-        <table cellpadding="0" cellspacing="0">
-            <thead>
-                <tr>
-                    <th i18n="configurationFeatureEnabled"></th>
-                    <th i18n="configurationFeatureDescription"></th>
-                    <th i18n="configurationFeatureName"></th>
-                </tr>
-            </thead>
-            <tbody class="features rxFailsafe">
-                <!-- table generated here -->
-            </tbody>
-        </table>
-        <div class="number">
-            <label>
-                <input type="number" name="failsafe_throttle" min="0" max="2000" />
-                <span i18n="configurationThrottleFailsafe"></span>
-            </label>
-        </div>
+      </div>
     </div>
-    </div></div>
-    
-     
-     
-     
-    <div class="rightWrapper current voltage">
-    
     <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationBatteryVoltage"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationFailsafe"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
         <table cellpadding="0" cellspacing="0">
-            <thead>
-                <tr>
-                    <th i18n="configurationFeatureEnabled"></th>
-                    <th i18n="configurationFeatureDescription"></th>
-                    <th i18n="configurationFeatureName"></th>
-                </tr>
-            </thead>
-            <tbody class="features batteryVoltage">
-                <!-- table generated here -->
-            </tbody>
+          <thead>
+            <tr>
+              <th i18n="configurationFeatureEnabled"></th>
+              <th i18n="configurationFeatureDescription"></th>
+              <th i18n="configurationFeatureName"></th>
+            </tr>
+          </thead>
+          <tbody class="features rxFailsafe">
+            <!-- table generated here -->
+          </tbody>
         </table>
-        
         <div class="number">
-            <label>
-                <input type="number" name="mincellvoltage" step="0.1" min="1" max="5" />
-                <span i18n="configurationBatteryMinimum"></span>
-            </label>
+          <label>
+          <input type="number" name="failsafe_throttle" min="0" max="2000" />
+          <span i18n="configurationThrottleFailsafe"></span>
+          </label>
         </div>
-        <div class="number">
-            <label>
-                <input type="number" name="maxcellvoltage" step="0.1" min="1" max="5" />
-                <span i18n="configurationBatteryMaximum"></span>
-            </label>
-        </div>
-        <div class="number">
-            <label>
-                <input type="number" name="warningcellvoltage" step="0.1" min="1" max="5" />
-                <span i18n="configurationBatteryWarning"></span>
-            </label>
-        </div>
-        <div class="number">
-            <label>
-                <input type="number" name="voltagescale" step="1" min="10" max="255" />
-                <span i18n="configurationBatteryScale"></span>
-            </label>
-        </div></div></div>
-        
-        
+      </div>
+    </div>
+  </div>
+  <div class="rightWrapper current voltage">
     <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationCurrent"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationBatteryVoltage"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
         <table cellpadding="0" cellspacing="0">
-            <thead>
-                <tr>
-                    <th i18n="configurationFeatureEnabled"></th>
-                    <th i18n="configurationFeatureDescription"></th>
-                    <th i18n="configurationFeatureName"></th>
-                </tr>
-            </thead>
-            <tbody class="features batteryCurrent">
-                <!-- table generated here -->
-            </tbody>
-        </table>        
+          <thead>
+            <tr>
+              <th i18n="configurationFeatureEnabled"></th>
+              <th i18n="configurationFeatureDescription"></th>
+              <th i18n="configurationFeatureName"></th>
+            </tr>
+          </thead>
+          <tbody class="features batteryVoltage">
+            <!-- table generated here -->
+          </tbody>
+        </table>
         <div class="number">
-            <label>
-                <input type="number" name="currentscale" step="1" min="-1000" max="1000" />
-                <span i18n="configurationCurrentScale"></span>
-            </label>
+          <label>
+          <input type="number" name="mincellvoltage" step="0.1" min="1" max="5" />
+          <span i18n="configurationBatteryMinimum"></span>
+          </label>
         </div>
         <div class="number">
-            <label>
-                <input type="number" name="currentoffset" step="1" min="0" max="3300" />
-                <span i18n="configurationCurrentOffset"></span>
-            </label>
+          <label>
+          <input type="number" name="maxcellvoltage" step="0.1" min="1" max="5" />
+          <span i18n="configurationBatteryMaximum"></span>
+          </label>
+        </div>
+        <div class="number">
+          <label>
+          <input type="number" name="warningcellvoltage" step="0.1" min="1" max="5" />
+          <span i18n="configurationBatteryWarning"></span>
+          </label>
+        </div>
+        <div class="number">
+          <label>
+          <input type="number" name="voltagescale" step="1" min="10" max="255" />
+          <span i18n="configurationBatteryScale"></span>
+          </label>
+        </div>
+      </div>
+    </div>
+    <div class="gui_box grey">
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationCurrent"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
+        <table cellpadding="0" cellspacing="0">
+          <thead>
+            <tr>
+              <th i18n="configurationFeatureEnabled"></th>
+              <th i18n="configurationFeatureDescription"></th>
+              <th i18n="configurationFeatureName"></th>
+            </tr>
+          </thead>
+          <tbody class="features batteryCurrent">
+            <!-- table generated here -->
+          </tbody>
+        </table>
+        <div class="number">
+          <label>
+          <input type="number" name="currentscale" step="1" min="-1000" max="1000" />
+          <span i18n="configurationCurrentScale"></span>
+          </label>
+        </div>
+        <div class="number">
+          <label>
+          <input type="number" name="currentoffset" step="1" min="0" max="3300" />
+          <span i18n="configurationCurrentOffset"></span>
+          </label>
         </div>
         <div class="checkbox">
-            <label><div class="numberspacer">
-                    <input type="checkbox" name="multiwiicurrentoutput" id="toggle"/></div>
-                <span i18n="configurationBatteryMultiwiiCurrent"></span>
-            </label>
+          <label>
+            <div class="numberspacer">
+              <input type="checkbox" name="multiwiicurrentoutput" id="toggle"/>
+            </div>
+            <span i18n="configurationBatteryMultiwiiCurrent"></span>
+          </label>
         </div>
-    </div></div></div>
-    
-    
-    <div class="clear-both"></div>
-    
-    <div class="leftWrapper rssi">
-     <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationRSSI"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
-
-        <table cellpadding="0" cellspacing="0">
-            <thead>
-                <tr>
-                    <th i18n="configurationFeatureEnabled"></th>
-                    <th i18n="configurationFeatureDescription"></th>
-                    <th i18n="configurationFeatureName"></th>
-                </tr>
-            </thead>
-            <tbody class="features rssi">
-                <!-- table generated here -->
-            </tbody>
-        </table>
+      </div>
     </div>
-    
-    </div></div>
-    
-    
-    
-    <div class="rightWrapper system">
-    <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationSystem"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
-<div class="note">
-          <div class="note_spacer"><p i18n="configurationLoopTimeHelp"></p></div></div>
-          
-                  <div class="number">
-            <label>
-                <input type="number" name="looptime" step="100" min="0" max="9000"/>
-                <span i18n="configurationLoopTime"></span>
-            </label>
-        </div>
-        <div class="number">
-            <label>
-                <input type="text" name="looptimehz" readonly class="disabled"/>
-                <span i18n="configurationCalculatedCyclesSec"></span>
-            </label>
-        </div>
-         
-    </div></div></div>
-    
-    <div class="clear-both"></div>
-    
-    <div class="leftWrapper gps">
-    <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationGPS"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
-
-    <div class="note">
-          <div class="note_spacer"><p i18n="configurationGPSHelp"></p></div>
-        </div>
-        
-        
-            <table cellpadding="0" cellspacing="0">
-            <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="line">
-            <select class="gps_protocol">
-                <!-- list generated here -->
-            </select>
-            <span i18n="configurationGPSProtocol"></span>
-        </div>
-        <div class="line">
-            <select class="gps_baudrate">
-                <!-- list generated here -->
-            </select>
-            <span i18n="configurationGPSBaudrate"></span>
-        </div>
-        <div class="line">
-            <select class="gps_ubx_sbas">
-                <!-- list generated here -->
-            </select>
-            <span i18n="configurationGPSubxSbas"></span>
-        </div>
-        <div class="number">
-            <label>
-                <input type="number" name="mag_declination" step="0.1" min="-180" max="180" />
-                <span i18n="configurationMagDeclination"></span>
-            </label>
-        </div>
-        
-        
-        
-        
-       </div></div>
-        
-    </div>
-    <div class="rightWrapper">
-    
-    <div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="configurationFeatures"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-
-
-        <table cellpadding="0" cellspacing="0">
-            <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>
+  </div>
   <div class="clear-both"></div>
-  
-
-
-<div class="fixed_band"><div class="save_btn"><a class="save" href="#" i18n="configurationButtonSave"></a>
-</div></div>
-
-</div>
-
-
-
-
-
-
+  <div class="leftWrapper rssi">
+    <div class="gui_box grey">
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationRSSI"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
+        <table cellpadding="0" cellspacing="0">
+          <thead>
+            <tr>
+              <th i18n="configurationFeatureEnabled"></th>
+              <th i18n="configurationFeatureDescription"></th>
+              <th i18n="configurationFeatureName"></th>
+            </tr>
+          </thead>
+          <tbody class="features rssi">
+            <!-- table generated here -->
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+  <div class="rightWrapper system">
+    <div class="gui_box grey">
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationSystem"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
+        <div class="note">
+          <div class="note_spacer">
+            <p i18n="configurationLoopTimeHelp"></p>
+          </div>
+        </div>
+        <div class="number">
+          <label>
+          <input type="number" name="looptime" step="100" min="0" max="9000"/>
+          <span i18n="configurationLoopTime"></span>
+          </label>
+        </div>
+        <div class="number">
+          <label>
+          <input type="text" name="looptimehz" readonly class="disabled"/>
+          <span i18n="configurationCalculatedCyclesSec"></span>
+          </label>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="clear-both"></div>
+  <div class="leftWrapper gps">
+    <div class="gui_box grey">
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationGPS"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
+        <div class="note">
+          <div class="note_spacer">
+            <p i18n="configurationGPSHelp"></p>
+          </div>
+        </div>
+        <table cellpadding="0" cellspacing="0">
+          <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="line">
+          <select class="gps_protocol">
+            <!-- list generated here -->
+          </select>
+          <span i18n="configurationGPSProtocol"></span>
+        </div>
+        <div class="line">
+          <select class="gps_baudrate">
+            <!-- list generated here -->
+          </select>
+          <span i18n="configurationGPSBaudrate"></span>
+        </div>
+        <div class="line">
+          <select class="gps_ubx_sbas">
+            <!-- list generated here -->
+          </select>
+          <span i18n="configurationGPSubxSbas"></span>
+        </div>
+        <div class="number">
+          <label>
+          <input type="number" name="mag_declination" step="0.1" min="-180" max="180" />
+          <span i18n="configurationMagDeclination"></span>
+          </label>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="rightWrapper">
+    <div class="gui_box grey">
+      <div class="gui_box_titlebar">
+        <div class="spacer_box_title" i18n="configurationFeatures"></div>
+        <div class="helpicon"></div>
+      </div>
+      <div class="spacer_box">
+        <table cellpadding="0" cellspacing="0">
+          <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>
+  <div class="clear-both"></div>
+  <div class="fixed_band">
+    <div class="save_btn"><a class="save" href="#" i18n="configurationButtonSave"></a></div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/tabs/firmware_flasher.html b/tabs/firmware_flasher.html
index 26d011d7..4fa8551d 100755
--- a/tabs/firmware_flasher.html
+++ b/tabs/firmware_flasher.html
@@ -1,96 +1,93 @@
 <div class="tab-firmware_flasher">
-    <div class="options">
-        <div class="option releases">
-            <select name="release">
-                <option value="0">Loading ...</option>
-            </select>
-            <span class="description" i18n="firmwareFlasherOnlineReleasesDescription"></span>
-        </div>
-        <div class="option">
-            <label>
-                <input class="updating" type="checkbox" id="toggle" />
-                <span i18n="firmwareFlasherNoReboot"></span>
-            </label>
-            <span class="description" i18n="firmwareFlasherNoRebootDescription"></span>
-        </div>
-        <div class="option flash_on_connect_wrapper">
-            <label>
-                <input class="flash_on_connect" type="checkbox" id="toggle"  />
-                <span i18n="firmwareFlasherFlashOnConnect"></span>
-            </label>
-            <span class="description" i18n="firmwareFlasherFlashOnConnectDescription"></span>
-        </div>
-        <div class="option">
-            <label>
-                <input class="erase_chip" type="checkbox" id="toggle"  />
-                <span i18n="firmwareFlasherFullChipErase"></span>
-            </label>
-            <span class="description" i18n="firmwareFlasherFullChipEraseDescription"></span>
-        </div>
-        <div class="option manual_baud_rate">
-            <label>
-                <input class="flash_manual_baud" type="checkbox" id="toggle" />
-                <span i18n="firmwareFlasherManualBaud"></span>
-                <select id="flash_manual_baud_rate" title="Baud Rate">
-                    <option value="921600">921600</option>
-                    <option value="460800">460800</option>
-                    <option value="256000" selected="selected">256000</option>
-                    <option value="230400">230400</option>
-                    <option value="115200">115200</option>
-                    <option value="57600">57600</option>
-                    <option value="38400">38400</option>
-                    <option value="28800">28800</option>
-                    <option value="19200">19200</option>
-                </select>
-            </label>
-            <span class="description" i18n="firmwareFlasherManualBaudDescription"></span>
-        </div>
-        <div class="option">
-            <label>
-                <input class="show_development_releases" type="checkbox" id="toggle" />
-                <span i18n="firmwareFlasherShowDevelopmentReleases"></span>
-            </label>
-            <span class="description" i18n="firmwareFlasherShowDevelopmentReleasesDescription"></span>
-        </div>
+  <div class="options">
+    <div class="option releases">
+      <select name="release">
+        <option value="0">Loading ...</option>
+      </select>
+      <span class="description" i18n="firmwareFlasherOnlineReleasesDescription"></span>
     </div>
-    <div class="clear-both"></div>
-    <div class="git_info">
-        <div class="title" i18n="firmwareFlasherGithubInfoHead"></div>
-        <p>
-            <strong i18n="firmwareFlasherHash"></strong> <a i18n_title="firmwareFlasherUrl" class="hash" href="#" target="_blank"></a><br />
-            <strong i18n="firmwareFlasherCommiter"></strong> <span class="committer"></span><br />
-            <strong i18n="firmwareFlasherDate"></strong> <span class="date"></span><br />
-            <strong i18n="firmwareFlasherMessage"></strong> <span class="message"></span>
-        </p>
+    <div class="option">
+      <label>
+      <input class="updating" type="checkbox" id="toggle" />
+      <span i18n="firmwareFlasherNoReboot"></span>
+      </label>
+      <span class="description" i18n="firmwareFlasherNoRebootDescription"></span>
     </div>
-    <div class="release_info">
-        <div class="title" i18n="firmwareFlasherReleaseSummaryHead"></div>
-        <p>
-            <strong i18n="firmwareFlasherReleaseTarget"></strong> <span class="target"></span><br />
-            <strong i18n="firmwareFlasherReleaseName"></strong> <a i18n_title="firmwareFlasherReleaseUrl" class="name" href="#" target="_blank"></a><br />
-            <strong i18n="firmwareFlasherReleaseFile"></strong> <a i18n_title="firmwareFlasherReleaseFileUrl" class="file" href="#" target="_blank"></a><br />
-            <strong i18n="firmwareFlasherReleaseDate"></strong> <span class="date"></span><br />
-            <strong i18n="firmwareFlasherReleaseStatus"></strong> <span class="status"></span><br />
-            <strong i18n="firmwareFlasherReleaseNotes"></strong> <br />
-            <div class=notes></div>
-        </p>
+    <div class="option flash_on_connect_wrapper">
+      <label>
+      <input class="flash_on_connect" type="checkbox" id="toggle"  />
+      <span i18n="firmwareFlasherFlashOnConnect"></span>
+      </label>
+      <span class="description" i18n="firmwareFlasherFlashOnConnectDescription"></span>
     </div>
-    
-    <div class="warning">
-        <div class="title" i18n="firmwareFlasherWarninghead"></div>
-        <p i18n="firmwareFlasherWarningText">
-        <p i18n="firmwareFlasherTargetWarning">
-        </p>
+    <div class="option">
+      <label>
+      <input class="erase_chip" type="checkbox" id="toggle"  />
+      <span i18n="firmwareFlasherFullChipErase"></span>
+      </label>
+      <span class="description" i18n="firmwareFlasherFullChipEraseDescription"></span>
     </div>
-    
-    <div class="info">
-        <progress class="progress" value="0" min="0" max="100"></progress>
-        <span class="progressLabel" i18n="firmwareFlasherLoadFirmwareFile"></span>
+    <div class="option manual_baud_rate">
+      <label>
+        <input class="flash_manual_baud" type="checkbox" id="toggle" />
+        <span i18n="firmwareFlasherManualBaud"></span>
+        <select id="flash_manual_baud_rate" title="Baud Rate">
+          <option value="921600">921600</option>
+          <option value="460800">460800</option>
+          <option value="256000" selected="selected">256000</option>
+          <option value="230400">230400</option>
+          <option value="115200">115200</option>
+          <option value="57600">57600</option>
+          <option value="38400">38400</option>
+          <option value="28800">28800</option>
+          <option value="19200">19200</option>
+        </select>
+      </label>
+      <span class="description" i18n="firmwareFlasherManualBaudDescription"></span>
     </div>
-    
-    <div class="buttons">
-        <a class="load_file" href="#" i18n="firmwareFlasherButtonLoadLocal"></a>
-        <a class="load_remote_file locked" href="#" i18n="firmwareFlasherButtonLoadOnline"></a>
-        <a class="flash_firmware locked" href="#" i18n="firmwareFlasherFlashFirmware"></a>
+    <div class="option">
+      <label>
+      <input class="show_development_releases" type="checkbox" id="toggle" />
+      <span i18n="firmwareFlasherShowDevelopmentReleases"></span>
+      </label>
+      <span class="description" i18n="firmwareFlasherShowDevelopmentReleasesDescription"></span>
     </div>
-</div>
+  </div>
+  <div class="clear-both"></div>
+  <div class="git_info">
+    <div class="title" i18n="firmwareFlasherGithubInfoHead"></div>
+    <p>
+      <strong i18n="firmwareFlasherHash"></strong> <a i18n_title="firmwareFlasherUrl" class="hash" href="#" target="_blank"></a><br />
+      <strong i18n="firmwareFlasherCommiter"></strong> <span class="committer"></span><br />
+      <strong i18n="firmwareFlasherDate"></strong> <span class="date"></span><br />
+      <strong i18n="firmwareFlasherMessage"></strong> <span class="message"></span>
+    </p>
+  </div>
+  <div class="release_info">
+    <div class="title" i18n="firmwareFlasherReleaseSummaryHead"></div>
+    <p>
+      <strong i18n="firmwareFlasherReleaseTarget"></strong> <span class="target"></span><br />
+      <strong i18n="firmwareFlasherReleaseName"></strong> <a i18n_title="firmwareFlasherReleaseUrl" class="name" href="#" target="_blank"></a><br />
+      <strong i18n="firmwareFlasherReleaseFile"></strong> <a i18n_title="firmwareFlasherReleaseFileUrl" class="file" href="#" target="_blank"></a><br />
+      <strong i18n="firmwareFlasherReleaseDate"></strong> <span class="date"></span><br />
+      <strong i18n="firmwareFlasherReleaseStatus"></strong> <span class="status"></span><br />
+      <strong i18n="firmwareFlasherReleaseNotes"></strong> <br />
+    <div class=notes></div>
+    </p>
+  </div>
+  <div class="warning">
+    <div class="title" i18n="firmwareFlasherWarninghead"></div>
+    <p i18n="firmwareFlasherWarningText">
+    <p i18n="firmwareFlasherTargetWarning">
+    </p>
+  </div>
+  <div class="info">
+    <progress class="progress" value="0" min="0" max="100"></progress>
+    <span class="progressLabel" i18n="firmwareFlasherLoadFirmwareFile"></span>
+  </div>
+  <div class="buttons">
+    <a class="load_file" href="#" i18n="firmwareFlasherButtonLoadLocal"></a>
+    <a class="load_remote_file locked" href="#" i18n="firmwareFlasherButtonLoadOnline"></a>
+    <a class="flash_firmware locked" href="#" i18n="firmwareFlasherFlashFirmware"></a>
+  </div>
+</div>
\ No newline at end of file
diff --git a/tabs/gps.html b/tabs/gps.html
index 61a4f82b..b2739c36 100644
--- a/tabs/gps.html
+++ b/tabs/gps.html
@@ -1,125 +1,125 @@
 <div class="tab-gps">
-    <div class="GPS_info">
-        <span class="head" i18n="gpsHead"></span>
-        <table>
-            <tr>
-                <td style="width: 85px" i18n="gps3dFix"></td>
-                <td class="fix" i18n="gpsFixFalse"></td>
-            </tr>
-            <tr>
-                <td i18n="gpsAltitude"></td>
-                <td class="alt">0 m</td>
-            </tr>
-            <tr>
-                <td i18n="gpsLat"></td>
-                <td class="lat"><a href="#" target="_blank">0.0000 deg</a></td>
-            </tr>
-            <tr>
-                <td i18n="gpsLon"></td>
-                <td class="lon"><a href="#" target="_blank">0.0000 deg</a></td>
-            </tr>
-            <tr>
-                <td i18n="gpsSpeed"></td>
-                <td class="speed">0 cm/s</td>
-            </tr>
-            <tr>
-                <td i18n="gpsSats"></td>
-                <td class="sats">0</td>
-            </tr>
-            <tr>
-                <td i18n="gpsDistToHome"></td>
-                <td class="distToHome"></td>
-            </tr>
-        </table>
-    </div>
-    <div class="GPS_signal_strength">
-        <span class="head" i18n="gpsSignalStrHead"></span>
-        <table>
-            <tr class="titles">
-                <td style="width: 40px;">Sat ID</td>
-                <td style="width: 30px;">Qty</td>
-                <td i18n="gpsSignalStr">Signal Strength</td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-            <tr>
-                <td>0</td>
-                <td>0</td>
-                <td><progress value="0" max="99"></progress></td>
-            </tr>
-        </table>
-    </div>
-</div>
+  <div class="GPS_info">
+    <span class="head" i18n="gpsHead"></span>
+    <table>
+      <tr>
+        <td style="width: 85px" i18n="gps3dFix"></td>
+        <td class="fix" i18n="gpsFixFalse"></td>
+      </tr>
+      <tr>
+        <td i18n="gpsAltitude"></td>
+        <td class="alt">0 m</td>
+      </tr>
+      <tr>
+        <td i18n="gpsLat"></td>
+        <td class="lat"><a href="#" target="_blank">0.0000 deg</a></td>
+      </tr>
+      <tr>
+        <td i18n="gpsLon"></td>
+        <td class="lon"><a href="#" target="_blank">0.0000 deg</a></td>
+      </tr>
+      <tr>
+        <td i18n="gpsSpeed"></td>
+        <td class="speed">0 cm/s</td>
+      </tr>
+      <tr>
+        <td i18n="gpsSats"></td>
+        <td class="sats">0</td>
+      </tr>
+      <tr>
+        <td i18n="gpsDistToHome"></td>
+        <td class="distToHome"></td>
+      </tr>
+    </table>
+  </div>
+  <div class="GPS_signal_strength">
+    <span class="head" i18n="gpsSignalStrHead"></span>
+    <table>
+      <tr class="titles">
+        <td style="width: 40px;">Sat ID</td>
+        <td style="width: 30px;">Qty</td>
+        <td i18n="gpsSignalStr">Signal Strength</td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+      <tr>
+        <td>0</td>
+        <td>0</td>
+        <td><progress value="0" max="99"></progress></td>
+      </tr>
+    </table>
+  </div>
+</div>
\ No newline at end of file
diff --git a/tabs/options.html b/tabs/options.html
index f6fed5b6..9120a006 100644
--- a/tabs/options.html
+++ b/tabs/options.html
@@ -1,18 +1,15 @@
 <div class="notifications">
-    <label><input type="checkbox" /><span i18n="options_receive_app_notifications"></span></label>
+  <label><input type="checkbox" /><span i18n="options_receive_app_notifications"></span></label>
 </div>
 <div class="statistics">
-    <label><input type="checkbox" /><span i18n="options_improve_configurator"></span></label>
+  <label><input type="checkbox" /><span i18n="options_improve_configurator"></span></label>
 </div>
-
-
-
 <div class="appearance">
- <label>
-    <input type="radio" name="RadioGroup1" value="1" id="restore">
-    Dark Theme</label>
+  <label>
+  <input type="radio" name="RadioGroup1" value="1" id="restore">
+  Dark Theme</label>
   <br>
   <label>
-    <input type="radio" name="RadioGroup1" value="2" id="remove">
-    Light Theme</label>
+  <input type="radio" name="RadioGroup1" value="2" id="remove">
+  Light Theme</label>
 </div>
\ No newline at end of file
diff --git a/tabs/ports.html b/tabs/ports.html
index 4be1a23a..70df8361 100644
--- a/tabs/ports.html
+++ b/tabs/ports.html
@@ -1,88 +1,69 @@
 <div class="tab-ports">
- <div class="tab_title" i18n="tabPorts">Ports</div>
- <div class="cf_doc_version_bt">
-	<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a></div>
-
-    <div class="require-support">
-         <div class="note" style="margin-bottom:20px;">
-          <div class="note_spacer"><p i18n="portsHelp"></p><p i18n="portsMSPHelp"></p></div>
-        </div>
-        <table class="ports" style="margin-bottom:20px;">
-            <thead>
-                <tr>
-                    <td>Identifier</td>
-                    <td>Data</td>
-                    <td>Logging</td>
-                    <td>Telemetry</td>
-                    <td>RX</td>
-                    <td>GPS</td>
-                </tr>
-            </thead>
-            <tbody>
-            </tbody>
-        </table>
-        
-        
-        
-        <div class="clear-both"></div>
-        
+  <div class="tab_title" i18n="tabPorts">Ports</div>
+  <div class="cf_doc_version_bt">
+    <a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
+  </div>
+  <div class="require-support">
+    <div class="note" style="margin-bottom:20px;">
+      <div class="note_spacer">
+        <p i18n="portsHelp"></p>
+        <p i18n="portsMSPHelp"></p>
+      </div>
     </div>
-    <div class="note require-upgrade" i18n="portsFirmwareUpgradeRequired">
-    </div>
-
-
-<div class="fixed_band" style="position:fixed; bottom:0px; width:100%;"><div class="save_btn"><a class="save" href="#" i18n="configurationButtonSave"></a>
-</div></div>
-
-
-</div>
-
-
-
-
-
-<div id="tab-ports-templates">
-    <table class="ports">
-        <thead>
-        </thead>
-        <tbody>
-            <tr class="portConfiguration">
-                <td class="identifierCell">
-                    <p class="identifier"></p>
-                </td>
-                <td class="functionsCell-data">
-                    <select class="msp_baudrate">
-                        <!-- list generated here -->
-                    </select>
-                </td>
-                <td class="functionsCell-logging">
-                    <select class="blackbox_baudrate">
-                        <!-- list generated here -->
-                    </select>
-                </td>
-                <td class="functionsCell-telemetry">
-                    <select class="telemetry_baudrate">
-                        <!-- list generated here -->
-                    </select>
-                </td>
-                <td class="functionsCell-rx">
-                </td>
-                <td class="functionsCell-gps">
-                    <select class="gps_baudrate">
-                        <!-- list generated here -->
-                    </select>
-                </td>
-            </tr>
-        </tbody>
+    <table class="ports" style="margin-bottom:20px;">
+      <thead>
+        <tr>
+          <td>Identifier</td>
+          <td>Data</td>
+          <td>Logging</td>
+          <td>Telemetry</td>
+          <td>RX</td>
+          <td>GPS</td>
+        </tr>
+      </thead>
+      <tbody>
+      </tbody>
     </table>
-
-
-
+    <div class="clear-both"></div>
+  </div>
+  <div class="note require-upgrade" i18n="portsFirmwareUpgradeRequired">
+  </div>
+  <div class="fixed_band" style="position:fixed; bottom:0px; width:100%;">
+    <div class="save_btn"><a class="save" href="#" i18n="configurationButtonSave"></a></div>
+  </div>
 </div>
-
-
-
-
-
-
-
+<div id="tab-ports-templates">
+  <table class="ports">
+    <thead>
+    </thead>
+    <tbody>
+      <tr class="portConfiguration">
+        <td class="identifierCell">
+          <p class="identifier"></p>
+        </td>
+        <td class="functionsCell-data">
+          <select class="msp_baudrate">
+            <!-- list generated here -->
+          </select>
+        </td>
+        <td class="functionsCell-logging">
+          <select class="blackbox_baudrate">
+            <!-- list generated here -->
+          </select>
+        </td>
+        <td class="functionsCell-telemetry">
+          <select class="telemetry_baudrate">
+            <!-- list generated here -->
+          </select>
+        </td>
+        <td class="functionsCell-rx">
+        </td>
+        <td class="functionsCell-gps">
+          <select class="gps_baudrate">
+            <!-- list generated here -->
+          </select>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
\ No newline at end of file
diff --git a/tabs/setup.html b/tabs/setup.html
index 7381105c..10398a07 100644
--- a/tabs/setup.html
+++ b/tabs/setup.html
@@ -1,131 +1,129 @@
-
-<div class="tab-setup"> <!-- should be the first DIV on each tab -->
-
-<div class="cf_column full" style="margin-bottom:10px;">
-  <div class="tab_title" i18n="tabSetup">Setup</div>
-<div class="cf_doc_version_bt">
-	<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a></div>
-    
-
+<div class="tab-setup">
+  <!-- should be the first DIV on each tab -->
+  <div class="cf_column full" style="margin-bottom:10px;">
+    <div class="tab_title" i18n="tabSetup">Setup</div>
+    <div class="cf_doc_version_bt">
+      <a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
+    </div>
     <div class="cf_column fourth" style="min-height:100px;">
-    <div class="spacer_right">
+      <div class="spacer_right">
         <div class="default_btn" style="margin-bottom:10px;"><a class="calibrateAccel" id="default_btn green" href="#" i18n="initialSetupButtonCalibrateAccel"></a></div>
         <div class="default_btn" style="margin-bottom:10px;"><a class="calibrateMag" href="#" i18n="initialSetupButtonCalibrateMag" ></a></div>
         <div class="default_btn" style="margin-bottom:10px;"><a class="resetSettings" href="#" i18n="initialSetupButtonReset"></a></div>
- 		
-        <div class="half"><div class="spacer_right">
-        <div class="default_btn half"><a class="backup" href="#" i18n="initialSetupButtonBackup"></a></div>
-		</div></div>
-         <div class="half"><div class="spacer_left">
-         <div class="default_btn half"><a class="restore" href="#" i18n="initialSetupButtonRestore"></a></div>
-        </div></div></div>
-        
+        <div class="half">
+          <div class="spacer_right">
+            <div class="default_btn half"><a class="backup" href="#" i18n="initialSetupButtonBackup"></a></div>
+          </div>
         </div>
-        
-    <div class="threefourth_right"><div class="spacer_left">
+        <div class="half">
+          <div class="spacer_left">
+            <div class="default_btn half"><a class="restore" href="#" i18n="initialSetupButtonRestore"></a></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="threefourth_right">
+      <div class="spacer_left">
         <div class="cell_setup"><span i18n="initialSetupCalibrateAccelText"></span></div>
         <div class="cell_setup"><span i18n="initialSetupCalibrateMagText"></span></div>
         <div class="cell_setup"><span i18n="initialSetupResetText"></span></div>
         <div class="cell_setup"><span i18n="initialSetupBackupRestoreText"></span></div>
-    </div></div>
-</div>
-
-<div style="clear:both; margin-bottom:5px;"></div>
-
-
-
-<div class="cf_column threefourth_left" > 
-
-	<div class="spacer_right">
-
-<div class="model-and-info">
+      </div>
+    </div>
+  </div>
+  <div style="clear:both; margin-bottom:5px;"></div>
+  <div class="cf_column threefourth_left" >
+    <div class="spacer_right">
+      <div class="model-and-info">
         <div id="interactive_block">
-            <div id="canvas_wrapper" style="">
-                <canvas id="canvas"></canvas>
-            
-            
-
+          <div id="canvas_wrapper" style="">
+            <canvas id="canvas"></canvas>
             <div class="attitude_info">
-                <dl>
-                    <dt>Heading:</dt><dd class="heading">&nbsp;</dd>
-                    <dt>Pitch:</dt><dd class="pitch">&nbsp;</dd>
-                    <dt>Roll:</dt><dd class="roll">&nbsp;</dd>
-                </dl>
-            </div>  
-                    
-                    
-                </div>
-                        <a class="reset" href="#" i18n="initialSetupButtonResetZaxis"></a>
-
-    
-</div></div></div> </div> 
-        
-        <div class="cf_column fourth">
-        
-<div class="spacer_left"><div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="initialSetupInfoHead"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="cf_table">
-    <tbody>
-      <tr>
-        <td i18n="initialSetupBattery"></td>
-        <td class="bat-voltage">0 V</td>
-      </tr>
-      <tr>
-        <td i18n="initialSetupDrawn"></td>
-        <td class="bat-mah-drawn">0 mAh</td>
-      </tr>
-      <tr>
-        <td i18n="initialSetupDrawing"></td>
-        <td class="bat-mah-drawing">0.00 A</td>
-      </tr>
-      <tr class="noboarder">
-        <td i18n="initialSetupRSSI"></td>
-        <td class="rssi"> 0 %</td>
-      </tr>
-    </tbody>
-  </table></div></div></div> 
-
-
-  
-  <div class="spacer_left"><div class="gui_box grey">
-<div class="gui_box_titlebar"><div class="spacer_box_title" i18n="initialSetupGPSHead"></div>
-<div class="helpicon"></div></div><div class="spacer_box">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="cf_table">
-    <tbody>
-       <tr>
-        <td i18n="gps3dFix"></td>
-        <td class="gpsFix"></td>
-      </tr>
-      <tr>
-        <td i18n="gpsSats"></td>
-        <td class="gpsSats"></td>
-      </tr>
-      <tr>
-        <td i18n="gpsLat"></td>
-        <td class="gpsLat"></td>
-      </tr>
-      <tr class="noboarder">
-        <td i18n="gpsLon"></td>
-        <td class="gpsLon"></td>
-      </tr>
-    </tbody>
-  </table></div></div></div> 
-
-  
-   <div class="spacer_left"><div class="gui_box grey" align="center">
-<div class="gui_box_titlebar" align="left"><div class="spacer_box_title" i18n="initialSetupInstrumentsHead"></div>
-<div class="helpicon"></div></div>
-          <span id="attitude"></span>
-          <span id="heading"></span>
-
-
-
-</div></div>  
-
-  
-  
-    
-    </div></div>
-    
-  
+              <dl>
+                <dt>Heading:</dt>
+                <dd class="heading">&nbsp;</dd>
+                <dt>Pitch:</dt>
+                <dd class="pitch">&nbsp;</dd>
+                <dt>Roll:</dt>
+                <dd class="roll">&nbsp;</dd>
+              </dl>
+            </div>
+          </div>
+          <a class="reset" href="#" i18n="initialSetupButtonResetZaxis"></a>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="cf_column fourth">
+    <div class="spacer_left">
+      <div class="gui_box grey">
+        <div class="gui_box_titlebar">
+          <div class="spacer_box_title" i18n="initialSetupInfoHead"></div>
+          <div class="helpicon"></div>
+        </div>
+        <div class="spacer_box">
+          <table width="100%" border="0" cellpadding="0" cellspacing="0" class="cf_table">
+            <tbody>
+              <tr>
+                <td i18n="initialSetupBattery"></td>
+                <td class="bat-voltage">0 V</td>
+              </tr>
+              <tr>
+                <td i18n="initialSetupDrawn"></td>
+                <td class="bat-mah-drawn">0 mAh</td>
+              </tr>
+              <tr>
+                <td i18n="initialSetupDrawing"></td>
+                <td class="bat-mah-drawing">0.00 A</td>
+              </tr>
+              <tr class="noboarder">
+                <td i18n="initialSetupRSSI"></td>
+                <td class="rssi"> 0 %</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+    <div class="spacer_left">
+      <div class="gui_box grey">
+        <div class="gui_box_titlebar">
+          <div class="spacer_box_title" i18n="initialSetupGPSHead"></div>
+          <div class="helpicon"></div>
+        </div>
+        <div class="spacer_box">
+          <table width="100%" border="0" cellpadding="0" cellspacing="0" class="cf_table">
+            <tbody>
+              <tr>
+                <td i18n="gps3dFix"></td>
+                <td class="gpsFix"></td>
+              </tr>
+              <tr>
+                <td i18n="gpsSats"></td>
+                <td class="gpsSats"></td>
+              </tr>
+              <tr>
+                <td i18n="gpsLat"></td>
+                <td class="gpsLat"></td>
+              </tr>
+              <tr class="noboarder">
+                <td i18n="gpsLon"></td>
+                <td class="gpsLon"></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+    <div class="spacer_left">
+      <div class="gui_box grey" align="center">
+        <div class="gui_box_titlebar" align="left">
+          <div class="spacer_box_title" i18n="initialSetupInstrumentsHead"></div>
+          <div class="helpicon"></div>
+        </div>
+        <span id="attitude"></span>
+        <span id="heading"></span>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file