diff --git a/app/views/ip_bans/index.html.erb b/app/views/ip_bans/index.html.erb
index 248ee6787..573dc6de4 100644
--- a/app/views/ip_bans/index.html.erb
+++ b/app/views/ip_bans/index.html.erb
@@ -2,7 +2,7 @@
   <div id="a-index">
     <h1>IP Bans</h1>
 
-    <table class="striped">
+    <table class="striped" width="100%">
       <thead>
         <tr>
           <th>IP Address</th>
diff --git a/app/views/moderator/tags/edit.html.erb b/app/views/moderator/tags/edit.html.erb
index 2f6f6b4a2..a5eff76cf 100644
--- a/app/views/moderator/tags/edit.html.erb
+++ b/app/views/moderator/tags/edit.html.erb
@@ -1,10 +1,10 @@
 <div id="c-moderator-tags">
   <div id="a-edit">
-    <h1>Edit Tags</h1>
+    <h1>Mass Edit</h1>
     
-    <%= form_tag(moderator_tag_path, :method => :put) do %>
+    <%= form_tag(moderator_tag_path, :method => :put, :class => "simple_form") do %>
       <div class="input">
-        <label>Predicate</label>
+        <label>Antecedent</label>
         <%= text_field :tag, :antecedent, :value => params[:antecedent] %>
       </div>
       
@@ -14,12 +14,12 @@
       </div>
       
       <div class="input">
-        <%= submit_tag %>
+        <%= submit_tag "Submit" %>
       </div>
     <% end %>
   </div>
 </div>
 
 <% content_for(:page_title) do %>
-  Edit Tag - <%= Danbooru.config.app_name %>
+  Mass Edit - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb
index d7d35f355..f76c78989 100644
--- a/app/views/static/site_map.html.erb
+++ b/app/views/static/site_map.html.erb
@@ -6,14 +6,28 @@
         <li><h1>Posts</h1></li>
         <li><%= link_to("Help", wiki_pages_path(:title => "help:posts")) %></li>
         <li><%= link_to("Listing", posts_path) %></li>
-        <li><%= link_to("Recent Changes", post_versions_path) %></li>
+        <li><%= link_to("Changes", post_versions_path) %></li>
         <li><%= link_to("Upload", new_upload_path) %></li>
+        <li><%= link_to("Appeals", post_appeals_path) %></li>
+        <li><%= link_to("Flags", post_flags_path) %></li>
+        <% if CurrentUser.is_janitor? %>
+          <li><%= link_to("Moderate", moderator_post_queue_path) %></li>
+        <% end %>
+        <% if CurrentUser.is_admin? %>
+          <li><%= link_to("Mass Edit", edit_moderator_tag_path) %></li>
+        <% end %>
       </ul>
       <ul>
         <li><h1>Tools</h1></li>
         <li><%= link_to("Bookmarklet", bookmarklet_path) %></li>
         <li><%= link_to("API Documentation", wiki_pages_path(:title => "help:api")) %></li>
       </ul>
+      <ul>
+        <li><h1>Artists</h1></li>
+        <li><%= link_to("Help", wiki_pages_path(:title => "help:artists")) %></li>
+        <li><%= link_to("Listing", artists_path) %></li>
+        <li><%= link_to("Changes", artist_versions_path) %></li>
+      </ul>
     </section>
     <section>
       <ul>
@@ -22,23 +36,20 @@
         <li><%= link_to("Cheat sheet", wiki_pages_path(:title => "help:cheatsheet")) %></li>
         <li><%= link_to("Aliases", tag_aliases_path) %></li>
         <li><%= link_to("Implications", tag_implications_path) %></li>
+        <li><%= link_to("Subscriptions",tag_subscriptions_path) %></li>
         <li><%= link_to("Listing", tags_path) %></li>
       </ul>
       <ul>
         <li><h1>Notes</h1></li>
         <li><%= link_to("Help", wiki_pages_path(:title => "help:notes")) %></li>
-        <li><%= link_to("History", note_versions_path) %></li>
+        <li><%= link_to("Changes", note_versions_path) %></li>
         <li><%= link_to("Listing", notes_path) %></li>
       </ul>
-      <ul>
-        <li><h1>Artists</h1></li>
-        <li><%= link_to("Help", wiki_pages_path(:title => "help:artists")) %></li>
-        <li><%= link_to("Listing", artists_path) %></li>
-      </ul>
       <ul>
         <li><h1>Pools</h1></li>
         <li><%= link_to("Help", wiki_pages_path(:title => "help:pools")) %></li>
         <li><%= link_to("Listing", pools_path) %></li>
+        <li><%= link_to("Changes", pool_versions_path) %></li>
       </ul>
     </section>
     <section>
@@ -57,32 +68,40 @@
         <li><h1>Wiki</h1></li>
         <li><%= link_to("Help", wiki_pages_path(:title => "help:wiki")) %></li>
         <li><%= link_to("Listing", wiki_pages_path) %></li>
-        <li><%= link_to("Recent Changes", wiki_page_versions_path) %></li>
+        <li><%= link_to("Changes", wiki_page_versions_path) %></li>
       </ul>
     </section>
     <section>
       <ul>
         <li><h1>Users</h1></li>
+        <% if CurrentUser.is_janitor? %>
+          <li><%= link_to("Dashboard", moderator_dashboard_path) %></li>
+        <% end %>
         <li><%= link_to("Help", wiki_pages_path(:title => "help:users")) %></li>
         <li><%= link_to("Bans", bans_path) %></li>
         <li><%= link_to("Listing", users_path) %></li>
-        <% unless CurrentUser.nil? %>
+        <% unless CurrentUser.is_anonymous? %>
           <li><%= link_to("Profile", user_path(CurrentUser.user)) %></li>
+          <li><%= link_to("Settings", edit_user_path(CurrentUser.user)) %></li>
         <% end %>
         <li><%= link_to("Feedback", user_feedbacks_path) %></li>
-        <li><%= link_to("Settings", edit_user_path(CurrentUser.user)) %></li>
         <li><%= link_to("Signup", new_user_path) %></li>
         <li><%= link_to("Terms of Service", terms_of_service_path) %></li>
       </ul>
-      <% if CurrentUser.is_admin? %>
-        <ul>
-          <li><h1>Admin</h1></li>
-          <li><%= link_to("Janitor Trials", janitor_trials_path) %></li>
-          <li><%= link_to("IP Bans", ip_bans_path) %></li>
-          <li><%= link_to("News Updates", news_updates_path) %></li>
-          <li><%= link_to("Alias & Implication Import", new_admin_alias_and_implication_import_path) %></li>
+      <ul>
+        <li><h1>Admin</h1></li>
+        <li><%= link_to("Mod Actions", mod_actions_path) %></li>
+          <% if CurrentUser.is_admin? %>
+            <li><%= link_to("Janitor Trials", janitor_trials_path) %></li>
+            <li><%= link_to("IP Bans", ip_bans_path) %></li>
+            <li><%= link_to("News Updates", news_updates_path) %></li>
+            <li><%= link_to("Alias & Implication Import", new_admin_alias_and_implication_import_path) %></li>
+          <% end %>
+          
+          <% if Danbooru.config.is_user_advertiser?(CurrentUser.user) %>
+            <li><%= link_to("Advertisements", advertisements_path) %></li>
+          <% end %>
         </ul>
-      <% end %>
     </section>
   </div>
 </div>