diff --git a/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor.css b/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor.css
index 21b3abd4..cc15d471 100644
--- a/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor.css
+++ b/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor.css
@@ -2,6 +2,7 @@
     background: rgba(0, 0, 0, .3);
     position: relative;
     height: 70px;
+    z-index: 999;
 }
 .navbar-container {
     display: flex;
diff --git a/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor b/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor
index 2614cb3c..c388832c 100644
--- a/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor
+++ b/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor
@@ -34,7 +34,7 @@
 
     private ElementReference _map;
     private IJSObjectReference? _mapModule;
-    private string CssClass => DisableLayout ? string.Empty : "map__navbar";
+    private string CssClass => DisableLayout ? string.Empty : "map_navbar";
     private IReadOnlyDictionary<string, string> FeatureNamesLookup => new Dictionary<string, string>
     {
         ["Review"] = Resources[Messages.Constructor_FeatureReviewerName],
diff --git a/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor.css b/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor.css
index 71d3d5b4..20319670 100644
--- a/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor.css
+++ b/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor.css
@@ -4,6 +4,6 @@
     padding: 0;
     margin: 0;
 }
-.map__navbar {
+.map_navbar {
     margin-top: -70px;  
 }
\ No newline at end of file
diff --git a/src/Inc.TeamAssistant.WebUI/wwwroot/css/main.css b/src/Inc.TeamAssistant.WebUI/wwwroot/css/main.css
index 39cb21c9..774d0fe7 100644
--- a/src/Inc.TeamAssistant.WebUI/wwwroot/css/main.css
+++ b/src/Inc.TeamAssistant.WebUI/wwwroot/css/main.css
@@ -158,7 +158,7 @@ html {
 .marker-btn:hover {
     text-decoration: none;
 }
-.map__navbar .leaflet-top {
+.map_navbar .leaflet-top {
     top: 80px;
 }
 .map-popup {