diff --git a/frontend/src/components/DataView/DataView.tsx b/frontend/src/components/DataView/DataView.tsx
index 22542302..2c3da12a 100644
--- a/frontend/src/components/DataView/DataView.tsx
+++ b/frontend/src/components/DataView/DataView.tsx
@@ -137,7 +137,9 @@ function DataView() {
         <Fragment>
           <div className="dataview-header-container">
             <b className="dataview-header-title">
-              <MapPin size={20} /> Nuremberg
+              <MapPin size={20} />
+              {currentMapCache.loadedCoordinates.lat.toFixed(6)},{" "}
+              {currentMapCache.loadedCoordinates.lng.toFixed(6)}
             </b>
             <Box id="filter-panel" style={{ maxWidth: "18rem", width: "100%" }}>
               <TextField
diff --git a/frontend/src/components/MapView/MapOptions.tsx b/frontend/src/components/MapView/MapOptions.tsx
index a6c3d148..47793ece 100644
--- a/frontend/src/components/MapView/MapOptions.tsx
+++ b/frontend/src/components/MapView/MapOptions.tsx
@@ -1,10 +1,6 @@
-//import { useState } from "react";
-//import { Stack } from "@phosphor-icons/react";
-//import { useState } from "react";
-import { ArrowsClockwise } from "@phosphor-icons/react";
+import { StackSimple } from "@phosphor-icons/react";
 import "./MapOptions.css";
 import { Tooltip } from "@mui/material";
-//import SearchPopUp from "../PopUp/SearchPopUp";
 import SearchBar from "../PopUp/SearchBar";
 
 interface MapOptionsProps {
@@ -12,37 +8,19 @@ interface MapOptionsProps {
 }
 
 const MapOptions: React.FC<MapOptionsProps> = ({ toggleShowSatellite }) => {
-  // Stores the state of if the search popup is open
-  //const [ifOpenedDialog, setIfOpenedDialog] = useState(false);
-  // const toggleIfOpenedDialog = () => {
-  //   setIfOpenedDialog(!ifOpenedDialog);
-  // };
-
   return (
     <div className="map-options-container">
       <div className="search-bar">
-      <SearchBar/>
+        <SearchBar />
       </div>
-      {/* <Tooltip arrow title="Search for an address" placement="right">
-        <div className="search-map-icon-container leaflet-bar leaflet-control leaflet-control-custom">
-          <MagnifyingGlass
-            className="search-map-icon"
-            onClick={toggleIfOpenedDialog}
-          />
-        </div>
-      </Tooltip> */}
       <Tooltip arrow title="Switch layers" placement="right">
         <div className="layers-map-icon-container leaflet-touch leaflet-bar leaflet-control leaflet-control-custom">
-          <ArrowsClockwise
-            /** ArrowsClockwise requested from po. stack only if we have more than 2 backgrounds */ className="layers-map-icon"
+          <StackSimple
+            className="layers-map-icon"
             onClick={toggleShowSatellite}
           />
         </div>
       </Tooltip>
-      {/* <SearchPopUp
-        onToggleIfOpenedDialog={toggleIfOpenedDialog}
-        ifOpenedDialog={ifOpenedDialog}
-      /> */}
     </div>
   );
 };
diff --git a/frontend/src/components/MapView/MapView.tsx b/frontend/src/components/MapView/MapView.tsx
index a4434a45..db08c0f4 100644
--- a/frontend/src/components/MapView/MapView.tsx
+++ b/frontend/src/components/MapView/MapView.tsx
@@ -131,7 +131,7 @@ const MapView: React.FC<MapViewProps> = ({ datasetId }) => {
         )}
         {tabProps && tabProps.dataset.type === MarkersTypes.Markers && (
           <ZoomWarningLabel
-            label="Zoom in to see marker"
+            label="Zoom in to see the markers"
             minZoom={minZoomForLabel}
           />
         )}