diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 29918ff7..c8fd7714 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -38,69 +38,9 @@
     </div>
 
     <!-- Date Navigation - Fixed below flash messages -->
-    <div>
-      <div class='container mx-auto px-5 py-3 h-full flex items-center'>
-        <%= form_with url: map_path(import_id: params[:import_id]), method: :get, class: "w-full" do |f| %>
-          <div class="flex flex-col space-y-4 sm:flex-row sm:space-y-0 sm:space-x-4 sm:items-end w-full">
-            <div class="w-full sm:w-1/12 md:w-1/12 lg:w-1/12">
-              <div class="flex flex-col space-y-2">
-                <span class="tooltip" data-tip="<%= human_date(@start_at - 1.day) %>">
-                  <%= link_to map_path(start_at: @start_at - 1.day, end_at: @end_at - 1.day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost w-full" do %>
-                    ◀️
-                  <% end %>
-                </span>
-              </div>
-            </div>
-            <div class="w-full sm:w-2/12 md:w-1/12 lg:w-2/12">
-              <div class="flex flex-col space-y-2">
-                <%= f.label :start_at, class: "text-xs font-semibold" %>
-                <%= f.datetime_local_field :start_at, include_seconds: false, class: "input input-sm input-bordered hover:cursor-pointer hover:input-primary", value: @start_at %>
-              </div>
-            </div>
-            <div class="w-full sm:w-2/12 md:w-1/12 lg:w-2/12">
-              <div class="flex flex-col space-y-2">
-                <%= f.label :end_at, class: "text-xs font-semibold" %>
-                <%= f.datetime_local_field :end_at, include_seconds: false, class: "input input-sm input-bordered hover:cursor-pointer hover:input-primary", value: @end_at %>
-              </div>
-            </div>
-            <div class="w-full sm:w-1/12 md:w-1/12 lg:w-1/12">
-              <div class="flex flex-col space-y-2">
-                <span class="tooltip" data-tip="<%= human_date(@start_at + 1.day) %>">
-                  <%= link_to map_path(start_at: @start_at + 1.day, end_at: @end_at + 1.day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost w-full" do %>
-                    ▶️
-                  <% end %>
-                </span>
-              </div>
-            </div>
-            <div class="w-full sm:w-6/12 md:w-2/12 lg:w-1/12">
-              <div class="flex flex-col space-y-2">
-                <%= f.submit "Search", class: "btn btn-sm btn-primary hover:btn-info" %>
-              </div>
-            </div>
-            <div class="w-full sm:w-6/12 md:w-2/12 lg:w-1/12">
-              <div class="flex flex-col space-y-2 text-center">
-                <%= link_to "Today",
-                  map_path(start_at: Time.current.beginning_of_day, end_at: Time.current.end_of_day, import_id: params[:import_id]),
-                  class: "btn btn-sm border border-base-300 hover:btn-ghost" %>
-              </div>
-            </div>
-            <div class="w-full sm:w-6/12 md:w-3/12 lg:w-2/12">
-              <div class="flex flex-col space-y-2 text-center">
-                <%= link_to "Last 7 days", map_path(start_at: 1.week.ago.beginning_of_day, end_at: Time.current.end_of_day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost" %>
-              </div>
-            </div>
-            <div class="w-full sm:w-6/12 md:w-3/12 lg:w-2/12">
-              <div class="flex flex-col space-y-2 text-center">
-                <%= link_to "Last month", map_path(start_at: 1.month.ago.beginning_of_day, end_at: Time.current.end_of_day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost" %>
-              </div>
-            </div>
-          </div>
-        <% end %>
-      </div>
-    </div>
 
     <!-- Full Screen Map Container -->
-    <div class='absolute left-0 right-0 bottom-0 w-full z-10'>
+    <div class='absolute top-40 left-0 right-0 bottom-0 w-full z-10 overflow-auto'>
       <%= yield %>
     </div>
 
diff --git a/app/views/map/index.html.erb b/app/views/map/index.html.erb
index 42852ee0..9af06639 100644
--- a/app/views/map/index.html.erb
+++ b/app/views/map/index.html.erb
@@ -2,7 +2,7 @@
 
 <div class="flex flex-col lg:flex-row lg:space-x-4 w-full">
   <div class='w-full'>
-    <div class="flex flex-col space-y-4 mb-4 w-full">
+    <div class="flex flex-col space-y-4 mb-4 w-full" style="margin-top: 5rem;">
       <%= form_with url: map_path(import_id: params[:import_id]), method: :get do |f| %>
         <div class="flex flex-col space-y-4 sm:flex-row sm:space-y-0 sm:space-x-4 sm:items-end">
           <div class="w-full sm:w-1/12 md:w-1/12 lg:w-1/12">