diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index b114f935..ac36b68a 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1040,7 +1040,7 @@
         "message": "<strong>Motor Test Mode Notice:</strong><br />Moving the sliders will cause the motors to <strong>spin up</strong>.<br />In order to prevent injury <strong style=\"color: red\">remove ALL propellers</strong> before using this feature.<br />"
     },
     "motorsEnableControl": {
-        "message": "I understand the risks, propellors are removed - Enable motor control."
+        "message": "I understand the risks, propellers are removed - Enable motor control."
     },
 
     "sensorsInfo": {
@@ -1274,7 +1274,7 @@
         "message": "<strong>Recovery / Lost communication<strong>"
     },
     "firmwareFlasherRecoveryText": {
-        "message": "If you have lost comminication with your board follow these steps to restore communication: <ul><li>Power off</li><li>Enable 'No reboot sequence', enable 'Full chip erase'.</li><li>Jumper the BOOT pins or hold BOOT button.</li><li>Power on (activity LED will NOT flash if done correctly).</li><li>Release BOOT button if your FC has one.</li><li>Flash with correct firmware (using manual baud rate if specified in your FC's manual).</li><li>Power off.</li><li>Remove BOOT jumper.</li><li>Power on (activity LED should flash).</li><li>Connect normally.</li></ul>"
+        "message": "If you have lost communication with your board follow these steps to restore communication: <ul><li>Power off</li><li>Enable 'No reboot sequence', enable 'Full chip erase'.</li><li>Jumper the BOOT pins or hold BOOT button.</li><li>Power on (activity LED will NOT flash if done correctly).</li><li>Release BOOT button if your FC has one.</li><li>Flash with correct firmware (using manual baud rate if specified in your FC's manual).</li><li>Power off.</li><li>Remove BOOT jumper.</li><li>Power on (activity LED should flash).</li><li>Connect normally.</li></ul>"
     },
     "firmwareFlasherButtonLeave": {
         "message": "Leave Firmware Flasher"
@@ -1426,6 +1426,12 @@
     "failsafeChannelFallbackSettingsHelp": {
         "message": "These settings are applied to invalid individual AUX channels or to all channels when entering stage 1. <strong>Note:</strong> values are saved in steps of 25usec, so small changes disappear"
     },
+    "failsafeChannelFallbackSettingsAuto": {
+        "message": "<strong>Auto</strong> means Roll, Pitch and Yaw to center and Throttle low. <strong>Hold</strong> means maintain the last good value received"
+    },
+    "failsafeChannelFallbackSettingsHold": {
+        "message": "<strong>Hold</strong> means maintain the last good value received. <strong>Set</strong> means the value given here will be used"
+    },
     "failsafeStageTwoSettingsTitle": {
         "message": "Stage 2 - Settings"
     },
diff --git a/js/gui.js b/js/gui.js
index 3707fcd3..c93bda8e 100644
--- a/js/gui.js
+++ b/js/gui.js
@@ -287,8 +287,7 @@ GUI_control.prototype.content_ready = function (callback) {
     });
 
     $('.cf_tip').each(function() {
-        $(this).jBox('Tooltip', {
-            content: $(this).children('.cf_tooltiptext'),
+        $(this).jBox('Tooltip', {            
             delayOpen: 100,
             delayClose: 100,
             position: {
diff --git a/tabs/failsafe.css b/tabs/failsafe.css
index 68093b67..93aad0a5 100644
--- a/tabs/failsafe.css
+++ b/tabs/failsafe.css
@@ -211,10 +211,31 @@
     margin-right: 3px;
 }
 
+.tab-failsafe .channelprimary {
+    float:left;   
+    width:60%;   
+}
+
+.tab-failsafe .channelauxiliary {
+    float:left;   
+    width:60%;
+    padding-top: 2px;
+}
+
 .tab-failsafe .channelname {
     margin-right: 3px;
 }
 
+.tab-failsafe .channelsetting {
+    float:left;    
+    width:25%;    
+}
+
+.tab-failsafe .auxiliary {
+    float:left;    
+    width:15%;    
+}
+
 .tab-failsafe .note {
     margin-bottom: 20px;
 }
diff --git a/tabs/failsafe.html b/tabs/failsafe.html
index ee768da0..1b0951b0 100644
--- a/tabs/failsafe.html
+++ b/tabs/failsafe.html
@@ -39,9 +39,7 @@
             <div class="gui_box grey newpane">
                 <div class="gui_box_titlebar">
                     <div class="spacer_box_title" i18n="failsafePulsrangeTitle"></div>
-                    <div class="helpicon cf_tip">
-                        <div class="cf_tooltiptext" i18n="failsafePulsrangeHelp"></div>
-                    </div>
+                    <div class="helpicon cf_tip" i18n_title="failsafePulsrangeHelp"></div>
                 </div>
                 <div class="spacer_box">
                     <div class="number">
@@ -59,9 +57,7 @@
             <div class="gui_box grey stage1 newpane">
                 <div class="gui_box_titlebar">
                     <div class="spacer_box_title" i18n="failsafeChannelFallbackSettingsTitle"></div>
-                    <div class="helpicon cf_tip">
-                        <div class="cf_tooltiptext" i18n="failsafeChannelFallbackSettingsHelp"></div>
-                    </div>
+                    <div class="helpicon cf_tip" i18n_title="failsafeChannelFallbackSettingsHelp"></div>
                 </div>
                 <div class="spacer_box">
                     <div class="activechannellist">
@@ -82,9 +78,7 @@
                         </div>
                         <label for="failsafe_feature_new"><span i18n="failsafeFeatureItem"></span>
                         </label>
-                        <div class="helpicon cf_tip">
-                            <div class="cf_tooltiptext" i18n="failsafeFeatureHelp"></div>
-                        </div>
+                        <div class="helpicon cf_tip" i18n_title="failsafeFeatureHelp"></div>
                     </div>
                     <div class="checkbox stage2">
                         <div class="numberspacer" >
@@ -92,25 +86,19 @@
                         </div>
                         <label for="failsafe_kill_switch"><span i18n="failsafeKillSwitchItem"></span>
                         </label>
-                        <div class="helpicon cf_tip">
-                            <div class="cf_tooltiptext" i18n="failsafeKillSwitchHelp"></div>
-                        </div>
+                        <div class="helpicon cf_tip" i18n_title="failsafeKillSwitchHelp"></div>
                     </div>
                     <div class="number stage2">
                         <label> <input type="number" name="failsafe_delay" min="0" max="2000" /> <span
                             i18n="failsafeDelayItem"></span>
                         </label>
-                        <div class="helpicon cf_tip">
-                            <div class="cf_tooltiptext" i18n="failsafeDelayHelp"></div>
-                        </div>
+                        <div class="helpicon cf_tip" i18n_title="failsafeDelayHelp"></div>
                     </div>
                     <div class="number stage2">
                         <label> <input type="number" name="failsafe_throttle_low_delay" min="0" max="2000" /> <span
                             i18n="failsafeThrottleLowItem"></span>
                         </label>
-                        <div class="helpicon cf_tip">
-                            <div class="cf_tooltiptext" i18n="failsafeThrottleLowHelp"></div>
-                        </div>
+                        <div class="helpicon cf_tip" i18n_title="failsafeThrottleLowHelp"></div>
                     </div>
                     <!-- radio buttons  -->
                     <div class="subline stage2" i18n="failsafeSubTitle1"></div>
@@ -133,9 +121,7 @@
                                 <label> <input type="number" name="failsafe_off_delay" min="0" max="2000" /> <span
                                     i18n="failsafeOffDelayItem"></span>
                                 </label>
-                                <div class="helpicon cf_tip">
-                                    <div class="cf_tooltiptext" i18n="failsafeOffDelayHelp"></div>
-                                </div>
+                                <div class="helpicon cf_tip" i18n_title="failsafeOffDelayHelp"></div>
                             </div>
                         </div>
                     </div>
diff --git a/tabs/failsafe.js b/tabs/failsafe.js
index 891bbed9..620c22fb 100644
--- a/tabs/failsafe.js
+++ b/tabs/failsafe.js
@@ -126,34 +126,31 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
                 if (i < channelNames.length) {
                     fullChannels_e.append('\
                         <div class="number">\
-                            <div style="width:60%; float:left;">\
+                            <div class="channelprimary">\
                                 <span>' + channelNames[i] + '</span>\
                             </div>\
-                            <div class="cf_tip" style="width:25%; float:left;">\
-                                <div class="cf_tooltiptext" style="display:none;"><strong>Auto</strong> means Roll, Pitch and Yaw to center and Throttle low. <strong>Hold</strong> means maintain the last good value received.</div>\
+                            <div class="cf_tip channelsetting" title="' + chrome.i18n.getMessage("failsafeChannelFallbackSettingsAuto") + '">\
                                 <select class="aux_set" id="' + i + '">\
                                     <option value="0">Auto</option>\
                                     <option value="1">Hold</option>\
                                 </select>\
                             </div>\
-                            <div style="width:15%; float:left;"><input type="number" name="aux_value" min="750" max="2250" id="' + i + '"/></div>\
                         </div>\
                     ');
                 } else {
                     fullChannels_e.append('\
                         <div class="number">\
-                            <div style="width:60%; float:left; padding-top: 2px;">\
+                            <div class="channelauxiliary">\
                                 <span class="channelname">' + chrome.i18n.getMessage("controlAxisAux" + (aux_index++)) + '</span>\
                                 ' + auxAssignment[aux_assignment_index++] + '\
                             </div>\
-                            <div class="cf_tip" style="width:25%; float:left;">\
-                                <div class="cf_tooltiptext" style="display:none;"><strong>Hold</strong> means maintain the last good value received. <strong>Set</strong> means the value given here will be used. </div>\
+                            <div class="cf_tip channelsetting" title="' + chrome.i18n.getMessage("failsafeChannelFallbackSettingsHold") + '">\
                                 <select class="aux_set" id="' + i + '">\
                                     <option value="1">Hold</option>\
                                     <option value="2">Set</option>\
                                 </select>\
                             </div>\
-                            <div style="width:15%; float:left;"><input type="number" name="aux_value" min="750" max="2250" id="' + i + '"/></div>\
+                            <div class="auxiliary"><input type="number" name="aux_value" min="750" max="2250" id="' + i + '"/></div>\
                         </div>\
                     ');
                 }