diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 57e669db46..c9fd67564f 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -303,9 +303,27 @@
     "configurationBoardAlignment": {
         "message": "Board Alignment"
     },
+    "configurationBoardAlignmentRoll": {
+        "message": "Roll Adjustment [deg]"
+    },
+    "configurationBoardAlignmentPitch": {
+        "message": "Pitch Adjustment [deg]"
+    },
+    "configurationBoardAlignmentYaw": {
+        "message": "Yaw Adjustment [deg]"
+    },
     "configurationAccelTrimMagDec": {
         "message": "Accelerometer & Magnetometer"
     },
+    "configurationAccelTrimRoll": {
+        "message": "Accelerometer Roll Trim"
+    },
+    "configurationAccelTrimPitch": {
+        "message": "Accelerometer Pitch Trim"
+    },
+    "configurationMagDeclination": {
+        "message": "Magnetometer Declination [deg]"
+    },
     "configurationThrottle": {
         "message": "Throttle"
     },
diff --git a/tabs/configuration.css b/tabs/configuration.css
index 836a5b34ef..48f278ac2f 100644
--- a/tabs/configuration.css
+++ b/tabs/configuration.css
@@ -71,6 +71,7 @@
 }
 .tab-configuration .number span {
     margin-left: 10px;
+    line-height: 20px;
 }
 .tab-configuration .buttons {
     position: fixed;
diff --git a/tabs/configuration.html b/tabs/configuration.html
index 6e9a29294e..2c5780d772 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -21,19 +21,19 @@
         <div class="number">
             <label>
                 <input type="number" name="board_align_roll" step="1" min="-180" max="180" />
-                <span></span>
+                <span i18n="configurationBoardAlignmentRoll"></span>
             </label>
         </div>
         <div class="number">
             <label>
                 <input type="number" name="board_align_pitch" step="1" min="-180" max="180" />
-                <span></span>
+                <span i18n="configurationBoardAlignmentPitch"></span>
             </label>
         </div>
         <div class="number">
             <label>
                 <input type="number" name="board_align_yaw" step="1" min="-180" max="180" />
-                <span></span>
+                <span i18n="configurationBoardAlignmentYaw"></span>
             </label>
         </div>
     </div>
@@ -41,20 +41,20 @@
         <div class="groupTitle" i18n="configurationAccelTrimMagDec"></div>
         <div class="number">
             <label>
-                <input type="number" name="pitch" min="-300" max="300" />
-                <span></span>
+                <input type="number" name="roll"   min="-300" max="300" />
+                <span i18n="configurationAccelTrimRoll"></span>
             </label>
         </div>
         <div class="number">
             <label>
-                <input type="number" name="roll"   min="-300" max="300" />
-                <span></span>
+                <input type="number" name="pitch" min="-300" max="300" />
+                <span i18n="configurationAccelTrimPitch"></span>
             </label>
         </div>
         <div class="number">
             <label>
                 <input type="number" name="mag_declination" step="0.1" min="-180" max="180" />
-                <span></span>
+                <span i18n="configurationMagDeclination"></span>
             </label>
         </div>
     </div>
@@ -64,25 +64,25 @@
         <div class="number">
             <label>
                 <input type="number" name="minthrottle" min="0" max="2000" />
-                <span></span>
+                <span i18n=""></span>
             </label>
         </div>
         <div class="number">
             <label>
                 <input type="number" name="maxthrottle" min="0" max="2000" />
-                <span></span>
+                <span i18n=""></span>
             </label>
         </div>
         <div class="number">
             <label>
                 <input type="number" name="failsafe_throttle" min="1000" max="2000" />
-                <span></span>
+                <span i18n=""></span>
             </label>
         </div>
         <div class="number">
             <label>
                 <input type="number" name="mincommand" min="0" max="2000" />
-                <span></span>
+                <span i18n=""></span>
             </label>
         </div>
     </div>
@@ -91,19 +91,19 @@
         <div class="number">
             <label>
                 <input type="number" name="mincellvoltage" step="0.1" min="1" max="5" />
-                <span></span>
+                <span i18n=""></span>
             </label>
         </div>
         <div class="number">
             <label>
                 <input type="number" name="maxcellvoltage" step="0.1" min="1" max="5" />
-                <span></span>
+                <span i18n=""></span>
             </label>
         </div>
         <div class="number">
             <label>
                 <input type="number" name="voltagescale" step="1" min="10" max="200" />
-                <span></span>
+                <span i18n=""></span>
             </label>
         </div>
     </div>
diff --git a/tabs/configuration.js b/tabs/configuration.js
index 7d30da5316..d300cc1e44 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -125,8 +125,8 @@ TABS.configuration.initialize = function (callback) {
         $('input[name="board_align_yaw"]').val(BF_CONFIG.board_align_yaw);
 
         // fill accel trims
-        $('input[name="pitch"]').val(CONFIG.accelerometerTrims[0]);
         $('input[name="roll"]').val(CONFIG.accelerometerTrims[1]);
+        $('input[name="pitch"]').val(CONFIG.accelerometerTrims[0]);
 
         // fill magnetometer
         $('input[name="mag_declination"]').val(MISC.mag_declination / 10);
@@ -162,8 +162,8 @@ TABS.configuration.initialize = function (callback) {
             BF_CONFIG.board_align_pitch = parseInt($('input[name="board_align_pitch"]').val());
             BF_CONFIG.board_align_yaw = parseInt($('input[name="board_align_yaw"]').val());
 
-            CONFIG.accelerometerTrims[0] = parseInt($('input[name="pitch"]').val());
             CONFIG.accelerometerTrims[1] = parseInt($('input[name="roll"]').val());
+            CONFIG.accelerometerTrims[0] = parseInt($('input[name="pitch"]').val());
             MISC.mag_declination = parseFloat($('input[name="mag_declination"]').val()) * 10;
 
             MISC.minthrottle = parseInt($('input[name="minthrottle"]').val());