diff --git a/app/controllers/moderator/tags_controller.rb b/app/controllers/moderator/tags_controller.rb
index 43adc8a4e..d97d9ffdb 100644
--- a/app/controllers/moderator/tags_controller.rb
+++ b/app/controllers/moderator/tags_controller.rb
@@ -7,7 +7,7 @@ module Moderator
     end
     
     def update
-      tag_batch_change = TagBatchChange.new(params[:tag][:predicate], params[:tag][:consequent])
+      tag_batch_change = TagBatchChange.new(params[:tag][:antecedent], params[:tag][:consequent])
       tag_batch_change.execute
       redirect_to edit_moderator_tag_path, :notice => "Posts updated"
     end
diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb
index c17692aa2..e388df586 100644
--- a/app/views/admin/users/edit.html.erb
+++ b/app/views/admin/users/edit.html.erb
@@ -13,4 +13,8 @@
       <%= submit_tag "Update" %>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<% content_for(:page_title) do %>
+  Edit User - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/advertisements/edit.html.erb b/app/views/advertisements/edit.html.erb
index 61a745a01..cadebbd90 100644
--- a/app/views/advertisements/edit.html.erb
+++ b/app/views/advertisements/edit.html.erb
@@ -7,3 +7,8 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Edit Advertisement - <%= Danbooru.config.app_name %>
+<% end %>
+
diff --git a/app/views/advertisements/index.html.erb b/app/views/advertisements/index.html.erb
index 3ee38a416..5d1a6a451 100644
--- a/app/views/advertisements/index.html.erb
+++ b/app/views/advertisements/index.html.erb
@@ -24,3 +24,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Advertisements - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/advertisements/new.html.erb b/app/views/advertisements/new.html.erb
index 0bf018729..5da23351b 100644
--- a/app/views/advertisements/new.html.erb
+++ b/app/views/advertisements/new.html.erb
@@ -7,3 +7,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  New Advertisement - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/advertisements/show.html.erb b/app/views/advertisements/show.html.erb
index 0248fc5ca..8d59e384c 100644
--- a/app/views/advertisements/show.html.erb
+++ b/app/views/advertisements/show.html.erb
@@ -1,6 +1,6 @@
 <div id="c-advertisements">
   <div id="a-show">
-    <h1>Show Advertisement</h1>
+    <h1>Advertisement</h1>
 
     <%= image_tag(@advertisement.image_url, :width => @advertisement.preview_width, :height => @advertisement.preview_height) %>
 
@@ -10,5 +10,8 @@
   </div>
 </div>
 
-
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Advertisement - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/artist_versions/index.html.erb b/app/views/artist_versions/index.html.erb
index d72cdb1e1..6813c2c9b 100644
--- a/app/views/artist_versions/index.html.erb
+++ b/app/views/artist_versions/index.html.erb
@@ -37,3 +37,6 @@
 
 <%= render "artists/secondary_links" %>
 
+<% content_for(:page_title) do %>
+  Artist Versions - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/artists/banned.html.erb b/app/views/artists/banned.html.erb
index aedb76ea6..30b80971a 100644
--- a/app/views/artists/banned.html.erb
+++ b/app/views/artists/banned.html.erb
@@ -12,4 +12,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Banned Artists - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/artists/edit.html.erb b/app/views/artists/edit.html.erb
index c80dce4b4..7d83f996b 100644
--- a/app/views/artists/edit.html.erb
+++ b/app/views/artists/edit.html.erb
@@ -6,3 +6,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Edit Artist - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/artists/index.html.erb b/app/views/artists/index.html.erb
index 52d730aad..ada1ac0c1 100644
--- a/app/views/artists/index.html.erb
+++ b/app/views/artists/index.html.erb
@@ -31,3 +31,7 @@
     <%= render "secondary_links" %>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  Artists - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/artists/new.html.erb b/app/views/artists/new.html.erb
index af8563014..1c7da7d00 100644
--- a/app/views/artists/new.html.erb
+++ b/app/views/artists/new.html.erb
@@ -9,3 +9,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  New Artist - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/artists/search.html.erb b/app/views/artists/search.html.erb
index 6ab786628..0f740410f 100644
--- a/app/views/artists/search.html.erb
+++ b/app/views/artists/search.html.erb
@@ -14,4 +14,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Search Artists - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/artists/show.html.erb b/app/views/artists/show.html.erb
index f9b182c5b..f94aba743 100644
--- a/app/views/artists/show.html.erb
+++ b/app/views/artists/show.html.erb
@@ -53,7 +53,7 @@
               <td>
                 <%= link_to h(url.to_s), h(url.to_s) %>
                 <% if CurrentUser.user.is_moderator? %>
-                  (<%#= link_to("mass edit", mass_edit_admin_posts_path(:antecedent => "-#{@artist.name} source:#{ArtistUrl.normalize_for_search(url.to_s)}", :consequent => @artist.name)) %>)
+                  (<%= link_to("mass edit", edit_moderator_tag_path(:antecedent => "-#{@artist.name} source:#{ArtistUrl.normalize_for_search(url.to_s)}", :consequent => @artist.name)) %>)
                 <% end %>
               </td>
             </tr>
@@ -72,3 +72,7 @@
     <%= render "secondary_links" %>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  Artist - <%= @artist.name %> - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/bans/edit.html.erb b/app/views/bans/edit.html.erb
index 3ec7b0115..3d3e6bed6 100644
--- a/app/views/bans/edit.html.erb
+++ b/app/views/bans/edit.html.erb
@@ -6,3 +6,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Edit Ban - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/bans/index.html.erb b/app/views/bans/index.html.erb
index 575b53d5f..bd08db46d 100644
--- a/app/views/bans/index.html.erb
+++ b/app/views/bans/index.html.erb
@@ -29,3 +29,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Bans - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/bans/new.html.erb b/app/views/bans/new.html.erb
index 32fa507e3..5f22a3a6b 100644
--- a/app/views/bans/new.html.erb
+++ b/app/views/bans/new.html.erb
@@ -6,3 +6,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  New Ban - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/bans/show.html.erb b/app/views/bans/show.html.erb
index 7e2f4f594..8502cb891 100644
--- a/app/views/bans/show.html.erb
+++ b/app/views/bans/show.html.erb
@@ -10,3 +10,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Ban - <%= @ban.user.name %> - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb
index efc0a07eb..1fac05f91 100644
--- a/app/views/comments/edit.html.erb
+++ b/app/views/comments/edit.html.erb
@@ -10,4 +10,8 @@
   </div>
 </div>
 
-<%= render "comments/secondary_links" %>
\ No newline at end of file
+<%= render "comments/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Edit Comment - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/comments/index_by_comment.html.erb b/app/views/comments/index_by_comment.html.erb
index e578873aa..10c7ced7e 100644
--- a/app/views/comments/index_by_comment.html.erb
+++ b/app/views/comments/index_by_comment.html.erb
@@ -15,3 +15,7 @@
 </div>
 
 <%= render "comments/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Comments - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/comments/index_by_post.html.erb b/app/views/comments/index_by_post.html.erb
index 42c422107..958a8b3a0 100644
--- a/app/views/comments/index_by_post.html.erb
+++ b/app/views/comments/index_by_post.html.erb
@@ -21,3 +21,7 @@
 </div>
 
 <%= render "comments/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Comments - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/comments/search.html.erb b/app/views/comments/search.html.erb
index 9b514fca1..d48ad5bf2 100644
--- a/app/views/comments/search.html.erb
+++ b/app/views/comments/search.html.erb
@@ -13,4 +13,8 @@
   </div>
 </div>
 
-<%= render "comments/secondary_links" %>
\ No newline at end of file
+<%= render "comments/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Search Comments - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/dmails/edit.html.erb b/app/views/dmails/edit.html.erb
index a13f6f761..2777708ad 100644
--- a/app/views/dmails/edit.html.erb
+++ b/app/views/dmails/edit.html.erb
@@ -5,4 +5,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Edit Message - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/dmails/index.html.erb b/app/views/dmails/index.html.erb
index 6ca3454db..b8d1d8aa8 100644
--- a/app/views/dmails/index.html.erb
+++ b/app/views/dmails/index.html.erb
@@ -25,4 +25,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Messages - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/dmails/new.html.erb b/app/views/dmails/new.html.erb
index e89966ae6..2c2b69dbb 100644
--- a/app/views/dmails/new.html.erb
+++ b/app/views/dmails/new.html.erb
@@ -5,4 +5,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  New Message - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/dmails/search.html.erb b/app/views/dmails/search.html.erb
index ed6536a3c..cbbd89b6b 100644
--- a/app/views/dmails/search.html.erb
+++ b/app/views/dmails/search.html.erb
@@ -13,3 +13,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Search Messages - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/dmails/show.html.erb b/app/views/dmails/show.html.erb
index f7f2a3e63..4fa050bd7 100644
--- a/app/views/dmails/show.html.erb
+++ b/app/views/dmails/show.html.erb
@@ -13,4 +13,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Message - <%= @dmail.title %> - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/explore/posts/popular.html.erb b/app/views/explore/posts/popular.html.erb
index 3a8cf905d..086f0ecb6 100644
--- a/app/views/explore/posts/popular.html.erb
+++ b/app/views/explore/posts/popular.html.erb
@@ -12,3 +12,6 @@
 
 <%= render "posts/partials/common/secondary_links" %>
 
+<% content_for(:page_title) do %>
+  Popular - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/favorites/index.html.erb b/app/views/favorites/index.html.erb
index 007c0b56c..bbe4bcfa4 100644
--- a/app/views/favorites/index.html.erb
+++ b/app/views/favorites/index.html.erb
@@ -26,7 +26,7 @@
     </section>
     
     <% content_for(:page_title) do %>
-      /fav:<%= CurrentUser.name %>
+      Favorites - <%= CurrentUser.name %> - <%= Danbooru.config.app_name %>
     <% end %>
 
     <%= render "posts/partials/common/secondary_links" %>    
diff --git a/app/views/forum_posts/edit.html.erb b/app/views/forum_posts/edit.html.erb
index 10d27d30b..1c4a60b1f 100644
--- a/app/views/forum_posts/edit.html.erb
+++ b/app/views/forum_posts/edit.html.erb
@@ -6,4 +6,8 @@
   </div>
 </div>
 
-<%= render "forum_topics/secondary_links" %>
\ No newline at end of file
+<%= render "forum_topics/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Edit Forum Post - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/forum_posts/index.html.erb b/app/views/forum_posts/index.html.erb
index fbad0eb22..1668bd907 100644
--- a/app/views/forum_posts/index.html.erb
+++ b/app/views/forum_posts/index.html.erb
@@ -25,4 +25,8 @@
   </div>
 </div>
 
-<%= render "forum_topics/secondary_links" %>
\ No newline at end of file
+<%= render "forum_topics/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Forum Posts - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/forum_posts/new.html.erb b/app/views/forum_posts/new.html.erb
index a270222e9..c6e4dc99c 100644
--- a/app/views/forum_posts/new.html.erb
+++ b/app/views/forum_posts/new.html.erb
@@ -6,4 +6,8 @@
   </div>
 </div>
 
-<%= render "forum_topics/secondary_links" %>
\ No newline at end of file
+<%= render "forum_topics/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  New Forum Post - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/forum_posts/search.html.erb b/app/views/forum_posts/search.html.erb
index a9bd4613d..863c15f49 100644
--- a/app/views/forum_posts/search.html.erb
+++ b/app/views/forum_posts/search.html.erb
@@ -9,4 +9,8 @@
   </div>
 </div>
 
-<%= render "forum_topics/secondary_links" %>
\ No newline at end of file
+<%= render "forum_topics/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Search Forum Posts - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/forum_posts/show.html.erb b/app/views/forum_posts/show.html.erb
index a64619f91..b8a0af7db 100644
--- a/app/views/forum_posts/show.html.erb
+++ b/app/views/forum_posts/show.html.erb
@@ -4,4 +4,8 @@
   </div>
 </div>
 
-<%= render "forum_topics/secondary_links" %>
\ No newline at end of file
+<%= render "forum_topics/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Forum Post - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/forum_topics/edit.html.erb b/app/views/forum_topics/edit.html.erb
index a4a86d903..12336c8c1 100644
--- a/app/views/forum_topics/edit.html.erb
+++ b/app/views/forum_topics/edit.html.erb
@@ -4,4 +4,8 @@
     
     <%= render "form" %>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<% content_for(:page_title) do %>
+  Edit Forum Topic - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/forum_topics/index.html.erb b/app/views/forum_topics/index.html.erb
index f3b5b1d68..2a5edb76e 100644
--- a/app/views/forum_topics/index.html.erb
+++ b/app/views/forum_topics/index.html.erb
@@ -46,3 +46,7 @@
 <%= content_for(:html_header) do %>
   <meta name="last-forum-read-at" content="<%= CurrentUser.last_forum_read_at.to_date %>">
 <% end %>
+
+<% content_for(:page_title) do %>
+  Forum - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/forum_topics/new.html.erb b/app/views/forum_topics/new.html.erb
index 1d9fd1c7c..4bda4dab5 100644
--- a/app/views/forum_topics/new.html.erb
+++ b/app/views/forum_topics/new.html.erb
@@ -7,3 +7,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  New Forum Topic - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/forum_topics/show.html.erb b/app/views/forum_topics/show.html.erb
index 70ece8108..dfe455e9d 100644
--- a/app/views/forum_topics/show.html.erb
+++ b/app/views/forum_topics/show.html.erb
@@ -17,5 +17,5 @@
 <%= render "secondary_links" %>
 
 <%= content_for(:page_title) do %>
-  forum/<%= @forum_topic.title %>
+  Forum - <%= @forum_topic.title %> - <%= Danbooru.config.app_name %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/ip_bans/index.html.erb b/app/views/ip_bans/index.html.erb
index 2fb78afe7..248ee6787 100644
--- a/app/views/ip_bans/index.html.erb
+++ b/app/views/ip_bans/index.html.erb
@@ -28,3 +28,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  IP Bans - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/ip_bans/new.html.erb b/app/views/ip_bans/new.html.erb
index 3975c5028..dbd1a79da 100644
--- a/app/views/ip_bans/new.html.erb
+++ b/app/views/ip_bans/new.html.erb
@@ -11,3 +11,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  New IP Ban - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/janitor_trials/index.html.erb b/app/views/janitor_trials/index.html.erb
index a60f0e9a8..afb7dd0f4 100644
--- a/app/views/janitor_trials/index.html.erb
+++ b/app/views/janitor_trials/index.html.erb
@@ -26,4 +26,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Janitor Trials - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/janitor_trials/new.html.erb b/app/views/janitor_trials/new.html.erb
index 240fbc80b..a5569a947 100644
--- a/app/views/janitor_trials/new.html.erb
+++ b/app/views/janitor_trials/new.html.erb
@@ -13,3 +13,6 @@
 </div>
 
 <%= render "secondary_links" %>
+<% content_for(:page_title) do %>
+  New Janitor - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/maintenance/user/login_reminders/new.html.erb b/app/views/maintenance/user/login_reminders/new.html.erb
index 461a02d68..55abc4ceb 100644
--- a/app/views/maintenance/user/login_reminders/new.html.erb
+++ b/app/views/maintenance/user/login_reminders/new.html.erb
@@ -18,3 +18,7 @@
     <%= render "sessions/secondary_links" %>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  Login Reminder - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/maintenance/user/password_resets/edit.html.erb b/app/views/maintenance/user/password_resets/edit.html.erb
index 0724510d2..bde40b9ea 100644
--- a/app/views/maintenance/user/password_resets/edit.html.erb
+++ b/app/views/maintenance/user/password_resets/edit.html.erb
@@ -15,4 +15,8 @@
     
     <%= render "sessions/secondary_links" %>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<% content_for(:page_title) do %>
+  Reset Password - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/maintenance/user/password_resets/new.html.erb b/app/views/maintenance/user/password_resets/new.html.erb
index b3eb04e59..67bbe7725 100644
--- a/app/views/maintenance/user/password_resets/new.html.erb
+++ b/app/views/maintenance/user/password_resets/new.html.erb
@@ -16,4 +16,8 @@
 
     <%= render "sessions/secondary_links" %>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<% content_for(:page_title) do %>
+  Reset Password - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/mod_actions/index.html.erb b/app/views/mod_actions/index.html.erb
index bf6c814ae..1fbacde06 100644
--- a/app/views/mod_actions/index.html.erb
+++ b/app/views/mod_actions/index.html.erb
@@ -22,4 +22,8 @@
     
     <%= sequential_paginator(@mod_actions) %>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<% content_for(:page_title) do %>
+  Mod Actions - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/moderator/dashboards/show.html.erb b/app/views/moderator/dashboards/show.html.erb
index afae1a95a..e57cd59fe 100644
--- a/app/views/moderator/dashboards/show.html.erb
+++ b/app/views/moderator/dashboards/show.html.erb
@@ -20,3 +20,7 @@
     </div>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  Mod Dashboard - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/moderator/invitations/index.html.erb b/app/views/moderator/invitations/index.html.erb
index f710a98e2..a87790ea4 100644
--- a/app/views/moderator/invitations/index.html.erb
+++ b/app/views/moderator/invitations/index.html.erb
@@ -11,3 +11,7 @@
     <%= numbered_paginator(@users) %>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  Invitations - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/moderator/invitations/new.html.erb b/app/views/moderator/invitations/new.html.erb
index 3b64f79e5..4fb866ad7 100644
--- a/app/views/moderator/invitations/new.html.erb
+++ b/app/views/moderator/invitations/new.html.erb
@@ -17,3 +17,7 @@
     <% end %>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  New Invitation - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/moderator/ip_addrs/index.html.erb b/app/views/moderator/ip_addrs/index.html.erb
index 9082917ac..cf8f1394a 100644
--- a/app/views/moderator/ip_addrs/index.html.erb
+++ b/app/views/moderator/ip_addrs/index.html.erb
@@ -20,3 +20,7 @@
     </table>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  IP Addresses - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/moderator/ip_addrs/search.html.erb b/app/views/moderator/ip_addrs/search.html.erb
index 493cef808..66ba22338 100644
--- a/app/views/moderator/ip_addrs/search.html.erb
+++ b/app/views/moderator/ip_addrs/search.html.erb
@@ -1,6 +1,6 @@
 <div id="c-moderator-ip-addrs">
   <div id="a-search">
-    <h1>IP Address Search</h1>
+    <h1>Search IP Addresses</h1>
     
     <%= form_tag(moderator_ip_addrs_path) do %>
       <div class="input">
@@ -17,3 +17,7 @@
     <% end %>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  Search IP Addresses - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/moderator/post/dashboards/show.html.erb b/app/views/moderator/post/dashboards/show.html.erb
index 0e660fb6b..01946145e 100644
--- a/app/views/moderator/post/dashboards/show.html.erb
+++ b/app/views/moderator/post/dashboards/show.html.erb
@@ -38,4 +38,8 @@
   </div>
 </div>
 
-<%= render "posts/partials/common/secondary_links" %>
\ No newline at end of file
+<%= render "posts/partials/common/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Mod Dashboard - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/moderator/tags/edit.html.erb b/app/views/moderator/tags/edit.html.erb
index 0b56da32a..2f6f6b4a2 100644
--- a/app/views/moderator/tags/edit.html.erb
+++ b/app/views/moderator/tags/edit.html.erb
@@ -5,12 +5,12 @@
     <%= form_tag(moderator_tag_path, :method => :put) do %>
       <div class="input">
         <label>Predicate</label>
-        <%= text_field :tag, :predicate %>
+        <%= text_field :tag, :antecedent, :value => params[:antecedent] %>
       </div>
       
       <div class="input">
         <label>Consequent</label>
-        <%= text_field :tag, :consequent %>
+        <%= text_field :tag, :consequent, :value => params[:consequent] %>
       </div>
       
       <div class="input">
@@ -19,3 +19,7 @@
     <% end %>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  Edit Tag - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/note_versions/index.html.erb b/app/views/note_versions/index.html.erb
index cf7df0f99..047b882bc 100644
--- a/app/views/note_versions/index.html.erb
+++ b/app/views/note_versions/index.html.erb
@@ -43,3 +43,6 @@
   </div>
 </div>
 
+<% content_for(:page_title) do %>
+  Note Versions - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/notes/edit.html.erb b/app/views/notes/edit.html.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/notes/index_by_note.html.erb b/app/views/notes/index_by_note.html.erb
index bdbbe6088..c222ad203 100644
--- a/app/views/notes/index_by_note.html.erb
+++ b/app/views/notes/index_by_note.html.erb
@@ -28,3 +28,7 @@
 </div>
 
 <%= render "notes/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Notes - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/notes/index_by_post.html.erb b/app/views/notes/index_by_post.html.erb
index 6c8b44ad6..e7c787cfd 100644
--- a/app/views/notes/index_by_post.html.erb
+++ b/app/views/notes/index_by_post.html.erb
@@ -6,4 +6,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Notes - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/notes/new.html.erb b/app/views/notes/new.html.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/notes/search.html.erb b/app/views/notes/search.html.erb
index 35fa406a9..8c22fc04b 100644
--- a/app/views/notes/search.html.erb
+++ b/app/views/notes/search.html.erb
@@ -9,3 +9,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Search Notes - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/pool_orders/edit.html.erb b/app/views/pool_orders/edit.html.erb
index 978e3c2bc..27f9e64d5 100644
--- a/app/views/pool_orders/edit.html.erb
+++ b/app/views/pool_orders/edit.html.erb
@@ -18,3 +18,7 @@
 </div>
 
 <%= render "pools/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Order Pool - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/pool_versions/index.html.erb b/app/views/pool_versions/index.html.erb
index b6c4c0e09..e5eafef6f 100644
--- a/app/views/pool_versions/index.html.erb
+++ b/app/views/pool_versions/index.html.erb
@@ -38,3 +38,7 @@
 </div>
 
 <%= render "pools/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Pool Versions - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/pools/edit.html.erb b/app/views/pools/edit.html.erb
index 497572ac9..52160f76a 100644
--- a/app/views/pools/edit.html.erb
+++ b/app/views/pools/edit.html.erb
@@ -11,3 +11,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Edit Pool - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/pools/index.html.erb b/app/views/pools/index.html.erb
index 3c615013a..b63d4fb55 100644
--- a/app/views/pools/index.html.erb
+++ b/app/views/pools/index.html.erb
@@ -30,3 +30,7 @@
     <%= render "secondary_links" %>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  Pools - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/pools/new.html.erb b/app/views/pools/new.html.erb
index 2d81a62d0..c9b05fa68 100644
--- a/app/views/pools/new.html.erb
+++ b/app/views/pools/new.html.erb
@@ -10,3 +10,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  New Pool - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/pools/search.html.erb b/app/views/pools/search.html.erb
index 536d2010a..fb90e7117 100644
--- a/app/views/pools/search.html.erb
+++ b/app/views/pools/search.html.erb
@@ -9,3 +9,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Search Pools - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/pools/show.html.erb b/app/views/pools/show.html.erb
index 84cf11445..a5b53d820 100644
--- a/app/views/pools/show.html.erb
+++ b/app/views/pools/show.html.erb
@@ -16,3 +16,6 @@
 
 <%= render "secondary_links" %>
 
+<% content_for(:page_title) do %>
+  Pool - <%= @pool.name %> - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/post_appeals/index.html.erb b/app/views/post_appeals/index.html.erb
index ef07e9536..8008b3a56 100644
--- a/app/views/post_appeals/index.html.erb
+++ b/app/views/post_appeals/index.html.erb
@@ -20,4 +20,8 @@
       </tbody>
     </table>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<% content_for(:page_title) do %>
+  Appeals - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/post_flags/index.html.erb b/app/views/post_flags/index.html.erb
index 47bd3eac4..d2d20ecde 100644
--- a/app/views/post_flags/index.html.erb
+++ b/app/views/post_flags/index.html.erb
@@ -20,4 +20,8 @@
       </tbody>
     </table>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<% content_for(:page_title) do %>
+  Flags - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/post_versions/index.html.erb b/app/views/post_versions/index.html.erb
index e6d9d031b..fc6221a4e 100644
--- a/app/views/post_versions/index.html.erb
+++ b/app/views/post_versions/index.html.erb
@@ -8,4 +8,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Post Versions - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/post_versions/search.html.erb b/app/views/post_versions/search.html.erb
index 9b52b7762..a01b7fe2d 100644
--- a/app/views/post_versions/search.html.erb
+++ b/app/views/post_versions/search.html.erb
@@ -11,3 +11,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Search Post Versions - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb
index 40e831cbb..bca5c03a3 100644
--- a/app/views/posts/index.html.erb
+++ b/app/views/posts/index.html.erb
@@ -20,7 +20,11 @@
     </section>
     
     <% content_for(:page_title) do %>
-      /<%= @post_set.tag_string %>
+      <% if @post_set.tag_string.present? %>
+        <%= @post_set.tag_string %> - <%= Danbooru.config.app_name %>
+      <% else %>
+        <%= Danbooru.config.app_name %>
+      <% end %>
     <% end %>
 
     <%= render "posts/partials/common/secondary_links" %>    
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index 709006705..4687882fc 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -81,7 +81,7 @@
 </div>
 
 <% content_for(:page_title) do %>
-  /p/<%= @post.tag_string %>
+  <%= @post.tag_string %> - <%= Danbooru.config.app_name %>
 <% end %>
 
 <% content_for(:html_header) do %>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 534ed5017..87096ee10 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -27,7 +27,7 @@
 </div>
 
 <% content_for(:page_title) do %>
- /sign in
+ Sign in - <%= Danbooru.config.app_name %>
 <% end %>
 
 <%= render "secondary_links" %>
\ No newline at end of file
diff --git a/app/views/static/access_denied.html.erb b/app/views/static/access_denied.html.erb
index cd7647bcb..41481149a 100644
--- a/app/views/static/access_denied.html.erb
+++ b/app/views/static/access_denied.html.erb
@@ -1 +1,5 @@
-<h1>Access Denied</h1>
\ No newline at end of file
+<h1>Access Denied</h1>
+
+<% content_for(:page_title) do %>
+  Access Denied - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/static/bookmarklet.html.erb b/app/views/static/bookmarklet.html.erb
index ce3ef64e5..78c6c899c 100644
--- a/app/views/static/bookmarklet.html.erb
+++ b/app/views/static/bookmarklet.html.erb
@@ -7,3 +7,7 @@
     <p>Bookmark this link. Next time you are directly viewing an image (that is, the JPG/PNG/GIF file is in the URL bar) you can open this bookmarklet and you will be taken to the upload page. Depending on the site you are uploading from you may also see some options for fetching metadata.</p>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  Bookmarklet - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/static/overloaded.html.erb b/app/views/static/overloaded.html.erb
deleted file mode 100644
index 487eaa802..000000000
--- a/app/views/static/overloaded.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<div style="text-align: center;">
-  <%= print_advertisement("horizontal") %>      
-
-  <div style="width: 50em; margin: 1em auto;">
-    <h4>&ldquo;No one else could gain admittance here, because this entrance was meant solely for you. I am now going to shut it.&rdquo;</h4>
-  </div>  
-  
-  <p>You have to <a href="/user/login">login</a> to view this page.</p>
-  <p>You can create a <a href="/user/signup">free basic account</a>.</p>
-  <p>Learn more about <a href="/help/users">accounts</a>.</p>
-</div>
diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb
index 254de0b71..c034f9e5f 100644
--- a/app/views/static/site_map.html.erb
+++ b/app/views/static/site_map.html.erb
@@ -86,4 +86,8 @@
       <% end %>
     </section>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<% content_for(:page_title) do %>
+  Site Map - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/static/terms_of_service.html.erb b/app/views/static/terms_of_service.html.erb
index 63844a391..dbf1774ae 100644
--- a/app/views/static/terms_of_service.html.erb
+++ b/app/views/static/terms_of_service.html.erb
@@ -73,6 +73,8 @@
   </section>
   -->
   
-  
 </div>
 
+<% content_for(:page_title) do %>
+  Terms of Service - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/tag_aliases/index.html.erb b/app/views/tag_aliases/index.html.erb
index 9899b8513..9bfce28a7 100644
--- a/app/views/tag_aliases/index.html.erb
+++ b/app/views/tag_aliases/index.html.erb
@@ -42,3 +42,8 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Tag Aliases - <%= Danbooru.config.app_name %>
+<% end %>
+
diff --git a/app/views/tag_aliases/new.html.erb b/app/views/tag_aliases/new.html.erb
index b0ebea015..10fc7ecb3 100644
--- a/app/views/tag_aliases/new.html.erb
+++ b/app/views/tag_aliases/new.html.erb
@@ -10,4 +10,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  New Tag Alias - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/tag_implications/index.html.erb b/app/views/tag_implications/index.html.erb
index 20d49af01..6df6b8c8b 100644
--- a/app/views/tag_implications/index.html.erb
+++ b/app/views/tag_implications/index.html.erb
@@ -42,3 +42,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Tag Implications - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/tag_implications/new.html.erb b/app/views/tag_implications/new.html.erb
index 3824d7632..82ccc638f 100644
--- a/app/views/tag_implications/new.html.erb
+++ b/app/views/tag_implications/new.html.erb
@@ -10,4 +10,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  New Tag Implication - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/tag_subscriptions/edit.html.erb b/app/views/tag_subscriptions/edit.html.erb
index 4556e2b08..93babace3 100644
--- a/app/views/tag_subscriptions/edit.html.erb
+++ b/app/views/tag_subscriptions/edit.html.erb
@@ -3,4 +3,8 @@
     <h1>Edit Tag Subscription</h1>
     <%= render "form" %>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<% content_for(:page_title) do %>
+  Edit Tag Subscription - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/tag_subscriptions/index.html.erb b/app/views/tag_subscriptions/index.html.erb
index f8f39acfa..03524de06 100644
--- a/app/views/tag_subscriptions/index.html.erb
+++ b/app/views/tag_subscriptions/index.html.erb
@@ -23,3 +23,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Tag Subscriptions - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/tag_subscriptions/new.html.erb b/app/views/tag_subscriptions/new.html.erb
index 6e5a16eae..cc9f2942f 100644
--- a/app/views/tag_subscriptions/new.html.erb
+++ b/app/views/tag_subscriptions/new.html.erb
@@ -3,4 +3,8 @@
     <h1>New Tag Subscription</h1>
     <%= render "form" %>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<% content_for(:page_title) do %>
+  New Tag Subscription - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/tag_subscriptions/posts.html.erb b/app/views/tag_subscriptions/posts.html.erb
index 34b672a21..c39a8cb37 100644
--- a/app/views/tag_subscriptions/posts.html.erb
+++ b/app/views/tag_subscriptions/posts.html.erb
@@ -16,11 +16,11 @@
       <%= numbered_paginator(@posts) %>
     </section>
     
-    <% content_for(:page_title) do %>
-      /sub:<%= @user.name %>
-    <% end %>
-
     <%= render "posts/partials/common/secondary_links" %>    
   </div>
 </div>
 
+<% content_for(:page_title) do %>
+  Tag Subscriptions - <%= @user.name %> - <%= Danbooru.config.app_name %>
+<% end %>
+
diff --git a/app/views/tags/edit.html.erb b/app/views/tags/edit.html.erb
index c8fc36707..dcbac1f63 100644
--- a/app/views/tags/edit.html.erb
+++ b/app/views/tags/edit.html.erb
@@ -10,3 +10,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Edit Tag - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 5be86bd1c..0ea52aa3b 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -25,3 +25,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Tags - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/tags/search.html.erb b/app/views/tags/search.html.erb
index 53fe053d7..264589b16 100644
--- a/app/views/tags/search.html.erb
+++ b/app/views/tags/search.html.erb
@@ -9,4 +9,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Search Tags - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/tags/show.html.erb b/app/views/tags/show.html.erb
index bdf86d876..07e7f90e6 100644
--- a/app/views/tags/show.html.erb
+++ b/app/views/tags/show.html.erb
@@ -10,3 +10,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Tag - <%= @tag.name %> - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/uploads/index.html.erb b/app/views/uploads/index.html.erb
index 0f5ce7275..7a1c58a10 100644
--- a/app/views/uploads/index.html.erb
+++ b/app/views/uploads/index.html.erb
@@ -27,4 +27,8 @@
   </div>
 </div>
 
-<%= render "posts/partials/common/secondary_links" %>
\ No newline at end of file
+<%= render "posts/partials/common/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Uploads - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 4b44373b1..46ac8a8e1 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -64,7 +64,7 @@
 </div>
 
 <% content_for(:page_title) do %>
-  / Upload
+  Upload - <%= Danbooru.config.app_name %>
 <% end %>
 
 <%= render "posts/partials/common/secondary_links" %>
diff --git a/app/views/uploads/show.html.erb b/app/views/uploads/show.html.erb
index eb7273914..9ffcd325f 100644
--- a/app/views/uploads/show.html.erb
+++ b/app/views/uploads/show.html.erb
@@ -24,3 +24,7 @@
 </p>
 
 <%= render "posts/partials/common/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Upload - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/user_feedbacks/index.html.erb b/app/views/user_feedbacks/index.html.erb
index 7d3069b0a..e4478bf17 100644
--- a/app/views/user_feedbacks/index.html.erb
+++ b/app/views/user_feedbacks/index.html.erb
@@ -30,3 +30,7 @@
     <%= render "secondary_links" %>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  Edit Feedback - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/user_feedbacks/new.html.erb b/app/views/user_feedbacks/new.html.erb
index e4a64d7f2..d828f0776 100644
--- a/app/views/user_feedbacks/new.html.erb
+++ b/app/views/user_feedbacks/new.html.erb
@@ -15,3 +15,6 @@
   </div>
 </div>
 
+<% content_for(:page_title) do %>
+  New Feedback - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/user_feedbacks/show.html.erb b/app/views/user_feedbacks/show.html.erb
index d9aad7e2e..ba9731b49 100644
--- a/app/views/user_feedbacks/show.html.erb
+++ b/app/views/user_feedbacks/show.html.erb
@@ -11,4 +11,8 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Feedback - <%= @user_feedback.user_name %> - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 94f125668..e5841ebc2 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -25,7 +25,7 @@
 </div>
 
 <% content_for(:page_title) do %>
-  /settings
+  Settings - <%= Danbooru.config.app_name %>
 <% end %>
 
 <%= render "secondary_links" %>
\ No newline at end of file
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 95062fc25..a4ca1fe2a 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -60,3 +60,6 @@
   </div>
 </div>
 
+<% content_for(:page_title) do %>
+  Users - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 6d863d7e4..b935dd5b3 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -77,5 +77,5 @@
 </div>
 
 <% content_for(:page_title) do %>
-  /users/signup
+  Sign up - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index cd1c2e552..595a14d12 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -52,3 +52,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  User - <%= @presenter.name %> - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/wiki_page_versions/index.html.erb b/app/views/wiki_page_versions/index.html.erb
index 633788e5f..7ee4765e7 100644
--- a/app/views/wiki_page_versions/index.html.erb
+++ b/app/views/wiki_page_versions/index.html.erb
@@ -38,3 +38,7 @@
 </div>
 
 <%= render "wiki_pages/secondary_links" %>    
+
+<% content_for(:page_title) do %>
+  Wiki Page Versions - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/wiki_page_versions/show.html.erb b/app/views/wiki_page_versions/show.html.erb
index 5e6f3e6e7..ecb726104 100644
--- a/app/views/wiki_page_versions/show.html.erb
+++ b/app/views/wiki_page_versions/show.html.erb
@@ -12,4 +12,8 @@
   </div>
 </div>
 
-<%= render "wiki_pages/secondary_links" %>
\ No newline at end of file
+<%= render "wiki_pages/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Wiki Page Version - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/wiki_pages/edit.html.erb b/app/views/wiki_pages/edit.html.erb
index 9ef8f1d3d..e2a5c6309 100644
--- a/app/views/wiki_pages/edit.html.erb
+++ b/app/views/wiki_pages/edit.html.erb
@@ -10,3 +10,7 @@
 </div>
 
 <%= render "secondary_links" %>    
+
+<% content_for(:page_title) do %>
+  Edit Wiki Page - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/wiki_pages/index.html.erb b/app/views/wiki_pages/index.html.erb
index 6b003f441..06619a75c 100644
--- a/app/views/wiki_pages/index.html.erb
+++ b/app/views/wiki_pages/index.html.erb
@@ -27,4 +27,8 @@
   </div>
 </div>
 
+<% content_for(:page_title) do %>
+  Wiki - <%= Danbooru.config.app_name %>
+<% end %>
+
 <%= render "secondary_links" %>
diff --git a/app/views/wiki_pages/new.html.erb b/app/views/wiki_pages/new.html.erb
index 0a96c4dab..e81e9242b 100644
--- a/app/views/wiki_pages/new.html.erb
+++ b/app/views/wiki_pages/new.html.erb
@@ -10,3 +10,7 @@
 </div>
 
 <%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  New Wiki Page - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/wiki_pages/show.html.erb b/app/views/wiki_pages/show.html.erb
index 0e40e7809..81d5c609f 100644
--- a/app/views/wiki_pages/show.html.erb
+++ b/app/views/wiki_pages/show.html.erb
@@ -16,4 +16,8 @@
   </div>
 </div>
 
+<% content_for(:page_title) do %>
+  Wiki - <%= @wiki_page.pretty_title %> - <%= Danbooru.config.app_name %>
+<% end %>
+
 <%= render "secondary_links" %>
\ No newline at end of file