diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index b420f779..daa44a93 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1866,19 +1866,19 @@
         "message": "To enable via CLI use <strong>feature {name}</strong> command"
     },
     "armingFailureReasonTitle": {
-        "message": "Arming status"
+        "message": "Pre-arming checks"
     },
     "BLOCKED_UAV_NOT_LEVEL": {
-        "message": "UAV level"
+        "message": "UAV is levelled"
     },
     "BLOCKED_SENSORS_CALIBRATING": {
-        "message": "Boot calibration"
+        "message": "Run-time calibration"
     },
     "BLOCKED_SYSTEM_OVERLOADED": {
         "message": "CPU load"
     },
     "BLOCKED_NAVIGATION_SAFETY": {
-        "message": "Navigation safety"
+        "message": "Navigation is safe"
     },
     "BLOCKED_COMPASS_NOT_CALIBRATED": {
         "message": "Compass calibrated"
@@ -1887,6 +1887,12 @@
         "message": "Accelerometer calibrated"
     },
     "BLOCKED_HARDWARE_FAILURE": {
-        "message": "Hardware healthy"
+        "message": "Hardware health"
+    },
+    "armingCheckPass": {
+        "message": "<span class=\"arming-state-pass\">PASS</span>"
+    },
+    "armingCheckFail": {
+        "message": "<span class=\"arming-state-fail\">FAIL</span>"
     }
 }
\ No newline at end of file
diff --git a/js/fc.js b/js/fc.js
index 0146a34e..15dbb993 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -678,16 +678,4 @@ var FC = {
 
         return retVal;
     },
-    processArmingFlags: function (flag) {
-        var retVal = [],
-            flagNames = this.getArmingFlags();
-
-        for (var bit in flagNames) {
-            if (flagNames.hasOwnProperty(bit) && bit_check(flag, bit)) {
-                retVal.push(flagNames[bit]);
-            }
-        }
-
-        return retVal;
-    }
 };
diff --git a/tabs/setup.css b/tabs/setup.css
index 280ab509..6cd01d83 100644
--- a/tabs/setup.css
+++ b/tabs/setup.css
@@ -251,11 +251,21 @@
     text-decoration:none;
 }
 
+.arming-state-pass {
+    font-weight: bold;
+    color: green;
+}
+
+.arming-state-fail {
+    font-weight: bold;
+    color: red;
+}
+
 .armin-status-element {
-    margin: 4px 0;
+    margin: 2px 0;
     font-weight: bold;
     color: #37a8db;
-    font-size: 1.1em;
+    font-size: 1em;
 }
 
 .armin-status-failed {
diff --git a/tabs/setup.html b/tabs/setup.html
index 38a96122..29df4414 100644
--- a/tabs/setup.html
+++ b/tabs/setup.html
@@ -94,6 +94,32 @@
                         <div class="spacer_box_title" data-i18n="armingFailureReasonTitle"></div>
                     </div>
                     <div class="spacer_box">
+                        <table width="100%" border="0" cellpadding="0" cellspacing="0" class="cf_table">
+                            <tbody>
+                                <tr>
+                                    <td data-i18n="BLOCKED_UAV_NOT_LEVEL"></td><td id="reason-BLOCKED_UAV_NOT_LEVEL"></td>
+                                </tr>
+                                <tr>
+                                    <td data-i18n="BLOCKED_SENSORS_CALIBRATING"></td><td id="reason-BLOCKED_SENSORS_CALIBRATING"></td>
+                                </tr>
+                                <tr>
+                                    <td data-i18n="BLOCKED_SYSTEM_OVERLOADED"></td><td id="reason-BLOCKED_SYSTEM_OVERLOADED"></td>
+                                </tr>
+                                <tr>
+                                    <td data-i18n="BLOCKED_NAVIGATION_SAFETY"></td><td id="reason-BLOCKED_NAVIGATION_SAFETY"></td>
+                                </tr>
+                                <tr>
+                                    <td data-i18n="BLOCKED_COMPASS_NOT_CALIBRATED"></td><td id="reason-BLOCKED_COMPASS_NOT_CALIBRATED"></td>
+                                </tr>
+                                <tr>
+                                    <td data-i18n="BLOCKED_ACCELEROMETER_NOT_CALIBRATED"></td><td id="reason-BLOCKED_ACCELEROMETER_NOT_CALIBRATED"></td>
+                                </tr>
+                                <tr class="noboarder">
+                                    <td data-i18n="BLOCKED_HARDWARE_FAILURE"></td><td id="reason-BLOCKED_HARDWARE_FAILURE"></td>
+                                </tr>
+                            </tbody>
+                        </table>
+
                         <ul id="armingFailuresList">
 
                         </ul>
diff --git a/tabs/setup.js b/tabs/setup.js
index 685ca069..9e1eaa06 100755
--- a/tabs/setup.js
+++ b/tabs/setup.js
@@ -211,27 +211,18 @@ TABS.setup.initialize = function (callback) {
         GUI.interval_add('setup_data_pull_fast', get_fast_data, 33, true); // 30 fps
         GUI.interval_add('setup_data_pull_slow', get_slow_data, 250, true); // 4 fps
 
-        var $armingFailuresList = $('#armingFailuresList');
-
-        var reasons = FC.getArmingBlockingFlags();
-
-        for (var i in reasons) {
-            if (reasons.hasOwnProperty(i)) {
-                $armingFailuresList.append("<li id='reason-" + reasons[i] + "' class='armin-status-element'>" + chrome.i18n.getMessage(reasons[i]) + "</li>");
-            }
-        }
-
         function updateArminFailure() {
-            var armingReasons = FC.processArmingFlags(CONFIG.armingFlags & 0xff00);
-
-            $armingFailuresList.find('*').removeClass("armin-status-failed");
-
-            for (var reason in armingReasons) {
-                if (armingReasons.hasOwnProperty(reason)) {
-                    $('#reason-' + armingReasons[reason]).addClass("armin-status-failed");
+            var flagNames = FC.getArmingFlags();
+            for (var bit in flagNames) {
+                if (flagNames.hasOwnProperty(bit)) {
+                    if (bit_check(CONFIG.armingFlags & 0xff00, bit)) {
+                        $('#reason-' + flagNames[bit]).html(chrome.i18n.getMessage('armingCheckFail'));
+                    }
+                    else {
+                        $('#reason-' + flagNames[bit]).html(chrome.i18n.getMessage('armingCheckPass'));
+                    }
                 }
             }
-
         }
 
         /*