diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 8824a484..49a9ff00 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -193,6 +193,9 @@
     "serialPortClosedFail": {
         "message": "<span class=\"message-negative\">Failed</span> to close serial port"
     },
+    "serialUnrecoverable" : {
+        "message": "Unrecoverable <span class=\"message-negative\">failure</span> of serial connection, disconnecting..."
+    },
 
     "usbDeviceOpened": {
         "message": "USB device <span class=\"message-positive\">successfully</span> opened with ID: $1"
@@ -921,7 +924,7 @@
     "configurationSerialRX": {
         "message": "Serial Receiver Provider"
     },
-    "configurationSpiRx": {
+    "configurationSpiRX": {
         "message": "SPI Bus Receiver Provider"
     },
     "configurationEepromSaved": {
@@ -1960,6 +1963,9 @@
     "firmwareFlasherShowDevelopmentReleasesDescription":{
         "message": "Show Release-Candidates and Development Releases."
     },
+    "firmwareFlasherOptionLoading": {
+        "message": "Loading ..."
+    },
     "firmwareFlasherOptionLabelSelectFirmware": {
         "message": "Choose a Firmware / Board"
     },
diff --git a/js/serial.js b/js/serial.js
index b224b02d..6921b367 100644
--- a/js/serial.js
+++ b/js/serial.js
@@ -66,7 +66,7 @@ var serial = {
                                                 self.failed = 0;
                                             } else {
                                                 console.log('SERIAL: Connection did not recover from last onReceiveError, disconnecting');
-                                                GUI.log('Unrecoverable <span style="color: red">failure</span> of serial connection, disconnecting...');
+                                                GUI.log(chrome.i18n.getMessage('serialUnrecoverable'));
 
                                                 if (GUI.connected_to || GUI.connecting_to) {
                                                     $('a.connect').click();
@@ -96,7 +96,7 @@ var serial = {
                                             if (info.paused) {
                                                 // assume unrecoverable, disconnect
                                                 console.log('SERIAL: Connection did not recover from ' + self.error + ' condition, disconnecting');
-                                                GUI.log('Unrecoverable <span style="color: red">failure</span> of serial connection, disconnecting...');
+                                                GUI.log(chrome.i18n.getMessage('serialUnrecoverable'));
     
                                                 if (GUI.connected_to || GUI.connecting_to) {
                                                     $('a.connect').click();
diff --git a/main.html b/main.html
index a7368856..5bf483b9 100755
--- a/main.html
+++ b/main.html
@@ -180,7 +180,7 @@
                     <li class="baro" i18n_title="sensorStatusBaro">
                         <div class="baroicon">Baro</div>
                     </li>
-                    <li class="gps" i18n_title="sensorStatusGps">
+                    <li class="gps" i18n_title="sensorStatusGPS">
                         <div class="gpsicon">GPS</div>
                     </li>
                     <li class="sonar" i18n_title="sensorStatusSonar">
diff --git a/tabs/firmware_flasher.html b/tabs/firmware_flasher.html
index ec3edf69..0c653159 100755
--- a/tabs/firmware_flasher.html
+++ b/tabs/firmware_flasher.html
@@ -5,7 +5,7 @@
                 <table class="cf_table" style="margin-top: 10px;">
                     <tr>
                         <td><select name="board">
-                                <option value="0">Loading ...</option>
+                                <option value="0" i18n="firmwareFlasherOptionLoading">Loading ...</option>
                         </select></td>
                         <td><span class="description" i18n="firmwareFlasherOnlineSelectBoardDescription"></span></td>
                     </tr>
@@ -76,7 +76,7 @@
             </div>
             <div class="spacer" style="margin-bottom: 10px;">
                 <strong i18n="firmwareFlasherReleaseTarget"></strong> <span class="target"></span><br /> <strong
-                    i18n="firmwareFlasherReleaseName"></strong> <a i18n_title="firmwareFlasherReleaseUrl" class="name"
+                    i18n="firmwareFlasherReleaseName"></strong> <a i18n_title="firmwareFlasherReleaseVersionUrl" class="name"
                     href="#" target="_blank"></a><br /> <strong i18n="firmwareFlasherReleaseFile"></strong> <a
                     i18n_title="firmwareFlasherReleaseFileUrl" class="file" href="#" target="_blank"></a><br /> <strong
                     i18n="firmwareFlasherReleaseDate"></strong> <span class="date"></span><br /> <strong
diff --git a/tabs/osd.html b/tabs/osd.html
old mode 100755
new mode 100644
index bf576a4d..42c7ade4
--- a/tabs/osd.html
+++ b/tabs/osd.html
@@ -8,7 +8,7 @@
             </div>
             <div class="unsupported hide">
                 <p class="note" i18n="osdSetupUnsupportedNote1" />
-                <p class="note" i18n="osdsetupUnsupportedNote2" />
+                <p class="note" i18n="osdSetupUnsupportedNote2" />
             </div>
             <div class="supported hide">
                 <div style="margin-bottom: 20px;">
diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html
index 6608081d..a58e85dc 100755
--- a/tabs/pid_tuning.html
+++ b/tabs/pid_tuning.html
@@ -72,7 +72,7 @@
                     <div class="gui_box grey topspacer" style="margin-top: 0px;">
                         <table class="pid_titlebar">
                             <tr>
-                                <th class="name" i18n="pidTuningName"></th>
+                                <th class="name"></th>
                                 <th class="proportional" i18n="pidTuningProportional"></th>
                                 <th class="integral" i18n="pidTuningIntegral"></th>
                                 <th class="derivative" i18n="pidTuningDerivative"></th>