diff --git a/app/assets/javascripts/browser-update.js b/app/assets/javascripts/browser-update.js
index c3e5c83b300..31a5b410f60 100644
--- a/app/assets/javascripts/browser-update.js
+++ b/app/assets/javascripts/browser-update.js
@@ -37,7 +37,7 @@
           result += noscriptElements[i].childNodes[j].nodeValue;
         }
 
-        mainElement.innerHTML = result;
+        mainElement.outerHTML = result;
         break;
       }
     }
diff --git a/app/views/layouts/_noscript_footer.html.erb b/app/views/layouts/_noscript_footer.html.erb
new file mode 100644
index 00000000000..76770aaa049
--- /dev/null
+++ b/app/views/layouts/_noscript_footer.html.erb
@@ -0,0 +1,32 @@
+<footer class="container wrap">
+  <nav class='crawler-nav'>
+    <ul>
+      <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+        <span itemprop='name'>
+          <a href='<%= path "/" %>' itemprop="url"><%= t 'home_title' %> </a>
+        </span>
+      </li>
+      <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+        <span itemprop='name'>
+          <a href='<%= path "/categories" %>' itemprop="url"><%= t 'js.filters.categories.title' %> </a>
+        </span>
+      </li>
+      <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+        <span itemprop='name'>
+          <a href='<%= path "/guidelines" %>' itemprop="url"><%= t 'guidelines_topic.title' %> </a>
+        </span>
+      </li>
+      <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+        <span itemprop='name'>
+          <a href='<%= path "/tos" %>' itemprop="url"><%= t 'tos_topic.title' %> </a>
+        </span>
+      </li>
+      <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+        <span itemprop='name'>
+          <a href='<%= path "/privacy" %>' itemprop="url"><%= t 'privacy_topic.title' %> </a>
+        </span>
+      </li>
+    </ul>
+  </nav>
+  <p class='powered-by-link'><%= t 'powered_by_html' %></p>
+</footer>
diff --git a/app/views/layouts/_noscript_header.html.erb b/app/views/layouts/_noscript_header.html.erb
new file mode 100644
index 00000000000..5085644f178
--- /dev/null
+++ b/app/views/layouts/_noscript_header.html.erb
@@ -0,0 +1,5 @@
+<header>
+  <a href="<%= path "/" %>">
+    <h1><%=SiteSetting.title%></h1>
+  </a>
+</header>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 98b4fca1a5b..35893cc195f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -73,25 +73,15 @@
 
     <%= render_google_tag_manager_body_code %>
     <noscript data-path="<%= request.env['PATH_INFO'] %>">
-      <%= render partial: 'header' %>
+      <%= render partial: "layouts/noscript_header" %>
+
       <div id="main-outlet" class="wrap" role="main">
         <!-- preload-content: -->
         <%= yield %>
         <!-- :preload-content -->
-        <footer class="noscript-footer-nav">
-          <nav itemscope itemtype='http://schema.org/SiteNavigationElement'>
-            <a href='<%= path "/" %>'><%= t 'home_title' %></a>
-            <%= link_to t('js.filters.categories.title'), path("/categories") %>
-            <%= link_to t('guidelines_topic.title'), path("/guidelines") %>
-            <%= link_to t('tos_topic.title'), path("/tos") %>
-            <%= link_to t('privacy_topic.title'), path("/privacy") %>
-          </nav>
-        </footer>
       </div>
 
-      <footer id='noscript-footer'>
-        <p><%= t 'powered_by_html' %></p>
-      </footer>
+      <%= render partial: "layouts/noscript_footer" %>
     </noscript>
 
     <%- unless customization_disabled? %>
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index 818c8a422b1..cc8c28779da 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -16,46 +16,11 @@
   </head>
   <body class="crawler">
     <%= theme_lookup("header") %>
-    <header>
-      <a href="<%= path "/" %>">
-        <h1><%=SiteSetting.title%></h1>
-      </a>
-    </header>
-    <div id="main-outlet" class="wrap">
+    <%= render partial: "layouts/noscript_header" %>
+    <div id="main-outlet" class="wrap" role="main">
       <%= yield %>
     </div>
-    <footer class="container wrap">
-      <nav class='crawler-nav'>
-        <ul>
-        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
-          <span itemprop='name'>
-            <a href='<%= path "/" %>' itemprop="url"><%= t 'home_title' %> </a>
-          </span>
-        </li>
-        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
-          <span itemprop='name'>
-            <a href='<%= path "/categories" %>' itemprop="url"><%= t 'js.filters.categories.title' %> </a>
-          </span>
-        </li>
-        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
-          <span itemprop='name'>
-            <a href='<%= path "/guidelines" %>' itemprop="url"><%= t 'guidelines_topic.title' %> </a>
-          </span>
-        </li>
-        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
-          <span itemprop='name'>
-            <a href='<%= path "/tos" %>' itemprop="url"><%= t 'tos_topic.title' %> </a>
-          </span>
-        </li>
-        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
-          <span itemprop='name'>
-            <a href='<%= path "/privacy" %>' itemprop="url"><%= t 'privacy_topic.title' %> </a>
-          </span>
-        </li>
-        </ul>
-      </nav>
-      <p class='powered-by-link'><%= t 'powered_by_html' %></p>
-    </footer>
+    <%= render partial: "layouts/noscript_footer" %>
     <%= theme_lookup("footer") %>
     <%= theme_lookup("body_tag") %>
     <% if show_browser_update? %>
