diff --git a/_includes/docs-sidebar.html b/_includes/docs-sidebar.html
index 24c1a8b2aa..34a5989a4b 100644
--- a/_includes/docs-sidebar.html
+++ b/_includes/docs-sidebar.html
@@ -36,7 +36,7 @@
               {{ doc.title }}
             </a>
 
-            {% comment %}
+            {%- comment -%}
             {% unless doc.sections == nil %}
               <ul class="nav">
                 {% for section in doc.sections %}
@@ -48,7 +48,7 @@
                 {% endfor %}
               </ul>
             {% endunless %}
-            {% endcomment %}
+            {%- endcomment -%}
           </li>
         {%- endfor -%}
       </ul>
diff --git a/_includes/header.html b/_includes/header.html
index 048867bddf..7c7a3a6437 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -12,9 +12,9 @@
 
 <!-- Bootstrap core CSS -->
 {% if site.github %}
-  <link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">
+<link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">
 {% else %}
-  <link href="{{ site.baseurl }}/dist/css/bootstrap.css" rel="stylesheet">
+<link href="{{ site.baseurl }}/dist/css/bootstrap.css" rel="stylesheet">
 {% endif %}
 
 <!-- Documentation extras -->
diff --git a/_includes/scripts.html b/_includes/scripts.html
index 0af5f5c695..98ba3b41ff 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -3,25 +3,25 @@
 
 <script src="{{ site.baseurl }}/assets/js/vendor/popper.min.js"></script>
 
-{% if site.github %}
+{%- if site.github -%}
   <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script>
-{% else %}
+{%- else -%}
   <script src="{{ site.baseurl }}/dist/js/bootstrap.js"></script>
-{% endif %}
+{%- endif -%}
 
-{% if site.github %}
+{%- if site.github -%}
   <script src="{{ site.baseurl }}/assets/js/docs.min.js"></script>
-{% else %}
+{%- else -%}
   <script src="{{ site.baseurl }}/assets/js/vendor/anchor.min.js"></script>
   <script src="{{ site.baseurl }}/assets/js/vendor/clipboard.min.js"></script>
   <script src="{{ site.baseurl }}/assets/js/vendor/holder.min.js"></script>
   <script src="{{ site.baseurl }}/assets/js/src/application.js"></script>
   <script src="{{ site.baseurl }}/assets/js/src/pwa.js"></script>
-{% endif %}
+{%- endif -%}
 
 <script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
 
-{% if page.layout == "docs" %}
+{%- if page.layout == "docs" -%}
 <script src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script>
   docsearch({
@@ -43,7 +43,7 @@
     debug: false // Set debug to true if you want to inspect the dropdown
   });
 </script>
-{% endif %}
+{%- endif -%}
 
 <script>
   Holder.addTheme('gray', {
diff --git a/_layouts/default.html b/_layouts/default.html
index 487baf470e..e6e576fa4a 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -13,11 +13,11 @@
     {% include docs-navbar.html %}
 
     {% if page.layout == "simple" %}
-        {{ content }}
+      {{ content }}
     {% else %}
-        <main id="content" role="main">
-            {{ content }}
-        </main>
+      <main id="content" role="main">
+        {{ content }}
+      </main>
     {% endif %}
 
     {% include footer.html %}
diff --git a/docs/4.0/utilities/screenreaders.md b/docs/4.0/utilities/screenreaders.md
index 358466f0c6..7888143e44 100644
--- a/docs/4.0/utilities/screenreaders.md
+++ b/docs/4.0/utilities/screenreaders.md
@@ -8,9 +8,9 @@ toc: true
 
 Hide an element to all devices **except screen readers** with `.sr-only`. Combine `.sr-only` with `.sr-only-focusable` to show the element again when it's focused (e.g. by a keyboard-only user). Can also be used as mixins.
 
-{% comment %}
+{%- comment -%}
 Necessary for following [accessibility best practices]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/#accessibility).
-{% endcomment %}
+{%- endcomment -%}
 
 {% highlight html %}
 <a class="sr-only sr-only-focusable" href="#content">Skip to main content</a>