diff --git a/js/msp.js b/js/msp.js
index b9f0a690..6429f906 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -350,7 +350,7 @@ function process_data(command, message_buffer, message_length_expected) {
             MISC.failsafe_throttle = data.getUint16(8, 1); // 1000-2000
             MISC.plog0 = data.getUint16(10, 1);
             MISC.plog1 = data.getUint32(12, 1);
-            MISC.mag_declination = data.getInt16(16, 1);
+            MISC.mag_declination = data.getInt16(16, 1); // -18000-18000
             MISC.vbatscale = data.getUint8(18, 1); // 10-200
             MISC.vbatmincellvoltage = data.getUint8(19, 1) / 10; // 10-50
             MISC.vbatmaxcellvoltage = data.getUint8(20, 1) / 10; // 10-50
diff --git a/tabs/initial_setup.css b/tabs/initial_setup.css
index 385061fb..51055b41 100644
--- a/tabs/initial_setup.css
+++ b/tabs/initial_setup.css
@@ -158,17 +158,22 @@
             } 
     .tab-initial_setup .battery,
     .tab-initial_setup .throttle,
-    .tab-initial_setup .acc-trim {
+    .tab-initial_setup .acc-trim,
+    .tab-initial_setup .magnetometer {
         float: left;
         display: block;
         
         margin-left: 10px;
         
         border: 1px solid silver;
+    }
+    .tab-initial_setup .magnetometer {
+        margin-top: 10px;
     }
         .tab-initial_setup .battery .head,
         .tab-initial_setup .throttle .head,
-        .tab-initial_setup .acc-trim .head {
+        .tab-initial_setup .acc-trim .head,
+        .tab-initial_setup .magnetometer .head {
             display: block;
             
             text-align: center;
@@ -180,24 +185,30 @@
         }
         .tab-initial_setup .battery .fields,
         .tab-initial_setup .throttle .fields,
-        .tab-initial_setup .acc-trim .fields {
+        .tab-initial_setup .magnetometer .fields {
             padding: 5px 5px 1px 5px;
         }
+        .tab-initial_setup .battery .fields {
+            padding: 5px 5px 2px 5px;
+        }
+        .tab-initial_setup .acc-trim .fields {
+            padding: 5px 5px 3px 5px;
+        }
         .tab-initial_setup .battery .bat-voltage {
             padding-left: 20px;
         }
         .tab-initial_setup .battery dt {
             float: left;
-            width: 100px;
-            line-height: 22px;
+            width: 100px;            
+            margin-bottom: 2px;
             
-            margin-bottom: 4px;
+            line-height: 22px;
         }
-        .tab-initial_setup .battery dd {
-            line-height: 22px;
-            
+        .tab-initial_setup .battery dd {            
             margin-left: 100px;
-            margin-bottom: 4px;
+            margin-bottom: 2px;
+            
+            line-height: 22px;
         }
         .tab-initial_setup .battery input {
             width: 70px;
@@ -209,16 +220,16 @@
         }
         .tab-initial_setup .throttle dt {
             float: left;
-            width: 70px;
-            line-height: 22px;
+            width: 85px;            
+            margin-bottom: 2px;
             
-            margin-bottom: 3px;
+            line-height: 22px;
         }
-        .tab-initial_setup .throttle dd {
-            line-height: 22px;
+        .tab-initial_setup .throttle dd {            
+            margin-left: 85px;
+            margin-bottom: 2px;
             
-            margin-left: 70px;
-            margin-bottom: 4px;
+            line-height: 22px;
         }
         .tab-initial_setup .throttle input {
             width: 70px;
@@ -230,20 +241,42 @@
         }
         .tab-initial_setup .acc-trim dt {
             float: left;
-            width: 50px;
+            width: 40px;
             line-height: 22px;
             
-            margin-bottom: 4px;
+            margin-bottom: 2px;
         }
         .tab-initial_setup .acc-trim dd {
-            margin-left: 50px;
-            margin-bottom: 4px;
+            margin-left: 40px;
+            margin-bottom: 2px;
         }
         .tab-initial_setup .acc-trim input {
             width: 70px;
             height: 20px;
             line-height: 20px;
             
+            border: 1px solid silver;
+            text-align: center;
+        }
+        .tab-initial_setup .magnetometer dt {
+            float: left;
+            width: 100px;
+            
+            line-height: 22px;
+            
+            margin-bottom: 2px;
+        }
+        .tab-initial_setup .magnetometer dd {
+            margin-left: 100px;
+            margin-bottom: 2px;
+            
+            line-height: 22px;
+        }
+        .tab-initial_setup .magnetometer input {
+            width: 70px;
+            height: 20px;
+            line-height: 20px;
+            
             border: 1px solid silver;
             text-align: center;
         }
@@ -269,8 +302,8 @@
     .tab-initial_setup .compass-wrapper {
         position: absolute;
         
-        bottom: 30px;
-        right: 100px;
+        bottom: 25px;
+        right: 85px;
 
         border: 1px solid silver;
         border-radius: 50%;
diff --git a/tabs/initial_setup.html b/tabs/initial_setup.html
index caba159b..26f61c3c 100644
--- a/tabs/initial_setup.html
+++ b/tabs/initial_setup.html
@@ -60,7 +60,7 @@
                 <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">MinComm.:</dt><dd><input type="number" name="mincommand" min="0" 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>
@@ -74,6 +74,14 @@
         </div>
     </div>
     <a class="save_settings" href="#">Save</a>
+    <div class="magnetometer">
+        <span class="head">Magnetometer</span>
+        <div class="fields">
+            <dl>
+                <dt>Declination:</dt><dd><input type="number" name="mag_declination" min="-1800" max="1800" value="0" /></dd>
+            </dl>
+        </div>
+    </div>
     <div class="compass-wrapper">
         <div id="compass">
             <span>N</span>
diff --git a/tabs/initial_setup.js b/tabs/initial_setup.js
index a6e247fe..09ab5b29 100644
--- a/tabs/initial_setup.js
+++ b/tabs/initial_setup.js
@@ -17,6 +17,8 @@ function tab_initialize_initial_setup() {
                 $('input[name="failsafe_throttle"]').val(MISC.failsafe_throttle);
                 $('input[name="mincommand"]').val(MISC.mincommand);
                 
+                $('input[name="mag_declination"]').val(MISC.mag_declination);
+                
                 // Fill in the accel trimms from CONFIG object
                 $('input[name="pitch"]').val(CONFIG.accelerometerTrims[0]);
                 $('input[name="roll"]').val(CONFIG.accelerometerTrims[1]);
@@ -147,6 +149,8 @@ function tab_initialize_initial_setup() {
                     MISC.failsafe_throttle = parseInt($('input[name="failsafe_throttle"]').val());
                     MISC.mincommand = parseInt($('input[name="mincommand"]').val());
                     
+                    MISC.mag_declination = parseInt($('input[name="mag_declination"]').val());
+                    
                     // we also have to fill the unsupported bytes
                     var buffer_out = new Array();
                     buffer_out[0] = 0; // powerfailmeter