diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 81022bfa8..5f5c4a34d 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -34,8 +34,6 @@
<% if CurrentUser.user.custom_style.present? %>
<%= stylesheet_link_tag custom_style_users_path, :media => "screen" %>
<% end %>
- <%= raw Danbooru.config.custom_html_header_content %>
- <%= yield :html_header %>
<% if Danbooru.config.twitter_site %>
- <% unless CurrentUser.is_anonymous? %>
-
- <% end %>
-
+ <%= yield :html_header %>
+ <%= raw Danbooru.config.custom_html_header_content %>
<%= tag.body **body_attributes(CurrentUser.user) do %>
<%= render "news_updates/listing" %>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index 2cd3b94d6..8f0234259 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -197,6 +197,14 @@
<%= tag.meta name: "og:site", content: Danbooru.config.app_name %>
<%= auto_discovery_link_tag(:atom, comments_url(:atom, search: { post_id: @post.id }), title: "Comments for post ##{@post.id}") %>
+
+
<% end %>
<%= render "posts/partials/common/secondary_links" %>
diff --git a/app/views/user_upgrades/_stripe_payment.html.erb b/app/views/user_upgrades/_stripe_payment.html.erb
index e07ddafb6..b19ca09c0 100644
--- a/app/views/user_upgrades/_stripe_payment.html.erb
+++ b/app/views/user_upgrades/_stripe_payment.html.erb
@@ -12,9 +12,10 @@
<% content_for(:html_header) do %>
<% end %>
diff --git a/app/views/user_upgrades/new.html.erb b/app/views/user_upgrades/new.html.erb
index b7a3657a7..f9dd3abfe 100644
--- a/app/views/user_upgrades/new.html.erb
+++ b/app/views/user_upgrades/new.html.erb
@@ -124,7 +124,8 @@
<% content_for(:html_header) do %>
<% end %>
diff --git a/app/views/users/_sign_up_notice.html.erb b/app/views/users/_sign_up_notice.html.erb
index d3b88ebff..f3dc0a1d4 100644
--- a/app/views/users/_sign_up_notice.html.erb
+++ b/app/views/users/_sign_up_notice.html.erb
@@ -6,10 +6,14 @@
<% content_for(:html_header) do %>
<% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 402ea39cb..17576ac90 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -97,7 +97,7 @@
<%= f.input :disable_responsive_mode, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false, :hint => "Disable alternative layout for mobile and tablet" %>
- <%= f.input :opt_out_mixpanel, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false, :hint => "Opt out of MixPanel tracking" %>
+ <%= f.input :opt_out_mixpanel, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false, :hint => "Opt out of tracking" %>
<%= f.input :custom_style, :label => "Custom CSS style".html_safe, :hint => "Style to apply to the whole site.", :input_html => {:size => "40x5"} %>