diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 83a0bb75b..5a8d2b5a2 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -4,4 +4,6 @@
 <link rel="icon" type="image/png" href="<%=SiteSetting.favicon_url%>">
 <link rel="apple-touch-icon" type="image/png" href="<%=SiteSetting.apple_touch_icon_url%>">
 
+<meta name="viewport" content="width=720, minimum-scale=1.0, maximum-scale=1.0, user-scalable=yes">
+
 <%= canonical_link_tag %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index fccbfb268..533587e35 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -8,7 +8,6 @@
     <%= render partial: "common/special_font_face" %>
     <%= render partial: "common/discourse_stylesheet" %>
     <%= discourse_csrf_tags %>
-    <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
     <%- if SiteSetting.enable_escaped_fragments? %>
       <meta name="fragment" content="!">
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index 89d713999..96001338d 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -9,27 +9,19 @@
       <%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %>
     <%- end %>
     <%= yield :head %>
-    <meta name="viewport" content="width=720, minimum-scale=1.0, maximum-scale=1.0, user-scalable=yes">
+    <style>
+        img { width: 100%; height: auto; }
+    </style>
   </head>
   <body>
     <%- unless customization_disabled? %>
       <%= SiteCustomization.custom_header(session[:preview_style]) %>
     <%- end %>
-    <header class="d-header">
-      <div class="container">
-        <div class="contents">
-          <div class="row">
-            <div class="title span13">
-              <a href="/"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
-            </div>
-          </div>
-        </div>
-      </div>
+    <header>
+        <a href="/"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
     </header>
     <div id="main-outlet" class="container">
-      <!-- preload-content: -->
       <%= yield %>
-      <!-- :preload-content -->
     </div>
     <footer class="container">
       <p><%= t 'powered_by_html' %></p>
diff --git a/app/views/layouts/no_js.html.erb b/app/views/layouts/no_js.html.erb
index 14ae98869..0e117e985 100644
--- a/app/views/layouts/no_js.html.erb
+++ b/app/views/layouts/no_js.html.erb
@@ -2,39 +2,29 @@
 <html lang="<%= SiteSetting.default_locale %>">
   <head>
     <meta charset="utf-8">
-    <title><%=SiteSetting.title%></title>
-    <meta name="description" content="">
+    <title><%= content_for?(:title) ? yield(:title) + ' - ' + SiteSetting.title : SiteSetting.title %></title>
+    <meta name="description" content="<%= @description_meta || SiteSetting.site_description %>">
     <%= render partial: "layouts/head" %>
     <%- unless customization_disabled? %>
       <%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %>
     <%- end %>
     <%= yield(:no_js_head) %>
-    <meta name="viewport" content="width=720, minimum-scale=1.0, maximum-scale=1.0, user-scalable=yes">
+    <style>
+        img { width: 100%; height: auto; }
+    </style>
   </head>
   <body>
     <%- unless customization_disabled? %>
       <%= SiteCustomization.custom_header(session[:preview_style]) %>
     <%- end %>
-    <section id='main'>
-      <header class="d-header">
-        <div class="container">
-          <div class="contents">
-            <div class="row">
-              <div class="title span13">
-                <a href="/"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
-              </div>
-              <% unless current_user %>
-                <div class='panel clearfix'>
-                  <a href="/login" class='btn btn-primary btn-small'><i class="fa fa-user"></i><%= I18n.t('log_in') %></a>
-                </div>
-              <% end %>
-            </div>
-          </div>
-        </div>
-      </header>
-      <div id="main-outlet" class="container">
-        <%= yield %>
-      </div>
-    </section>
+    <header>
+        <a href="/"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
+    </header>
+    <div id="main-outlet" class="container">
+      <%= yield %>
+    </div>
+    <footer class="container">
+      <p><%= t 'powered_by_html' %></p>
+    </footer>
   </body>
 </html>
