diff --git a/src/flightlog_parser.js b/src/flightlog_parser.js
index 681b599d..692d9660 100644
--- a/src/flightlog_parser.js
+++ b/src/flightlog_parser.js
@@ -969,7 +969,7 @@ export function FlightLogParser(logData) {
         // Just Add them anyway
         that.sysConfig[fieldName] = fieldValue;
         break;
-      case "Device UID":
+      case "DeviceUID":
         that.sysConfig.deviceUID = fieldValue;
         break;
       default:
diff --git a/src/main.js b/src/main.js
index cffd675e..86d732f2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -516,15 +516,15 @@ function BlackboxLogViewer() {
         } else {
            $(".log-device-uid-header,.log-device-uid").css('display', 'none');
         }
-        **/
+    **/
 
     // Add log version information to status bar
     const sysConfig = flightLog.getSysConfig();
+
     $(".version", statusBar).text(
-      (sysConfig["Craft name"] != null ? `${sysConfig["Craft name"]} : ` : "") +
-        (sysConfig["Firmware revision"] != null
-          ? sysConfig["Firmware revision"]
-          : "")
+      (sysConfig["Craft name"] != null && sysConfig["Craft name"].length ? `${sysConfig["Craft name"]} : ` : "") +
+      (sysConfig["Firmware revision"] != null ? `${sysConfig["Firmware revision"]}` : "") +
+      (sysConfig.deviceUID != null ? ` (${sysConfig.deviceUID})` : "")
     );
     $(".looptime", statusBar).text(
       stringLoopTime(