diff --git a/src/map-engine/popup-templates.ts b/src/map-engine/popup-templates.ts
index 816ee3a..99355ca 100644
--- a/src/map-engine/popup-templates.ts
+++ b/src/map-engine/popup-templates.ts
@@ -84,7 +84,8 @@ export function buildView( entry: SpotPoint, feedCount = 1 ): PopupView {
         showLocalTime,
         localtime: entry.localtime,
         localdate: entry.localdate,
-        message: entry.message,
+        imageUrl: entry.type === 'MEDIA' ? entry.message : undefined,
+        message: entry.type === 'MEDIA' ? undefined : entry.message,
         altitude: entry.altitude > 0 ? entry.altitude : undefined,
         showBattery: entry.battery_status === 'LOW',
         hiddenPoints: entry.hiddenPoints
diff --git a/src/spotmap/block.json b/src/spotmap/block.json
index badf7a9..fc6ff2a 100644
--- a/src/spotmap/block.json
+++ b/src/spotmap/block.json
@@ -83,5 +83,6 @@
         }
     },
     "editorScript": "file:./index.js",
+    "editorStyle": "file:../../build/spotmap-map.css",
     "render": "file:../../public/render-block.php"
 }