diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb
index 1361113c8..c8e8d67ac 100644
--- a/app/views/static/site_map.html.erb
+++ b/app/views/static/site_map.html.erb
@@ -5,113 +5,122 @@
     <section class="flex-auto space-y-4">
       <ul>
         <li><h2>Posts</h2></li>
-        <li><%= link_to_wiki "Help", "help:posts" %></li>
-        <li><%= link_to("Listing", posts_path) %></li>
+        <li><%= link_to("Posts", posts_path) %></li>
         <li><%= link_to("Upload", new_upload_path) %></li>
         <li><%= link_to("Popular", popular_explore_posts_path) %></li>
         <li><%= link_to("Curated", curated_explore_posts_path) %></li>
-        <li><%= link_to("Most Viewed", viewed_explore_posts_path) %></li>
         <li><%= link_to("Votes", post_votes_path) %></li>
-        <% if policy(PostApproval).create? %>
-          <li><%= link_to("Modqueue", modqueue_index_path) %></li>
-        <% end %>
+        <li><%= link_to("Most Viewed", viewed_explore_posts_path) %></li>
+        <li><%= link_to("Similar Image Search", iqdb_queries_path) %></li>
+        <li><%= link_to_wiki "Help", "help:posts" %></li>
       </ul>
+
       <ul>
         <li><h2>Post Events</h2></li>
-        <li><%= link_to("Changes", post_versions_path) %></li>
+        <li><%= link_to("Tag History", post_versions_path) %></li>
         <li><%= link_to("Approvals", post_approvals_path) %></li>
         <li><%= link_to("Disapprovals", post_disapprovals_path) %></li>
         <li><%= link_to("Appeals", post_appeals_path) %></li>
         <li><%= link_to("Flags", post_flags_path) %></li>
         <li><%= link_to("Replacements", post_replacements_path) %></li>
       </ul>
-      <ul>
-        <li><h2>Tools</h2></li>
-        <li><%= link_to("Source Code", Danbooru.config.source_code_url) %></li>
-        <li><%= link_to("Bug Reports", Danbooru.config.issues_url) %></li>
-        <li><%= link_to("Keyboard Shortcuts", keyboard_shortcuts_path) %></li>
-        <li><%= link_to("Bookmarklet", bookmarklet_path) %></li>
-        <li><%= link_to_wiki "User Scripts", "about:userscripts" %></li>
-        <li><%= link_to_wiki "API Documentation", "help:api" %></li>
-        <li><%= link_to("Similar Images Search", iqdb_queries_path) %></li>
-      </ul>
+
       <ul>
         <li><h2>Artists</h2></li>
+        <li><%= link_to("Artists", artists_path) %></li>
+        <li><%= link_to("History", artist_versions_path) %></li>
         <li><%= link_to_wiki "Help", "help:artists" %></li>
-        <li><%= link_to("Listing", artists_path) %></li>
-        <li><%= link_to("Banned", banned_artists_path) %></li>
-        <li><%= link_to("Changes", artist_versions_path) %></li>
+      </ul>
+
+      <ul>
+        <li><h2>Artist commentary</h2></li>
+        <li><%= link_to("Commentary", artist_commentaries_path) %></li>
+        <li><%= link_to("History", artist_commentary_versions_path) %></li>
+        <li><%= link_to_wiki "Help", "help:artist_commentary" %></li>
       </ul>
     </section>
+
     <section class="flex-auto space-y-4">
       <ul>
         <li><h2>Tags</h2></li>
-        <li><%= link_to_wiki "Help", "help:tags" %></li>
-        <li><%= link_to_wiki "Cheat sheet", "help:cheatsheet" %></li>
-        <li><%= link_to("Listing", tags_path) %></li>
+        <li><%= link_to("Tags", tags_path) %></li>
         <li><%= link_to("History", tag_versions_path) %></li>
         <li><%= link_to("Aliases", tag_aliases_path) %></li>
         <li><%= link_to("Implications", tag_implications_path) %></li>
         <li><%= link_to("AI Tags", ai_tags_path) %></li>
         <li><%= link_to("Related Tags", related_tag_path) %></li>
+        <li><%= link_to_wiki "Cheat sheet", "help:cheatsheet" %></li>
+        <li><%= link_to_wiki "Help", "help:tags" %></li>
       </ul>
+
       <ul>
         <li><h2>Notes</h2></li>
+        <li><%= link_to("Notes", notes_path) %></li>
+        <li><%= link_to("History", note_versions_path) %></li>
         <li><%= link_to_wiki "Help", "help:notes" %></li>
-        <li><%= link_to("Listing", notes_path) %></li>
-        <li><%= link_to("Changes", note_versions_path) %></li>
       </ul>
+
       <ul>
         <li><h2>Pools</h2></li>
-        <li><%= link_to_wiki "Help", "help:pools" %></li>
-        <li><%= link_to("Listing", pools_path) %></li>
+        <li><%= link_to("Pools", pools_path) %></li>
         <li><%= link_to("Gallery", gallery_pools_path) %></li>
         <% if PoolVersion.enabled? %>
-          <li><%= link_to("Changes", pool_versions_path) %></li>
+          <li><%= link_to("History", pool_versions_path) %></li>
         <% end %>
+        <li><%= link_to_wiki "Help", "help:pools" %></li>
       </ul>
+
       <ul>
         <li><h2>Reports</h2></li>
-        <li><%= link_to("Performance Reports", "https://isshiki.donmai.us/user-reports") %></li>
-        <li><%= link_to("Dashboard", moderator_dashboard_path) %></li>
+        <li><%= link_to("User Reports", "https://isshiki.donmai.us/user-reports") %></li>
         <li><%= link_to("Top Searches", searches_explore_posts_path) %></li>
         <li><%= link_to("Missed Searches", missed_searches_explore_posts_path) %></li>
       </ul>
     </section>
+
     <section class="flex-auto space-y-4">
       <% if Danbooru.config.comments_enabled?.to_s.truthy? %>
         <ul>
           <li><h2>Comments</h2></li>
-          <li><%= link_to_wiki "Help", "help:comments" %></li>
-          <li><%= link_to("Listing", comments_path) %></li>
+          <li><%= link_to("Comments", comments_path) %></li>
           <li><%= link_to("Search", search_comments_path) %></li>
           <li><%= link_to("Votes", comment_votes_path) %></li>
           <li><%= link_to("RSS", comments_path(:atom)) %></li>
+          <li><%= link_to_wiki "Help", "help:comments" %></li>
         </ul>
       <% end %>
+
       <% if Danbooru.config.forum_enabled?.to_s.truthy? %>
         <ul>
           <li><h2>Forum</h2></li>
-          <li><%= link_to_wiki "Help", "help:forum" %></li>
-          <li><%= link_to("Listing", forum_topics_path) %></li>
+          <li><%= link_to("Forum", forum_topics_path) %></li>
           <li><%= link_to("Search", search_forum_posts_path) %></li>
+          <li><%= link_to("Bulk Update Requests", bulk_update_requests_path) %></li>
           <li><%= link_to("Votes", forum_post_votes_path) %></li>
           <li><%= link_to("RSS", forum_topics_path(:atom)) %></li>
+          <li><%= link_to_wiki "Help", "help:forum" %></li>
         </ul>
       <% end %>
+
       <ul>
         <li><h2>Wiki</h2></li>
+        <li><%= link_to_wiki "Wiki", "help:home" %></li>
+        <li><%= link_to("Search", wiki_pages_path) %></li>
+        <li><%= link_to("History", wiki_page_versions_path) %></li>
         <li><%= link_to_wiki "Help", "help:wiki" %></li>
-        <li><%= link_to("Listing", wiki_pages_path) %></li>
-        <li><%= link_to("Changes", wiki_page_versions_path) %></li>
       </ul>
+
       <ul>
-        <li><h2>Artist commentary</h2></li>
-        <li><%= link_to_wiki "Help", "help:artist_commentary" %></li>
-        <li><%= link_to("Listing", artist_commentaries_path) %></li>
-        <li><%= link_to("Changes", artist_commentary_versions_path) %></li>
+        <li><h2>Site</h2></li>
+        <li><%= link_to("Server Status", status_path) %></li>
+        <li><%= link_to("Source Code", Danbooru.config.source_code_url) %></li>
+        <li><%= link_to_wiki "User Scripts", "about:userscripts" %></li>
+        <li><%= link_to("Keyboard Shortcuts", keyboard_shortcuts_path) %></li>
+        <li><%= link_to_wiki "API Documentation", "help:api" %></li>
+        <li><%= link_to("Background Jobs", jobs_path) %></li>
       </ul>
     </section>
+
     <section class="flex-auto space-y-4">
       <ul>
         <li><h2>Profile</h2></li>
@@ -132,55 +141,63 @@
         <% end %>
         <li><%= link_to "Upgrade account", new_user_upgrade_path %></li>
       </ul>
+
       <ul>
         <li><h2>Users</h2></li>
-        <li><%= link_to_wiki "Help", "help:users" %></li>
-        <li><%= link_to("Listing", users_path) %></li>
+        <li><%= link_to("Users", users_path) %></li>
         <li><%= link_to("Bans", bans_path) %></li>
-        <li><%= link_to("Feedback", user_feedbacks_path) %></li>
-        <li><%= link_to("Terms of Service", terms_of_service_path) %></li>
-        <li><%= link_to("2257 Statement", usc_2257_path) %></li>
-        <li><%= link_to("Privacy Policy", privacy_policy_path) %></li>
-      </ul>
-      <ul>
-        <li><h2>Admin</h2></li>
-        <li><%= link_to("Mod Actions", mod_actions_path) %></li>
 
-        <% if policy(UserAction).index? %>
-          <li><%= link_to("User Actions", user_actions_path) %></li>
-        <% end %>
-
-        <li><%= link_to("Bulk Update Requests", bulk_update_requests_path) %></li>
-
-        <% if policy(UserNameChangeRequest).index? %>
-          <li><%= link_to("User Name Change Requests", user_name_change_requests_path) %></li>
-        <% end %>
-
-        <% if policy(ModerationReport).index? %>
-          <li><%= link_to("Moderation Reports", moderation_reports_path) %></li>
-        <% end %>
-
-        <% if policy(UserEvent).index? %>
-          <li><%= link_to("User Events", user_events_path) %></li>
+        <% if policy(IpBan).index? %>
+          <li><%= link_to("IP Bans", ip_bans_path) %></li>
         <% end %>
 
         <% if policy(EmailAddress).index? %>
           <li><%= link_to("Email Addresses", emails_path) %></li>
         <% end %>
 
-        <% if policy(IpAddress).index? %>
-          <li><%= link_to("IP Addresses", ip_addresses_path) %></li>
+        <% if policy(UserNameChangeRequest).index? %>
+          <li><%= link_to("Name Changes", user_name_change_requests_path) %></li>
         <% end %>
 
-        <% if policy(IpBan).index? %>
-          <li><%= link_to("IP Bans", ip_bans_path) %></li>
+        <li><%= link_to("Feedback", user_feedbacks_path) %></li>
+        <li><%= link_to_wiki "Help", "help:users" %></li>
+      </ul>
+
+      <ul>
+        <li><h2>Admin</h2></li>
+
+        <% if policy(PostApproval).create? %>
+          <li><%= link_to("Modqueue", modqueue_index_path) %></li>
+        <% end %>
+
+        <li><%= link_to("Mod Actions", mod_actions_path) %></li>
+
+        <% if policy(UserAction).index? %>
+          <li><%= link_to("User Actions", user_actions_path) %></li>
+        <% end %>
+
+        <% if policy(UserEvent).index? %>
+          <li><%= link_to("User Events", user_events_path) %></li>
+        <% end %>
+
+        <% if policy(ModerationReport).index? %>
+          <li><%= link_to("Moderation Reports", moderation_reports_path) %></li>
+        <% end %>
+
+        <% if policy(IpAddress).index? %>
+          <li><%= link_to("IP Addresses", ip_addresses_path) %></li>
         <% end %>
 
         <% if policy(NewsUpdate).index? %>
           <li><%= link_to("News Updates", news_updates_path) %></li>
         <% end %>
+      </ul>
 
-        <li><%= link_to("Jobs", jobs_path) %></li>
+      <ul>
+        <li><h2>Legal</h2></li>
+        <li><%= link_to("Privacy Policy", privacy_policy_path) %></li>
+        <li><%= link_to("Terms of Service", terms_of_service_path) %></li>
+        <li><%= link_to("2257 Statement", usc_2257_path) %></li>
       </ul>
     </section>
   </div>