diff --git a/components/MapComponent.js b/components/MapComponent.js
index 1fa4321c7..ff9cfe2b3 100644
--- a/components/MapComponent.js
+++ b/components/MapComponent.js
@@ -701,7 +701,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
 
         // Alle gefundenen Me-Werte zu einem String hinzufügen
         matchingStatuses.forEach((status) => {
-          additionalInfo += `<br>${status.Me} (${status.Na}) `;
+          additionalInfo += `<br>${status.Me} ( <span style="color: ${status.Co};">${status.Na}</span>) `;
         });
 
         const marker = L.marker([station.X, station.Y], {
@@ -724,7 +724,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
 
         marker
           .bindPopup(
-            `<b>${station.LD_Name}</b><br>${station.Device}<br>${station.Area_Short} ${station.Area_Name}<br>${station.Location_Short} ${station.Location_Name}${additionalInfo}<br><br>`
+            `<b>${station.LD_Name}</b><br>${station.Device}<br>${station.Area_Short} (${station.Area_Name})<br>${station.Location_Short} (${station.Location_Name}) <br>${additionalInfo}<br><br>`
           )
           .openPopup();
       });