diff --git a/components/MapComponent.js b/components/MapComponent.js
index 07637c539..c7f3e40d1 100644
--- a/components/MapComponent.js
+++ b/components/MapComponent.js
@@ -328,7 +328,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
       const getIdSystemAndAllowValueMap = new Map(
         GisSystemStatic.map((system) => [system.IdSystem, system.Allow])
       );
-      console.log("getIdSystemAndAllowValueMap:", getIdSystemAndAllowValueMap);
+      //console.log("getIdSystemAndAllowValueMap:", getIdSystemAndAllowValueMap);
 
       if (jsonResponse.Points && statusResponse.Statis) {
         const statisMap = new Map(
@@ -384,10 +384,10 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
 
           marker.bindPopup(`
               <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>
+                <p class="text-lg font-semibold text-gray-900">${station.LD_Name}</p>
+                <span class="text-md font-bold text-gray-800"> ${station.Device}</span><br>
+                <span class="text-gray-800"><strong> ${station.Area_Short} </strong>(${station.Area_Name})</span><br>
+                <span class="text-gray-800"><strong>${station.Location_Short} </strong> (${station.Location_Name})</span>
                 <div class="mt-2">${statusInfo}</div>
               </div>
             `);
@@ -725,7 +725,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
 
   // Effekt zum Loggen der poiTypData, wenn sie sich ändern
   useEffect(() => {
-    console.log("poiTypData aktualisiert:", poiTypData);
+    //console.log("poiTypData aktualisiert:", poiTypData);
   }, [poiTypData]);
 
   //---------------------------------------
@@ -740,7 +740,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
         data.forEach((item) => map.set(item.idPoiTyp, item.name));
         setPoiTypMap(map);
         setIsPoiTypLoaded(true); // Daten wurden erfolgreich geladen
-        console.log("poiTypMap:", map);
+        //console.log("poiTypMap:", map);
         const poiTypName = poiTypMap.get(0) || "Unbekannt";
         //console.log("poiTypName:", poiTypName);
       } catch (error) {