diff --git a/apps/bthrm/bthrm.js b/apps/bthrm/bthrm.js
index e163dd8b7..b07e7bd37 100644
--- a/apps/bthrm/bthrm.js
+++ b/apps/bthrm/bthrm.js
@@ -93,11 +93,11 @@ function draw(){
 
   if (bt && bt.time > (now - VALUE_TIMEOUT)) {
     layout.bt.label = bt.bpm;
-    if (bt.battery) layout.btBattery.label = bt.battery;
+    if (!isNaN(bt.battery)) layout.btBattery.label = bt.battery + "%";
     if (bt.rr) layout.btRR.label = bt.rr.join(",");
-    if (bt.location) layout.btLocation.label = BODY_LOCS[bt.location];
+    if (!isNaN(bt.location)) layout.btLocation.label = BODY_LOCS[bt.location];
     if (bt.contact !== undefined) layout.btContact.label = bt.contact ? "Yes":"No";
-    if (bt.energy) layout.btEnergy.label = bt.energy.toFixed(0) + "kJ";
+    if (!isNaN(bt.energy)) layout.btEnergy.label = bt.energy.toFixed(0) + "kJ";
   } else {
     layout.bt.label = "--";
     layout.btBattery.label = "--";
diff --git a/apps/bthrm/metadata.json b/apps/bthrm/metadata.json
index 0977fd755..fea274ff3 100644
--- a/apps/bthrm/metadata.json
+++ b/apps/bthrm/metadata.json
@@ -5,6 +5,7 @@
   "version": "0.17",
   "description": "Overrides Bangle.js's build in heart rate monitor with an external Bluetooth one.",
   "icon": "app.png",
+  "screenshots": [{"url":"screen.png"}],
   "type": "app",
   "tags": "health,bluetooth,hrm,bthrm",
   "supports": ["BANGLEJS","BANGLEJS2"],
diff --git a/apps/bthrm/screen.png b/apps/bthrm/screen.png
new file mode 100644
index 000000000..6b6b85227
Binary files /dev/null and b/apps/bthrm/screen.png differ