diff --git a/_includes/2017/comments-area.html b/_includes/2017/comments-area.html
index ed06e808f..3be8532c3 100644
--- a/_includes/2017/comments-area.html
+++ b/_includes/2017/comments-area.html
@@ -1,6 +1,6 @@
 {% assign identifier = include.page.url | remove: '.html' | remove_first: '/' %}
 {% if site.data.disqus.enabled %}
-  <section class='comments-area' id='comments'>
+  <section class='comments-area' id='comments' data-js-no-preview>
     <div class='container'>
       <details class='comments-details'>
         <summary>
diff --git a/_includes/2017/related-posts.html b/_includes/2017/related-posts.html
index f793d8b9c..d9d9e3304 100644
--- a/_includes/2017/related-posts.html
+++ b/_includes/2017/related-posts.html
@@ -11,7 +11,7 @@
   | sort: "weight", "last"
 %}
 {% assign size = site.pages | size %}
-<footer class='related-posts-area' id='related'>
+<footer class='related-posts-area' id='related' data-js-no-preview>
   <div class='container'>
     <div class='related-posts-section'>
       <div class='callout'>
diff --git a/_includes/2017/search-footer.html b/_includes/2017/search-footer.html
index 2ebfe6ac8..a350b29f9 100644
--- a/_includes/2017/search-footer.html
+++ b/_includes/2017/search-footer.html
@@ -1,4 +1,4 @@
-<footer class='search-footer'>
+<footer class='search-footer' data-js-no-preview>
   <div class='container'>
     <div class='search-footer-section'>
       <div class='search'>
diff --git a/_includes/2017/top-nav.html b/_includes/2017/top-nav.html
index 45b4e637e..6fddb2b41 100644
--- a/_includes/2017/top-nav.html
+++ b/_includes/2017/top-nav.html
@@ -4,7 +4,7 @@ Params:
 - noedit
 - noback
 {% endcomment %}
-<nav class='top-nav'>
+<nav class='top-nav' data-js-no-preview>
   <div class='container'>
     {% unless include.page.noback %}
       <div class='left'>
diff --git a/_layouts/2017/sheet.html b/_layouts/2017/sheet.html
index f76c43ebc..b9bbd8bbe 100644
--- a/_layouts/2017/sheet.html
+++ b/_layouts/2017/sheet.html
@@ -38,7 +38,7 @@
   </main>
 </div>
 
-<div class='pre-footer'><i class='icon'></i></div>
+<div class='pre-footer' data-js-no-preview><i class='icon'></i></div>
 
 {% include 2017/comments-area.html page=page %}
 {% include 2017/search-footer.html %}
diff --git a/_sass/2017/components/main-heading.scss b/_sass/2017/components/main-heading.scss
index 1b46f2df4..3727cbcda 100644
--- a/_sass/2017/components/main-heading.scss
+++ b/_sass/2017/components/main-heading.scss
@@ -50,3 +50,11 @@
     background: lighten($gray-text, 40%);
   }
 }
+
+/**
+ * Add some space in preview mode
+ */
+
+.PreviewMode .main-heading {
+  margin-top: 16px;
+}
diff --git a/assets/2017/script.js b/assets/2017/script.js
index 1ab01e9ea..e8737434f 100644
--- a/assets/2017/script.js
+++ b/assets/2017/script.js
@@ -5,6 +5,7 @@
 $(function () {
   if (~window.location.search.indexOf('preview=1')) {
     $('[data-js-no-preview]').remove()
+    $('html').addClass('PreviewMode')
   }
 })