diff --git a/tabs/initial_setup.css b/tabs/initial_setup.css
index 51055b41..041e2d31 100644
--- a/tabs/initial_setup.css
+++ b/tabs/initial_setup.css
@@ -186,25 +186,29 @@
         .tab-initial_setup .battery .fields,
         .tab-initial_setup .throttle .fields,
         .tab-initial_setup .magnetometer .fields {
-            padding: 5px 5px 1px 5px;
-        }
-        .tab-initial_setup .battery .fields {
-            padding: 5px 5px 2px 5px;
+            padding: 5px 5px 3px 5px;
         }
         .tab-initial_setup .acc-trim .fields {
             padding: 5px 5px 3px 5px;
         }
+        .tab-initial_setup .magnetometer .fields {
+            padding: 5px 5px 5px 5px;
+        }
         .tab-initial_setup .battery .bat-voltage {
             padding-left: 20px;
         }
         .tab-initial_setup .battery dt {
             float: left;
-            width: 100px;            
+            width: 100px;
+            height: 22px;
+            
             margin-bottom: 2px;
             
             line-height: 22px;
         }
-        .tab-initial_setup .battery dd {            
+        .tab-initial_setup .battery dd {
+            height: 22px;
+            
             margin-left: 100px;
             margin-bottom: 2px;
             
@@ -220,12 +224,16 @@
         }
         .tab-initial_setup .throttle dt {
             float: left;
-            width: 85px;            
+            width: 85px;
+            height: 22px;
+            
             margin-bottom: 2px;
             
             line-height: 22px;
         }
-        .tab-initial_setup .throttle dd {            
+        .tab-initial_setup .throttle dd {
+            height: 22px;
+            
             margin-left: 85px;
             margin-bottom: 2px;
             
@@ -242,11 +250,14 @@
         .tab-initial_setup .acc-trim dt {
             float: left;
             width: 40px;
+            height: 22px;
             line-height: 22px;
             
             margin-bottom: 2px;
         }
         .tab-initial_setup .acc-trim dd {
+            height: 22px;
+            
             margin-left: 40px;
             margin-bottom: 2px;
         }
@@ -261,16 +272,17 @@
         .tab-initial_setup .magnetometer dt {
             float: left;
             width: 100px;
-            
+            height: 20px;
             line-height: 22px;
             
             margin-bottom: 2px;
         }
         .tab-initial_setup .magnetometer dd {
+            height: 20px;
+            line-height: 22px;
+            
             margin-left: 100px;
             margin-bottom: 2px;
-            
-            line-height: 22px;
         }
         .tab-initial_setup .magnetometer input {
             width: 70px;
diff --git a/tabs/initial_setup.html b/tabs/initial_setup.html
index 26f61c3c..ab9e976e 100644
--- a/tabs/initial_setup.html
+++ b/tabs/initial_setup.html
@@ -42,38 +42,40 @@
             </div>
         </div>
     </div>
-    <div class="battery">
-        <span class="head">Battery</span>
-        <div class="fields">
-            <dl>
-                <dt>Voltage:</dt><dd class="bat-voltage">0 V</dd>
-                <dt>Min Cell Voltage:</dt><dd><input type="number" name="mincellvoltage" step="0.1" value="0" /></dd>
-                <dt>Max Cell Voltage:</dt><dd><input type="number" name="maxcellvoltage" step="0.1" value="0" /></dd>
-                <dt>Voltage Scale:</dt><dd><input type="number" name="voltagescale" min="10" max="200" value="0" /></dd>
-            </dl>
+    <div class="left" style="width: 510px">
+        <div class="battery">
+            <span class="head">Battery</span>
+            <div class="fields">
+                <dl>
+                    <dt>Voltage:</dt><dd class="bat-voltage">0 V</dd>
+                    <dt>Min Cell Voltage:</dt><dd><input type="number" name="mincellvoltage" step="0.1" value="0" /></dd>
+                    <dt>Max Cell Voltage:</dt><dd><input type="number" name="maxcellvoltage" step="0.1" value="0" /></dd>
+                    <dt>Voltage Scale:</dt><dd><input type="number" name="voltagescale" min="10" max="200" value="0" /></dd>
+                </dl>
+            </div>
         </div>
-    </div>
-    <div class="throttle">
-        <span class="head">Throttle Settings</span>
-        <div class="fields">
-            <dl>
-                <dt>Minimum:</dt><dd><input type="number" name="minthrottle" min="0" max="2000" value="0" /></dd>
-                <dt>Maximum:</dt><dd><input type="number" name="maxthrottle" min="0" max="2000" value="0" /></dd>
-                <dt>Failsafe:</dt><dd><input type="number" name="failsafe_throttle" min="1000" max="2000" value="0" /></dd>
-                <dt title="Minimum Command">MinCommand:</dt><dd><input type="number" name="mincommand" min="0" max="2000" value="0" /></dd>
-            </dl>
+        <div class="throttle">
+            <span class="head">Throttle Settings</span>
+            <div class="fields">
+                <dl>
+                    <dt>Minimum:</dt><dd><input type="number" name="minthrottle" min="0" max="2000" value="0" /></dd>
+                    <dt>Maximum:</dt><dd><input type="number" name="maxthrottle" min="0" max="2000" value="0" /></dd>
+                    <dt>Failsafe:</dt><dd><input type="number" name="failsafe_throttle" min="1000" max="2000" value="0" /></dd>
+                    <dt title="Minimum Command">MinCommand:</dt><dd><input type="number" name="mincommand" min="0" max="2000" value="0" /></dd>
+                </dl>
+            </div>
         </div>
-    </div>
-    <div class="acc-trim">
-        <span class="head">Accelerometer trims</span>
-        <div class="fields">
-            <dl>
-                <dt>Pitch:</dt><dd><input type="number" name="pitch" min="-300" max="300" value="0" /></dd>
-                <dt>Roll:</dt><dd><input type="number" name="roll" min="-300" max="300" value="0" /></dd>
-            </dl>
+        <div class="acc-trim">
+            <span class="head">Accelerometer trims</span>
+            <div class="fields">
+                <dl>
+                    <dt>Pitch:</dt><dd><input type="number" name="pitch" min="-300" max="300" value="0" /></dd>
+                    <dt>Roll:</dt><dd><input type="number" name="roll" min="-300" max="300" value="0" /></dd>
+                </dl>
+            </div>
         </div>
+        <a class="save_settings" href="#">Save</a>
     </div>
-    <a class="save_settings" href="#">Save</a>
     <div class="magnetometer">
         <span class="head">Magnetometer</span>
         <div class="fields">