diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 23a59375..c8fd7714 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -24,17 +24,21 @@
 
   <body class='h-screen overflow-hidden relative'>
     <!-- Fixed Navbar -->
-    <div class='fixed w-full z-40 bg-base-100 shadow-md h-16'>
+    <div class='fixed w-full z-50 bg-base-100 shadow-md h-16'>
       <div class='container mx-auto h-full w-full flex items-center'>
         <%= render 'shared/navbar' %>
       </div>
     </div>
 
     <!-- Flash Messages - Fixed below navbar -->
-    <div class='container mx-auto px-5'>
-      <%= render 'shared/flash' %>
+    <div class='fixed top-16 w-full z-40 h-8'>
+      <div class='container mx-auto px-5'>
+        <%= render 'shared/flash' %>
+      </div>
     </div>
 
+    <!-- Date Navigation - Fixed below flash messages -->
+
     <!-- Full Screen Map Container -->
     <div class='absolute top-40 left-0 right-0 bottom-0 w-full z-10 overflow-auto'>
       <%= yield %>
