diff --git a/app/controllers/map_controller.rb b/app/controllers/map_controller.rb
index be255f08..a792a4ab 100644
--- a/app/controllers/map_controller.rb
+++ b/app/controllers/map_controller.rb
@@ -20,7 +20,7 @@ class MapController < ApplicationController
   private
 
   def start_at
-    return 1.month.ago.beginning_of_day.to_i if params[:start_at].nil?
+    return Time.zone.today.beginning_of_day.to_i if params[:start_at].nil?
 
     Time.zone.parse(params[:start_at]).to_i
   end
diff --git a/app/views/map/index.html.erb b/app/views/map/index.html.erb
index d01c0041..51dfb1a6 100644
--- a/app/views/map/index.html.erb
+++ b/app/views/map/index.html.erb
@@ -21,11 +21,6 @@
             <%= f.submit "Search", class: "px-4 py-2 bg-blue-500 text-white rounded-md" %>
           </div>
         </div>
-        <div class="w-full md:w-2/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), class: "px-4 py-2 bg-gray-500 text-white rounded-md" %>
-          </div>
-        </div>
         <div class="w-full md:w-2/12">
           <div class="flex flex-col space-y-2 text-center">
             <%= link_to "Yesterday", map_path(start_at: Date.yesterday.beginning_of_day, end_at: Date.yesterday.end_of_day), class: "px-4 py-2 bg-gray-500 text-white rounded-md" %>
@@ -36,6 +31,11 @@
             <%= link_to "Last 7 days", map_path(start_at: 1.week.ago.beginning_of_day, end_at: Time.current.end_of_day), class: "px-4 py-2 bg-gray-500 text-white rounded-md" %>
           </div>
         </div>
+        <div class="w-full md: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), class: "px-4 py-2 bg-gray-500 text-white rounded-md" %>
+          </div>
+        </div>
       </div>
     <% end %>