diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index afc0df0e..74d3c0ea 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -213,8 +213,8 @@
     "fcInfoReceived": {
         "message": "Flight controller info, identifier: <strong>$1</strong>, version: <strong>$2</strong>"
     },
-    "versionLabelHardware": {
-        "message": "Board"
+    "versionLabelTarget": {
+        "message": "Target"
     },
     "versionLabelFirmware": {
         "message": "Firmware"
diff --git a/main.js b/main.js
index 2152b0df..12e10b43 100644
--- a/main.js
+++ b/main.js
@@ -518,31 +518,42 @@ function generateFilename(prefix, suffix) {
     return filename + '.' + suffix;
 }
 
-function updateTopBarVersion(firmwareVersion, firmwareId, hardwareId) {
-    var versionText = chrome.i18n.getMessage('versionLabelConfigurator') + ': ' + chrome.runtime.getManifest().version + '<br />';
+function getFirmwareVersion(firmwareVersion, firmwareId, hardwareId) {
+    var versionText = '';
 
     if (firmwareVersion) {
         versionText += chrome.i18n.getMessage('versionLabelFirmware') + ': ' + firmwareId + ' ' + firmwareVersion;
+
         if (hardwareId) {
-           versionText += ' (Target: ' + hardwareId + ')';
+           versionText += ' (' + chrome.i18n.getMessage('versionLabelTarget') + ': ' + hardwareId + ')';
         }
     }
 
+    return versionText;
+}
+
+function getConfiguratorVersion() {
+    return chrome.i18n.getMessage('versionLabelConfigurator') + ': ' + chrome.runtime.getManifest().version;
+}
+
+function updateTopBarVersion(firmwareVersion, firmwareId, hardwareId) {
+    var versionText = getConfiguratorVersion() + '<br />';
+
+    versionText = versionText + getFirmwareVersion(firmwareVersion, firmwareId, hardwareId);
+
     $('#logo .logo_text').html(versionText);
 }
 
 function updateStatusBarVersion(firmwareVersion, firmwareId, hardwareId) {
     var versionText = '';
 
-    if (hardwareId) {
-        versionText = versionText + chrome.i18n.getMessage('versionLabelHardware') + ': ' + hardwareId + ', ';
+    versionText = versionText + getFirmwareVersion(firmwareVersion, firmwareId, hardwareId);
+
+    if (versionText !== '') {
+        versionText = versionText + ', ';
     }
 
-    if (firmwareVersion) {
-        versionText = versionText + chrome.i18n.getMessage('versionLabelFirmware') + ': ' + firmwareId + ' ' + firmwareVersion + ', ';
-    }
-
-    versionText = versionText + chrome.i18n.getMessage('versionLabelConfigurator') + ': ' + chrome.runtime.getManifest().version;
+    versionText = versionText + getConfiguratorVersion();
 
     $('#status-bar .version').text(versionText);
 }