diff --git a/app/views/artist_commentaries/index.html.erb b/app/views/artist_commentaries/index.html.erb
index 365cd9b35..0f436650a 100644
--- a/app/views/artist_commentaries/index.html.erb
+++ b/app/views/artist_commentaries/index.html.erb
@@ -34,11 +34,11 @@
     </table>
 
     <%= numbered_paginator(@commentaries) %>
-
-    <%= render "secondary_links" %>
   </div>
 </div>
 
+<%= render "secondary_links" %>
+
 <% content_for(:page_title) do %>
   Artist Commentary - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/artist_commentary_versions/index.html.erb b/app/views/artist_commentary_versions/index.html.erb
index 6c266b728..9b7db227c 100644
--- a/app/views/artist_commentary_versions/index.html.erb
+++ b/app/views/artist_commentary_versions/index.html.erb
@@ -61,10 +61,11 @@
 
     <%= numbered_paginator(@commentary_versions) %>
 
-    <%= render "artist_commentaries/secondary_links" %>
   </div>
 </div>
 
+<%= render "artist_commentaries/secondary_links" %>
+
 <% content_for(:page_title) do %>
   Artist Commentary Versions - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/artists/_show.html.erb b/app/views/artists/_show.html.erb
index 3d1b4ed3a..3eea838a5 100644
--- a/app/views/artists/_show.html.erb
+++ b/app/views/artists/_show.html.erb
@@ -21,11 +21,11 @@
         <%= @post_set.presenter.post_previews_html(self) %>
       </div>
     </div>
-
-    <%= render "secondary_links" %>
   </div>
 </div>
 
+<%= render "secondary_links" %>
+
 <% content_for(:page_title) do %>
   Artist - <%= @artist.name %> - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/artists/index.html.erb b/app/views/artists/index.html.erb
index a84291dc2..66c74fa14 100644
--- a/app/views/artists/index.html.erb
+++ b/app/views/artists/index.html.erb
@@ -28,11 +28,11 @@
     </table>
 
     <%= numbered_paginator(@artists) %>
-
-    <%= render "secondary_links" %>
   </div>
 </div>
 
+<%= render "secondary_links" %>
+
 <% content_for(:page_title) do %>
   Artists - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb
index 26e62c7c5..6914b6f77 100644
--- a/app/views/comments/edit.html.erb
+++ b/app/views/comments/edit.html.erb
@@ -6,7 +6,7 @@
   </div>
 </div>
 
-<%= render "comments/secondary_links" %>
+<%= render "secondary_links" %>
 
 <% content_for(:page_title) do %>
   Edit Comment - <%= Danbooru.config.app_name %>
diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb
index 9a07aafc5..cbc06e8b2 100644
--- a/app/views/comments/index.html.erb
+++ b/app/views/comments/index.html.erb
@@ -12,7 +12,7 @@
   </div>
 </div>
 
-<%= render "comments/secondary_links" %>
+<%= render "secondary_links" %>
 
 <% content_for(:page_title) do %>
   Comments - <%= Danbooru.config.app_name %>
diff --git a/app/views/comments/search.html.erb b/app/views/comments/search.html.erb
index 7d0fb2c48..fbb8697e9 100644
--- a/app/views/comments/search.html.erb
+++ b/app/views/comments/search.html.erb
@@ -16,7 +16,7 @@
   </div>
 </div>
 
-<%= render "comments/secondary_links" %>
+<%= render "secondary_links" %>
 
 <% content_for(:page_title) do %>
   Search Comments - <%= Danbooru.config.app_name %>
diff --git a/app/views/delayed_jobs/index.html.erb b/app/views/delayed_jobs/index.html.erb
index a517815ba..62193ab0b 100644
--- a/app/views/delayed_jobs/index.html.erb
+++ b/app/views/delayed_jobs/index.html.erb
@@ -53,9 +53,9 @@
     </table>
 
     <%= numbered_paginator(@delayed_jobs) %>
-
-    <% content_for(:page_title) do %>
-      Delayed Jobs - <%= Danbooru.config.app_name %>
-    <% end %>
   </div>
 </div>
+
+<% content_for(:page_title) do %>
+  Delayed Jobs - <%= Danbooru.config.app_name %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/favorites/index.html.erb b/app/views/favorites/index.html.erb
index e9ffba074..d6d14518e 100644
--- a/app/views/favorites/index.html.erb
+++ b/app/views/favorites/index.html.erb
@@ -37,12 +37,11 @@
         <%= sequential_paginator(@favorite_set.favorites) %>
       </div>
     </section>
-
-    <% content_for(:page_title) do %>
-      Favorites - <%= @user.pretty_name %> - <%= Danbooru.config.app_name %>
-    <% end %>
-
-    <%= render "posts/partials/common/secondary_links" %>
   </div>
 </div>
 
+<%= render "posts/partials/common/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Favorites - <%= @user.pretty_name %> - <%= 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 6f6f36baf..a2ac97e3b 100644
--- a/app/views/maintenance/user/login_reminders/new.html.erb
+++ b/app/views/maintenance/user/login_reminders/new.html.erb
@@ -14,11 +14,11 @@
 
       <%= submit_tag "Submit" %>
     <% end %>
-
-    <%= render "sessions/secondary_links" %>
   </div>
 </div>
 
+<%= render "sessions/secondary_links" %>
+
 <% 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 40401dee6..79901cd45 100644
--- a/app/views/maintenance/user/password_resets/edit.html.erb
+++ b/app/views/maintenance/user/password_resets/edit.html.erb
@@ -12,11 +12,11 @@
     <% else %>
       <p>Invalid key</p>
     <% end %>
-
-    <%= render "sessions/secondary_links" %>
   </div>
 </div>
 
+<%= render "sessions/secondary_links" %>
+
 <% 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 1c6a3f094..acb12da2a 100644
--- a/app/views/maintenance/user/password_resets/new.html.erb
+++ b/app/views/maintenance/user/password_resets/new.html.erb
@@ -13,11 +13,11 @@
       </div>
       <%= submit_tag "Submit" %>
     <% end %>
-
-    <%= render "sessions/secondary_links" %>
   </div>
 </div>
 
+<%= render "sessions/secondary_links" %>
+
 <% content_for(:page_title) do %>
   Reset Password - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/notes/index.html.erb b/app/views/notes/index.html.erb
index a9140c815..bd9bdd2f4 100644
--- a/app/views/notes/index.html.erb
+++ b/app/views/notes/index.html.erb
@@ -37,7 +37,7 @@
   </div>
 </div>
 
-<%= render "notes/secondary_links" %>
+<%= render "secondary_links" %>
 
 <% content_for(:page_title) do %>
   Notes - <%= Danbooru.config.app_name %>
diff --git a/app/views/pools/index.html.erb b/app/views/pools/index.html.erb
index cc1bf6168..8b67cf090 100644
--- a/app/views/pools/index.html.erb
+++ b/app/views/pools/index.html.erb
@@ -34,11 +34,11 @@
     </table>
 
     <%= numbered_paginator(@pools) %>
-
-    <%= render "secondary_links" %>
   </div>
 </div>
 
+<%= render "secondary_links" %>
+
 <% content_for(:page_title) do %>
   Pools - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb
index ba6d4928e..0ec04e8d7 100644
--- a/app/views/posts/index.html.erb
+++ b/app/views/posts/index.html.erb
@@ -41,19 +41,6 @@
       <%= render "posts/partials/index/posts", :post_set => @post_set %>
     </section>
     
-    <% content_for(:page_title) do %>
-      <% if @post_set.tag_string.present? %>
-        <%= @post_set.humanized_tag_string %> - <%= Danbooru.config.app_name %>
-      <% else %>
-        <%= Danbooru.config.app_name %>
-      <% end %>
-    <% end %>
-
-    <% if params[:tags] =~ /search:/ %>
-      <%= render "saved_searches/secondary_links" %>
-    <% else %>
-      <%= render "posts/partials/common/secondary_links" %>
-    <% end %>
 
     <%= post_search_count_js %>
 
@@ -63,6 +50,20 @@
   </div>
 </div>
 
+<% if params[:tags] =~ /search:/ %>
+  <%= render "saved_searches/secondary_links" %>
+<% else %>
+  <%= render "posts/partials/common/secondary_links" %>
+<% end %>
+
+<% content_for(:page_title) do %>
+  <% if @post_set.tag_string.present? %>
+    <%= @post_set.humanized_tag_string %> - <%= Danbooru.config.app_name %>
+  <% else %>
+    <%= Danbooru.config.app_name %>
+  <% end %>
+<% end %>
+
 <%= content_for(:html_header) do %>
   <link href="<%= posts_path(:format => 'atom', :tags => params[:tags]) %>" rel="alternate" title="ATOM" type="application/atom+xml" />
   <%= content_tag(:link, nil, rel: "prefetch", href: next_page_url, as: "html", crossorigin: "use-credentials") %>
diff --git a/app/views/tag_alias_corrections/show.html.erb b/app/views/tag_alias_corrections/show.html.erb
index aee64da4c..c1dfc5245 100644
--- a/app/views/tag_alias_corrections/show.html.erb
+++ b/app/views/tag_alias_corrections/show.html.erb
@@ -22,11 +22,11 @@
       <%= submit_tag "Fix" %>
       <%= submit_tag "Cancel" %>
     <% end %>
-
-    <%= render "tag_aliases/secondary_links" %>
-
-    <% content_for(:page_title) do %>
-      Tag Alias Correction - <%= Danbooru.config.app_name %>
-    <% end %>
   </div>
 </div>
+
+<%= render "tag_aliases/secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Tag Alias Correction - <%= Danbooru.config.app_name %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/tag_alias_requests/new.html.erb b/app/views/tag_alias_requests/new.html.erb
index 770245a9c..427932a12 100644
--- a/app/views/tag_alias_requests/new.html.erb
+++ b/app/views/tag_alias_requests/new.html.erb
@@ -34,11 +34,11 @@
         <%= dtext_preview_button "tag_alias_request", "reason" %>
       </div>
     <% end %>
-
-    <%= render "tag_aliases/secondary_links" %>
   </div>
 </div>
 
+<%= render "tag_aliases/secondary_links" %>
+
 <% content_for(:page_title) do %>
   Tag Alias Request - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/tag_aliases/index.html.erb b/app/views/tag_aliases/index.html.erb
index d049118b5..5b6759e81 100644
--- a/app/views/tag_aliases/index.html.erb
+++ b/app/views/tag_aliases/index.html.erb
@@ -14,7 +14,7 @@
   </div>
 </div>
 
-<%= render "tag_aliases/secondary_links" %>
+<%= render "secondary_links" %>
 
 <% content_for(:page_title) do %>
   Tag Aliases - <%= Danbooru.config.app_name %>
diff --git a/app/views/tag_aliases/show.html.erb b/app/views/tag_aliases/show.html.erb
index 045e626fb..0a7568e79 100644
--- a/app/views/tag_aliases/show.html.erb
+++ b/app/views/tag_aliases/show.html.erb
@@ -14,11 +14,11 @@
         <li><strong>Reason</strong> <%= format_text @tag_alias.reason %></li>
       <% end %>
     </ul>
-
-    <%= render "tag_aliases/secondary_links" %>
-
-    <% content_for(:page_title) do %>
-      Tag Alias - <%= Danbooru.config.app_name %>
-    <% end %>
   </div>
 </div>
+
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Tag Alias - <%= Danbooru.config.app_name %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/tag_implication_requests/new.html.erb b/app/views/tag_implication_requests/new.html.erb
index 29b5e077b..fbb52f4cc 100644
--- a/app/views/tag_implication_requests/new.html.erb
+++ b/app/views/tag_implication_requests/new.html.erb
@@ -34,11 +34,11 @@
         <%= dtext_preview_button "tag_implication_request", "reason" %>
       </div>
     <% end %>
-
-    <%= render "tag_implications/secondary_links" %>
   </div>
 </div>
 
+<%= render "tag_implications/secondary_links" %>
+
 <% content_for(:page_title) do %>
   Tag Implication Request - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/tag_implications/show.html.erb b/app/views/tag_implications/show.html.erb
index 681b670ab..bb5ba3f76 100644
--- a/app/views/tag_implications/show.html.erb
+++ b/app/views/tag_implications/show.html.erb
@@ -17,7 +17,7 @@
   </div>
 </div>
 
-<%= render "tag_implications/secondary_links" %>
+<%= render "secondary_links" %>
 
 <% content_for(:page_title) do %>
   Tag Implication - <%= Danbooru.config.app_name %>
diff --git a/app/views/user_feedbacks/edit.html.erb b/app/views/user_feedbacks/edit.html.erb
index a21f600cd..fb08c06a0 100644
--- a/app/views/user_feedbacks/edit.html.erb
+++ b/app/views/user_feedbacks/edit.html.erb
@@ -13,11 +13,11 @@
       <%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %>
       <%= dtext_preview_button "user_feedback", "body" %>
     <% end %>
-
-    <%= render "secondary_links" %>
   </div>
 </div>
 
+<%= render "secondary_links" %>
+
 <% content_for(:page_title) do %>
   Edit Feedback - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/user_feedbacks/index.html.erb b/app/views/user_feedbacks/index.html.erb
index 5c1113fb9..171c9b0f4 100644
--- a/app/views/user_feedbacks/index.html.erb
+++ b/app/views/user_feedbacks/index.html.erb
@@ -36,11 +36,11 @@
     </table>
 
     <%= numbered_paginator(@user_feedbacks) %>
-
-    <%= render "secondary_links" %>
   </div>
 </div>
 
+<%= render "secondary_links" %>
+
 <% content_for(:page_title) do %>
   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 5af51ac20..228057b7c 100644
--- a/app/views/user_feedbacks/new.html.erb
+++ b/app/views/user_feedbacks/new.html.erb
@@ -14,11 +14,11 @@
       <%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %>
       <%= dtext_preview_button "user_feedback", "body" %>
     <% end %>
-
-    <%= render "secondary_links" %>
   </div>
 </div>
 
+<%= render "secondary_links" %>
+
 <% content_for(:page_title) do %>
   New Feedback - <%= Danbooru.config.app_name %>
 <% end %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 7ab28018d..adb2678ea 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -55,10 +55,11 @@
 
     <%= numbered_paginator(@users) %>
 
-    <%= render "secondary_links" %>
   </div>
 </div>
 
+<%= render "secondary_links" %>
+
 <% content_for(:page_title) do %>
   Users - <%= Danbooru.config.app_name %>
 <% end %>