diff --git a/lang/af/LC_MESSAGES/default.po b/lang/af/LC_MESSAGES/default.po
index 928260a..183df07 100644
--- a/lang/af/LC_MESSAGES/default.po
+++ b/lang/af/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Strate"
 msgid "satellite"
 msgstr "Satelliet"
 
-msgid "esri_satellite"
-msgstr "Esri Satelliet"
 
 msgid "topographic"
 msgstr "Topografiese"
diff --git a/lang/ar/LC_MESSAGES/default.po b/lang/ar/LC_MESSAGES/default.po
index 78c7fcd..90b5c5b 100644
--- a/lang/ar/LC_MESSAGES/default.po
+++ b/lang/ar/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "شوارع"
 msgid "satellite"
 msgstr "قمر صناعي"
 
-msgid "esri_satellite"
-msgstr "قمر صناعي ESRI"
 
 msgid "topographic"
 msgstr "طوبوغرافي"
diff --git a/lang/be/LC_MESSAGES/default.po b/lang/be/LC_MESSAGES/default.po
index 2ec3349..29025ae 100644
--- a/lang/be/LC_MESSAGES/default.po
+++ b/lang/be/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Вуліцы"
 msgid "satellite"
 msgstr "Спадарожнік"
 
-msgid "esri_satellite"
-msgstr "Спадарожнік ESRI"
 
 msgid "topographic"
 msgstr "Тапаграфічная"
diff --git a/lang/bg/LC_MESSAGES/default.po b/lang/bg/LC_MESSAGES/default.po
index f54b414..92648fd 100644
--- a/lang/bg/LC_MESSAGES/default.po
+++ b/lang/bg/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Улици"
 msgid "satellite"
 msgstr "Сателит"
 
-msgid "esri_satellite"
-msgstr "ESRI Сателит"
 
 msgid "topographic"
 msgstr "Топографска"
diff --git a/lang/ca/LC_MESSAGES/default.po b/lang/ca/LC_MESSAGES/default.po
index e0480c4..cb886e8 100644
--- a/lang/ca/LC_MESSAGES/default.po
+++ b/lang/ca/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Carrers"
 msgid "satellite"
 msgstr "Satèl·lit"
 
-msgid "esri_satellite"
-msgstr "Satèl·lit ESRI"
 
 msgid "topographic"
 msgstr "Topogràfic"
diff --git a/lang/cs/LC_MESSAGES/default.po b/lang/cs/LC_MESSAGES/default.po
index fbd69d6..fdd1806 100644
--- a/lang/cs/LC_MESSAGES/default.po
+++ b/lang/cs/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Ulice"
 msgid "satellite"
 msgstr "Satelitní"
 
-msgid "esri_satellite"
-msgstr "Esri Satelitní"
 
 msgid "topographic"
 msgstr "Topografická"
diff --git a/lang/da/LC_MESSAGES/default.po b/lang/da/LC_MESSAGES/default.po
index 2170457..bc163b2 100644
--- a/lang/da/LC_MESSAGES/default.po
+++ b/lang/da/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Gader"
 msgid "satellite"
 msgstr "Satellit"
 
-msgid "esri_satellite"
-msgstr "ESRI Satellit"
 
 msgid "topographic"
 msgstr "Topografisk"
diff --git a/lang/de/LC_MESSAGES/default.po b/lang/de/LC_MESSAGES/default.po
index 8bea16e..8de8282 100644
--- a/lang/de/LC_MESSAGES/default.po
+++ b/lang/de/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Straßen"
 msgid "satellite"
 msgstr "Satellit"
 
-msgid "esri_satellite"
-msgstr "ESRI-Satellit"
 
 msgid "topographic"
 msgstr "Topographisch"
diff --git a/lang/el/LC_MESSAGES/default.po b/lang/el/LC_MESSAGES/default.po
index 9118715..defbc98 100644
--- a/lang/el/LC_MESSAGES/default.po
+++ b/lang/el/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Δρόμοι"
 msgid "satellite"
 msgstr "Δορυφόρος"
 
-msgid "esri_satellite"
-msgstr "ESRI Δορυφόρος"
 
 msgid "topographic"
 msgstr "Τοπογραφικός"
diff --git a/lang/en/LC_MESSAGES/default.po b/lang/en/LC_MESSAGES/default.po
index cbdef15..e00fd81 100644
--- a/lang/en/LC_MESSAGES/default.po
+++ b/lang/en/LC_MESSAGES/default.po
@@ -190,8 +190,6 @@ msgstr "Streets"
 msgid "satellite"
 msgstr "Satellite"
 
-msgid "esri_satellite"
-msgstr "Esri Satellite"
 
 msgid "topographic"
 msgstr "Topographic"
diff --git a/lang/eo/LC_MESSAGES/default.po b/lang/eo/LC_MESSAGES/default.po
index b71ba56..492ce04 100644
--- a/lang/eo/LC_MESSAGES/default.po
+++ b/lang/eo/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Stratoj"
 msgid "satellite"
 msgstr "Satelito"
 
-msgid "esri_satellite"
-msgstr "ESRI Satelito"
 
 msgid "topographic"
 msgstr "Topografia"
diff --git a/lang/es/LC_MESSAGES/default.po b/lang/es/LC_MESSAGES/default.po
index 57baeab..6a7aaef 100644
--- a/lang/es/LC_MESSAGES/default.po
+++ b/lang/es/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Calles"
 msgid "satellite"
 msgstr "Satélite"
 
-msgid "esri_satellite"
-msgstr "Satélite ESRI"
 
 msgid "topographic"
 msgstr "Topográfico"
diff --git a/lang/et/LC_MESSAGES/default.po b/lang/et/LC_MESSAGES/default.po
index 1e9865f..eaf212c 100644
--- a/lang/et/LC_MESSAGES/default.po
+++ b/lang/et/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Tänavad"
 msgid "satellite"
 msgstr "Satelliit"
 
-msgid "esri_satellite"
-msgstr "ESRI Satelliit"
 
 msgid "topographic"
 msgstr "Topograafiline"
diff --git a/lang/fa/LC_MESSAGES/default.po b/lang/fa/LC_MESSAGES/default.po
index e16c524..f3f2f7f 100644
--- a/lang/fa/LC_MESSAGES/default.po
+++ b/lang/fa/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "خیابان‌ها"
 msgid "satellite"
 msgstr "ماهواره"
 
-msgid "esri_satellite"
-msgstr "ماهواره ESRI"
 
 msgid "topographic"
 msgstr "توپوگرافی"
diff --git a/lang/fi/LC_MESSAGES/default.po b/lang/fi/LC_MESSAGES/default.po
index d966afb..1539958 100644
--- a/lang/fi/LC_MESSAGES/default.po
+++ b/lang/fi/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Kadut"
 msgid "satellite"
 msgstr "Satelliitti"
 
-msgid "esri_satellite"
-msgstr "ESRI Satelliitti"
 
 msgid "topographic"
 msgstr "Topografinen"
diff --git a/lang/fr/LC_MESSAGES/default.po b/lang/fr/LC_MESSAGES/default.po
index e6b2e63..437639d 100644
--- a/lang/fr/LC_MESSAGES/default.po
+++ b/lang/fr/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Rues"
 msgid "satellite"
 msgstr "Satellite"
 
-msgid "esri_satellite"
-msgstr "Satellite ESRI"
 
 msgid "topographic"
 msgstr "Topographique"
diff --git a/lang/hi/LC_MESSAGES/default.po b/lang/hi/LC_MESSAGES/default.po
index e00fb75..e769c0a 100644
--- a/lang/hi/LC_MESSAGES/default.po
+++ b/lang/hi/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "सड़कें"
 msgid "satellite"
 msgstr "सैटेलाइट"
 
-msgid "esri_satellite"
-msgstr "ESRI सैटेलाइट"
 
 msgid "topographic"
 msgstr "टोपोग्राफिक"
diff --git a/lang/hr/LC_MESSAGES/default.po b/lang/hr/LC_MESSAGES/default.po
index 5207cfb..b01dea6 100644
--- a/lang/hr/LC_MESSAGES/default.po
+++ b/lang/hr/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Ulice"
 msgid "satellite"
 msgstr "Satelit"
 
-msgid "esri_satellite"
-msgstr "ESRI Satelit"
 
 msgid "topographic"
 msgstr "Topografski"
diff --git a/lang/hu/LC_MESSAGES/default.po b/lang/hu/LC_MESSAGES/default.po
index 3cbb8eb..7376e96 100644
--- a/lang/hu/LC_MESSAGES/default.po
+++ b/lang/hu/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Utcák"
 msgid "satellite"
 msgstr "Műhold"
 
-msgid "esri_satellite"
-msgstr "ESRI Műhold"
 
 msgid "topographic"
 msgstr "Topográfiai"
diff --git a/lang/hy/LC_MESSAGES/default.po b/lang/hy/LC_MESSAGES/default.po
index ee5c593..6e0ab2d 100644
--- a/lang/hy/LC_MESSAGES/default.po
+++ b/lang/hy/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Փողոցներ"
 msgid "satellite"
 msgstr "Արհեստական արբանյակ"
 
-msgid "esri_satellite"
-msgstr "ESRI Արհեստական արբանյակ"
 
 msgid "topographic"
 msgstr "Տոպոգրաֆիկ"
diff --git a/lang/id/LC_MESSAGES/default.po b/lang/id/LC_MESSAGES/default.po
index 4f5401c..8717ed9 100644
--- a/lang/id/LC_MESSAGES/default.po
+++ b/lang/id/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Jalan"
 msgid "satellite"
 msgstr "Satelit"
 
-msgid "esri_satellite"
-msgstr "Satelit ESRI"
 
 msgid "topographic"
 msgstr "Topografi"
diff --git a/lang/it/LC_MESSAGES/default.po b/lang/it/LC_MESSAGES/default.po
index 5260196..b8aeccb 100644
--- a/lang/it/LC_MESSAGES/default.po
+++ b/lang/it/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Strade"
 msgid "satellite"
 msgstr "Satellitare"
 
-msgid "esri_satellite"
-msgstr "Satellitare ESRI"
 
 msgid "topographic"
 msgstr "Topografico"
diff --git a/lang/iw/LC_MESSAGES/default.po b/lang/iw/LC_MESSAGES/default.po
index 0921ce9..94e40dd 100644
--- a/lang/iw/LC_MESSAGES/default.po
+++ b/lang/iw/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "רחובות"
 msgid "satellite"
 msgstr "לוויין"
 
-msgid "esri_satellite"
-msgstr "לוויין ESRI"
 
 msgid "topographic"
 msgstr "טופוגרפי"
diff --git a/lang/ja/LC_MESSAGES/default.po b/lang/ja/LC_MESSAGES/default.po
index bac366f..e7408ab 100644
--- a/lang/ja/LC_MESSAGES/default.po
+++ b/lang/ja/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "ストリート"
 msgid "satellite"
 msgstr "衛星"
 
-msgid "esri_satellite"
-msgstr "ESRI 衛星"
 
 msgid "topographic"
 msgstr "地形図"
diff --git a/lang/ko/LC_MESSAGES/default.po b/lang/ko/LC_MESSAGES/default.po
index 8df0d01..92569ec 100644
--- a/lang/ko/LC_MESSAGES/default.po
+++ b/lang/ko/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "거리"
 msgid "satellite"
 msgstr "위성"
 
-msgid "esri_satellite"
-msgstr "ESRI 위성"
 
 msgid "topographic"
 msgstr "지형도"
diff --git a/lang/lt/LC_MESSAGES/default.po b/lang/lt/LC_MESSAGES/default.po
index 6f5b1e2..ec2181d 100644
--- a/lang/lt/LC_MESSAGES/default.po
+++ b/lang/lt/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Gatvės"
 msgid "satellite"
 msgstr "Palydovas"
 
-msgid "esri_satellite"
-msgstr "ESRI palydovas"
 
 msgid "topographic"
 msgstr "Topografinis"
diff --git a/lang/lv/LC_MESSAGES/default.po b/lang/lv/LC_MESSAGES/default.po
index 69f8bf9..b0a57da 100644
--- a/lang/lv/LC_MESSAGES/default.po
+++ b/lang/lv/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Ielas"
 msgid "satellite"
 msgstr "Satelīts"
 
-msgid "esri_satellite"
-msgstr "ESRI satelīts"
 
 msgid "topographic"
 msgstr "Topogrāfiskais"
diff --git a/lang/nl/LC_MESSAGES/default.po b/lang/nl/LC_MESSAGES/default.po
index 14dea78..2a0c44b 100644
--- a/lang/nl/LC_MESSAGES/default.po
+++ b/lang/nl/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Straten"
 msgid "satellite"
 msgstr "Satelliet"
 
-msgid "esri_satellite"
-msgstr "ESRI Satelliet"
 
 msgid "topographic"
 msgstr "Topografisch"
diff --git a/lang/no/LC_MESSAGES/default.po b/lang/no/LC_MESSAGES/default.po
index b1167d5..77201db 100644
--- a/lang/no/LC_MESSAGES/default.po
+++ b/lang/no/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Gater"
 msgid "satellite"
 msgstr "Satellitt"
 
-msgid "esri_satellite"
-msgstr "ESRI Satellitt"
 
 msgid "topographic"
 msgstr "Topografisk"
diff --git a/lang/pl/LC_MESSAGES/default.po b/lang/pl/LC_MESSAGES/default.po
index c43b336..31c5e6f 100644
--- a/lang/pl/LC_MESSAGES/default.po
+++ b/lang/pl/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Ulice"
 msgid "satellite"
 msgstr "Satelita"
 
-msgid "esri_satellite"
-msgstr "Esri Satelita"
 
 msgid "topographic"
 msgstr "Topograficzna"
diff --git a/lang/pt/LC_MESSAGES/default.po b/lang/pt/LC_MESSAGES/default.po
index 55a9058..a6f1874 100644
--- a/lang/pt/LC_MESSAGES/default.po
+++ b/lang/pt/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Ruas"
 msgid "satellite"
 msgstr "Satélite"
 
-msgid "esri_satellite"
-msgstr "Satélite ESRI"
 
 msgid "topographic"
 msgstr "Topográfico"
diff --git a/lang/ro/LC_MESSAGES/default.po b/lang/ro/LC_MESSAGES/default.po
index 6338c2b..20a7134 100644
--- a/lang/ro/LC_MESSAGES/default.po
+++ b/lang/ro/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Străzi"
 msgid "satellite"
 msgstr "Satelit"
 
-msgid "esri_satellite"
-msgstr "Satelit ESRI"
 
 msgid "topographic"
 msgstr "Topografic"
diff --git a/lang/ru/LC_MESSAGES/default.po b/lang/ru/LC_MESSAGES/default.po
index 152f19e..8007059 100644
--- a/lang/ru/LC_MESSAGES/default.po
+++ b/lang/ru/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Улицы"
 msgid "satellite"
 msgstr "Спутник"
 
-msgid "esri_satellite"
-msgstr "Спутник ESRI"
 
 msgid "topographic"
 msgstr "Топографическая"
diff --git a/lang/sk/LC_MESSAGES/default.po b/lang/sk/LC_MESSAGES/default.po
index 62b6fa8..e2ba122 100644
--- a/lang/sk/LC_MESSAGES/default.po
+++ b/lang/sk/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Ulice"
 msgid "satellite"
 msgstr "Satelit"
 
-msgid "esri_satellite"
-msgstr "ESRI Satelit"
 
 msgid "topographic"
 msgstr "Topografické"
diff --git a/lang/sl/LC_MESSAGES/default.po b/lang/sl/LC_MESSAGES/default.po
index 8b7d702..26d1bc7 100644
--- a/lang/sl/LC_MESSAGES/default.po
+++ b/lang/sl/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Ulice"
 msgid "satellite"
 msgstr "Satelit"
 
-msgid "esri_satellite"
-msgstr "ESRI satelit"
 
 msgid "topographic"
 msgstr "Topografsko"
diff --git a/lang/sr/LC_MESSAGES/default.po b/lang/sr/LC_MESSAGES/default.po
index 42dddc9..b05fdc0 100644
--- a/lang/sr/LC_MESSAGES/default.po
+++ b/lang/sr/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Улице"
 msgid "satellite"
 msgstr "Сателит"
 
-msgid "esri_satellite"
-msgstr "ESRI сателит"
 
 msgid "topographic"
 msgstr "Топографска"
diff --git a/lang/sv/LC_MESSAGES/default.po b/lang/sv/LC_MESSAGES/default.po
index ca4e894..99d06b1 100644
--- a/lang/sv/LC_MESSAGES/default.po
+++ b/lang/sv/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Gator"
 msgid "satellite"
 msgstr "Satellit"
 
-msgid "esri_satellite"
-msgstr "ESRI Satellit"
 
 msgid "topographic"
 msgstr "Topografisk"
diff --git a/lang/sw/LC_MESSAGES/default.po b/lang/sw/LC_MESSAGES/default.po
index 8482aa6..326efd1 100644
--- a/lang/sw/LC_MESSAGES/default.po
+++ b/lang/sw/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Mitaa"
 msgid "satellite"
 msgstr "Setilaiti"
 
-msgid "esri_satellite"
-msgstr "Setilaiti ya ESRI"
 
 msgid "topographic"
 msgstr "Topografia"
diff --git a/lang/th/LC_MESSAGES/default.po b/lang/th/LC_MESSAGES/default.po
index 3ba894e..cda462b 100644
--- a/lang/th/LC_MESSAGES/default.po
+++ b/lang/th/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "ถนน"
 msgid "satellite"
 msgstr "ดาวเทียม"
 
-msgid "esri_satellite"
-msgstr "ดาวเทียม ESRI"
 
 msgid "topographic"
 msgstr "ภูมิประเทศ"
diff --git a/lang/tl/LC_MESSAGES/default.po b/lang/tl/LC_MESSAGES/default.po
index a33e188..41b467a 100644
--- a/lang/tl/LC_MESSAGES/default.po
+++ b/lang/tl/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Mga Kalye"
 msgid "satellite"
 msgstr "Satelite"
 
-msgid "esri_satellite"
-msgstr "ESRI Satelite"
 
 msgid "topographic"
 msgstr "Topograpiko"
diff --git a/lang/tr/LC_MESSAGES/default.po b/lang/tr/LC_MESSAGES/default.po
index e18d06d..edfdeb8 100644
--- a/lang/tr/LC_MESSAGES/default.po
+++ b/lang/tr/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Sokaklar"
 msgid "satellite"
 msgstr "Uydu"
 
-msgid "esri_satellite"
-msgstr "ESRI Uydu"
 
 msgid "topographic"
 msgstr "Topografik"
diff --git a/lang/uk/LC_MESSAGES/default.po b/lang/uk/LC_MESSAGES/default.po
index f6ecd56..d5b8b38 100644
--- a/lang/uk/LC_MESSAGES/default.po
+++ b/lang/uk/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Вулиці"
 msgid "satellite"
 msgstr "Супутник"
 
-msgid "esri_satellite"
-msgstr "Супутник ESRI"
 
 msgid "topographic"
 msgstr "Топографічна"
diff --git a/lang/vi/LC_MESSAGES/default.po b/lang/vi/LC_MESSAGES/default.po
index e54522a..3006edd 100644
--- a/lang/vi/LC_MESSAGES/default.po
+++ b/lang/vi/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "Đường phố"
 msgid "satellite"
 msgstr "Vệ tinh"
 
-msgid "esri_satellite"
-msgstr "Vệ tinh ESRI"
 
 msgid "topographic"
 msgstr "Địa hình"
diff --git a/lang/zh-CN/LC_MESSAGES/default.po b/lang/zh-CN/LC_MESSAGES/default.po
index c7921b3..f013786 100644
--- a/lang/zh-CN/LC_MESSAGES/default.po
+++ b/lang/zh-CN/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "街道"
 msgid "satellite"
 msgstr "卫星"
 
-msgid "esri_satellite"
-msgstr "ESRI 卫星"
 
 msgid "topographic"
 msgstr "地形图"
diff --git a/lang/zh-TW/LC_MESSAGES/default.po b/lang/zh-TW/LC_MESSAGES/default.po
index 95ba189..365d9fc 100644
--- a/lang/zh-TW/LC_MESSAGES/default.po
+++ b/lang/zh-TW/LC_MESSAGES/default.po
@@ -184,8 +184,6 @@ msgstr "街道"
 msgid "satellite"
 msgstr "衛星"
 
-msgid "esri_satellite"
-msgstr "ESRI 衛星"
 
 msgid "topographic"
 msgstr "地形"
diff --git a/static/css/style-map.css b/static/css/style-map.css
index 92b1337..afdc8af 100644
--- a/static/css/style-map.css
+++ b/static/css/style-map.css
@@ -1,3 +1,28 @@
+/* Unable to find ... message */
+.message {
+    position: absolute;
+    bottom: 20px;
+    left: 50%;
+    transform: translateX(-50%);
+    padding: 10px;
+    background-color: var(--search-bg);
+    border: 1px solid var(--border);
+    border-radius: 5px;
+    box-shadow: 0 0 10px var(--box-shadow);
+    z-index: 1000;
+    width: auto;
+    max-width: 80%;
+    text-align: center;
+    color: var(--text-color);
+}
+
+/* Map container */
+#map {
+    height: calc(100% - 65px);
+    width: 100%;
+    top: 65px;
+}
+
 .leaflet-control-layers-toggle {
     background-color: var(--button) !important;
     border: 1px solid var(--border) !important;
@@ -35,10 +60,26 @@
 }
 
 .leaflet-bar a,
+.leaflet-bar a:focus,
+.leaflet-bar a:active,
 .leaflet-bar a:hover {
     background-color: var(--button) !important;
     border: 1px solid var(--border) !important;
     color: var(--fg) !important;
+    box-shadow: 0 2px 12px rgba(0,0,0,0.24) !important;
+    transition: background-color 0.2s;
+}
+
+.leaflet-control-layers-toggle,
+.leaflet-control-layers-expanded {
+    background-color: var(--button) !important;
+    border: 1px solid var(--border) !important;
+    color: var(--fg) !important;
+}
+
+.leaflet-bar a:hover,
+.leaflet-bar a:focus {
+    background-color: var(--search-select) !important;
 }
 
 .leaflet-popup-content-wrapper,
@@ -86,25 +127,8 @@
     text-shadow: 1px 1px 2px var(--border) !important;
 }
 
-/* Ensuring dark theme compliance */
-@media (prefers-color-scheme: dark) {
-
-    .leaflet-control-locate,
-    .leaflet-control-layers-toggle,
-    .leaflet-bar a,
-    .leaflet-bar a:hover,
-    .leaflet-popup-content-wrapper,
-    .leaflet-popup-tip,
-    .leaflet-control-attribution,
-    .leaflet-control-scale,
-    .leaflet-control-scale-line {
-        background-color: var(--button) !important;
-        border: 1px solid var(--border) !important;
-        color: var(--fg) !important;
-        text-shadow: 1px 1px 2px var(--background-color) !important;
-    }
-
-    .leaflet-control-attribution a {
-        color: var(--link) !important;
-    }
+@media only screen and (max-width: 880px) {
+  #map {
+    top: 130px !important;
+  }
 }
\ No newline at end of file
diff --git a/static/css/style.css b/static/css/style.css
index 395d67c..9561c86 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -843,50 +843,6 @@ p {
     margin-left: 175px;
 }
 
-/* MAP */
-
-.message {
-    position: absolute;
-    bottom: 20px;
-    left: 50%;
-    transform: translateX(-50%);
-    padding: 10px;
-    background-color: var(--search-bg);
-    border: 1px solid var(--border);
-    border-radius: 5px;
-    box-shadow: 0 0 10px var(--box-shadow);
-    z-index: 1000;
-    width: auto;
-    max-width: 80%;
-    text-align: center;
-    color: var(--text-color);
-}
-
-/* Map container */
-#map {
-    height: calc(100% - 60px);
-    width: 100%;
-    top: 60px;
-}
-
-/* Leaflet control buttons */
-.leaflet-control-locate {
-    background-color: var(--button) !important;
-    border: 1px solid var(--border) !important;
-    color: var(--fg) !important;
-}
-
-/* Leaflet control buttons */
-.leaflet-control-locate {
-    background-color: var(--button) !important;
-    border: 1px solid var(--border) !important;
-    color: var(--fg) !important;
-}
-
-/* Leaflet attribution control */
-
-/* Leaflet scale control */
-
 /* Favicon styling */
 .result_header {
     display: flex;
@@ -911,8 +867,6 @@ p {
     box-shadow: 0 0 2px rgba(0, 0, 0, 0.4);
 }
 
-/* Result link styling */
-
 /* Result item spacing */
 .result_item {
     margin-bottom: 1.5rem;
@@ -966,13 +920,6 @@ p {
     gap: 4px;
 }
 
-/* 
-.result-path::before {
-    content: "›";
-    margin: 0 4px;
-    opacity: 0.6;
-} */
-
 body,
 h1,
 p,
@@ -1312,21 +1259,7 @@ button {
     }
 
     .results_settings {
-        display: flex;
-        /* Enable flexbox */
-        flex-wrap: wrap;
-        /* Allow elements to wrap onto new lines when necessary */
-    }
-}
-
-/* Ensuring dark theme compliance */
-@media (prefers-color-scheme: dark) {
-
-    .leaflet-control-locate {
-        background-color: var(--button) !important;
-        border: 1px solid var(--border) !important;
-        color: var(--fg) !important;
-        text-shadow: 1px 1px 2px var(--background-color) !important;
-        /* Dark theme shadow adjustment */
+        display: flex; /* Enable flexbox */
+        flex-wrap: wrap; /* Allow elements to wrap onto new lines when necessary */
     }
 }
\ No newline at end of file
diff --git a/templates/map.html b/templates/map.html
index 8d51d96..195b772 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -171,80 +171,94 @@
     {{ if .Found }}
     <script>
         document.addEventListener('DOMContentLoaded', function () {
-            var map = L.map('map').setView([{{ .Latitude }}, {{ .Longitude }}], 13); // Set view to found coordinates
+            var map = L.map('map').setView([{{ .Latitude }}, {{ .Longitude }}], 13);
 
-        // Base layers
-        var streets = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-            maxZoom: 19,
-            attribution: '© OpenStreetMap contributors'
-        });
+            // Streets
+            var streets = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+                maxZoom: 20,
+                attribution: '© OpenStreetMap contributors'
+            });
 
-        var satellite = L.tileLayer('https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png', {
-            maxZoom: 19,
-            attribution: '© OpenStreetMap contributors'
-        });
+            // Satellite (correct cords order is: {z}/{y}/{x})
+            var satellite = L.tileLayer(
+                'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
+                    maxZoom: 19,
+                    attribution: 'Tiles © Esri — Source: Esri, Earthstar Geographics, Maxar, GeoEye, CNES/Airbus DS, USDA, USGS, AeroGRID, IGN, and the GIS User Community'
+                }
+            );
 
-        var esriSat = L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{x}/{y}', {
-            maxZoom: 19,
-            attribution: 'Tiles © Esri'
-        });
+            // Topographic
+            var topo = L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', {
+                maxZoom: 17,
+                attribution: '© <a href="https://opentopomap.org">OpenTopoMap</a> contributors'
+            });
 
-        var topo = L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', {
-            maxZoom: 17,
-            attribution: '© OpenTopoMap contributors'
-        });
+            var baseMaps = {
+                "{{ translate "streets" }}": streets,
+                "{{ translate "satellite" }}": satellite,
+                "{{ translate "topographic" }}": topo
+            };
 
-        var baseMaps = {
-            "{{ translate "streets" }}": streets,
-            "{{ translate "satellite" }}": satellite,
-            "{{ translate "esri_satellite" }}": esriSat,
-            "{{ translate "topographic" }}": topo
-        };
+            streets.addTo(map);
 
-        streets.addTo(map); // Add default layer
+            // Layer control
+            L.control.layers(baseMaps).addTo(map);
 
-        // Layer control
-        L.control.layers(baseMaps).addTo(map);
+            // SVG Marker
+            var svgIcon = L.divIcon({
+                className: "",
+                html: `
+                <svg width="32" height="48" viewBox="0 0 32 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <ellipse cx="16" cy="17" rx="13" ry="13" fill="var(--blue)"/>
+                    <path d="M16 48c8-13 13-18 13-31a13 13 0 1 0-26 0c0 13 5 18 13 31z" fill="var(--blue)" stroke="var(--border)" stroke-width="2"/>
+                    <circle cx="16" cy="17" r="6" fill="var(--border)" />
+                </svg>
+                `,
+                iconSize: [32, 48],
+                iconAnchor: [16, 47],
+                popupAnchor: [0, -40],
+            });
 
-        // Marker with passed coordinates
-        L.marker([{{ .Latitude }}, {{ .Longitude }}]).addTo(map)
-            .bindPopup('{{ .Query }}');
+            // Marker with passed coordinates
+            L.marker([{{ .Latitude }}, {{ .Longitude }}], {icon: svgIcon})
+                .addTo(map)
+                .bindPopup('{{ .Query }}');
+            
+            // Add scale control
+            L.control.scale().addTo(map);
 
-        // Add scale control
-        L.control.scale().addTo(map);
+            // Add custom control for geolocation
+            L.Control.geolocate = L.Control.extend({
+                onAdd: function (map) {
+                    var div = L.DomUtil.create('div', 'leaflet-control-locate');
+                    div.title = '{{ translate "locate_me" }}';
+                    L.DomEvent.on(div, 'click', function () {
+                        map.locate({ setView: true, maxZoom: 16 });
+                    });
+                    return div;
+                }
+            });
 
-        // Add custom control for geolocation
-        L.Control.geolocate = L.Control.extend({
-            onAdd: function (map) {
-                var div = L.DomUtil.create('div', 'leaflet-control-locate');
-                div.title = '{{ translate "locate_me" }}';
-                L.DomEvent.on(div, 'click', function () {
-                    map.locate({ setView: true, maxZoom: 16 });
-                });
-                return div;
+            L.control.geolocate = function (opts) {
+                return new L.Control.geolocate(opts);
             }
-        });
 
-        L.control.geolocate = function (opts) {
-            return new L.Control.geolocate(opts);
-        }
+            L.control.geolocate({ position: 'topright' }).addTo(map);
 
-        L.control.geolocate({ position: 'topright' }).addTo(map);
+            // Geolocation function
+            function onLocationFound(e) {
+                var radius = e.accuracy / 2;
+                L.marker(e.latlng).addTo(map)
+                    .bindPopup("{{ translate "you_are_within" }}" + radius + " {{ translate "meters_from_point" }}").openPopup();
+                L.circle(e.latlng, radius).addTo(map);
+            }
 
-        // Geolocation function
-        function onLocationFound(e) {
-            var radius = e.accuracy / 2;
-            L.marker(e.latlng).addTo(map)
-                .bindPopup("{{ translate "you_are_within" }}" + radius + " {{ translate "meters_from_point" }}").openPopup();
-            L.circle(e.latlng, radius).addTo(map);
-        }
+            function onLocationError(e) {
+                alert(e.message);
+            }
 
-        function onLocationError(e) {
-            alert(e.message);
-        }
-
-        map.on('locationfound', onLocationFound);
-        map.on('locationerror', onLocationError);
+            map.on('locationfound', onLocationFound);
+            map.on('locationerror', onLocationError);
         });
     </script>
     <script defer src="/static/js/minimenu.js"></script>