diff --git a/components/MapComponent.js b/components/MapComponent.js
index f9ede46f3..df667e9e5 100644
--- a/components/MapComponent.js
+++ b/components/MapComponent.js
@@ -814,13 +814,13 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
             .join("");
 
           marker.bindPopup(`
-            <b>${station.LD_Name}</b><br>
-            ${station.Device}<br>
-            ${station.Area_Short} (${station.Area_Name})
-        <br>
-            ${station.Location_Short} (${station.Location_Name})
-  <br>
-            ${statusInfo}
+            <div class=" bg-white rounded-lg ">
+              <h3 class="text-lg font-semibold text-gray-900">${station.LD_Name}</h3>
+              <p class="text-gray-800"><strong>Gerät:</strong> ${station.Device}</p>
+              <p class="text-gray-800"><strong>Zone:</strong> ${station.Area_Short} (${station.Area_Name})</p>
+              <p class="text-gray-800"><strong>Standort:</strong> ${station.Location_Short} (${station.Location_Name})</p>
+              <div class="mt-2">${statusInfo}</div>
+            </div>
           `);
           return marker;
         });