diff --git a/_includes/layout/base/content.html b/_includes/layout/base/content.html
index 1c941fcb..001db305 100644
--- a/_includes/layout/base/content.html
+++ b/_includes/layout/base/content.html
@@ -1,3 +1,8 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}    <div id="content" class="content">
-    {{ content }}
-    </div>
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<div id="content" class="content">
+  {{ content }}
+</div>
diff --git a/_includes/layout/base/footer-js.html b/_includes/layout/base/footer-js.html
index d8a499c9..b75ea04a 100644
--- a/_includes/layout/base/footer-js.html
+++ b/_includes/layout/base/footer-js.html
@@ -1,4 +1,9 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}  <script type="text/javascript">
-    fallbackSVG();
-    addAnchorLinks();
-  </script>
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<script type="text/javascript">
+  fallbackSVG();
+  addAnchorLinks();
+</script>
diff --git a/_includes/layout/base/footer-license.html b/_includes/layout/base/footer-license.html
index a6c06aad..3332cef0 100644
--- a/_includes/layout/base/footer-license.html
+++ b/_includes/layout/base/footer-license.html
@@ -1 +1,6 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}    <div class="footerlicense">© Bitcoin Project 2009-{{ site.time | date: '%Y' }} {% translate footer layout %}</div>
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<div class="footerlicense">© Bitcoin Project 2009-{{ site.time | date: '%Y' }} {% translate footer layout %}</div>
diff --git a/_includes/layout/base/footer-menu.html b/_includes/layout/base/footer-menu.html
index 664751f3..1af12879 100644
--- a/_includes/layout/base/footer-menu.html
+++ b/_includes/layout/base/footer-menu.html
@@ -1,13 +1,18 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}    <div class="footermenu">
-    <a href="/en/alerts" class="statusmenu{% if site.STATUS == 1 %} alert{% endif %}">Network Status</a>
-    <a href="/{{ page.lang }}/{% translate legal url %}">{% translate menu-legal layout %}</a>
-    {% case page.lang %}
-    {% when 'ar' or 'es' or 'sl' %}
-    <a href="/en/privacy">Privacy</a>
-    {% else %}
-    <a href="/{{ page.lang }}/{% translate privacy url %}">{% translate menu-privacy layout %}</a>
-    {% endcase %}
-    <a href="/{{ page.lang }}/{% translate press url %}">{% translate menu-press layout %}</a>
-    <a href="/{{ page.lang }}/{% translate about-us url %}">{% translate menu-about-us layout %}</a>
-    <a href="/en/blog">Blog</a>
-    </div>
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<div class="footermenu">
+  <a href="/en/alerts" class="statusmenu{% if site.STATUS == 1 %} alert{% endif %}">Network Status</a>
+  <a href="/{{ page.lang }}/{% translate legal url %}">{% translate menu-legal layout %}</a>
+  {% case page.lang %}
+  {% when 'ar' or 'es' or 'sl' %}
+  <a href="/en/privacy">Privacy</a>
+  {% else %}
+  <a href="/{{ page.lang }}/{% translate privacy url %}">{% translate menu-privacy layout %}</a>
+  {% endcase %}
+  <a href="/{{ page.lang }}/{% translate press url %}">{% translate menu-press layout %}</a>
+  <a href="/{{ page.lang }}/{% translate about-us url %}">{% translate menu-about-us layout %}</a>
+  <a href="/en/blog">Blog</a>
+</div>
diff --git a/_includes/layout/base/footer-sponsor.html b/_includes/layout/base/footer-sponsor.html
index b776ddd0..9922946e 100644
--- a/_includes/layout/base/footer-sponsor.html
+++ b/_includes/layout/base/footer-sponsor.html
@@ -1,3 +1,8 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}    <div class="footersponsor">
-      <div><span>{% translate sponsor layout %}</span> <a href="https://bitcoinfoundation.org/"><img src="/img/brand/bitcoinfoundation.png" alt="Bitcoin Foundation"></a></div>
-    </div>
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<div class="footersponsor">
+  <div><span>{% translate sponsor layout %}</span> <a href="https://bitcoinfoundation.org/"><img src="/img/brand/bitcoinfoundation.png" alt="Bitcoin Foundation"></a></div>
+</div>
diff --git a/_includes/layout/base/head-language-dropdown.html b/_includes/layout/base/head-language-dropdown.html
index f34ac841..8e3b7db6 100644
--- a/_includes/layout/base/head-language-dropdown.html
+++ b/_includes/layout/base/head-language-dropdown.html
@@ -1,13 +1,17 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}    <ul class="lang">
-      <li><a href="#" onclick="return false;">{{ site.langs[page.lang] }}</a>
-      <ul>
-        <li><ul>
-        {% assign i = 0 %}{% assign c = site.langsorder.size | divided_by: 2 | plus: 1 %}
-        {% for lang in site.langsorder %}{% assign mod = i | modulo: c %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' class="active"'%}{% endif %}
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+<ul class="lang">
+  <li><a href="#" onclick="return false;">{{ site.langs[page.lang] }}</a>
+  <ul>
+    <li><ul>
+      {% assign i = 0 %}{% assign c = site.langsorder.size | divided_by: 2 | plus: 1 %}
+      {% for lang in site.langsorder %}{% assign mod = i | modulo: c %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' class="active"'%}{% endif %}
         {% if mod == 0 and i != 0 %}</ul></li><li><ul>{% endif %}
           <li><a href="/{{ lang }}/{% translate {{page.id}} url {{lang}} %}"{{ active }}>{{ site.langs[lang] }}</a></li>
         {% assign i = i | plus: 1 %}{% endfor %}
-        </ul></li>
-      </ul>
-      </li>
+      </ul></li>
     </ul>
+  </li>
+</ul>
diff --git a/_includes/layout/base/head-language-select.html b/_includes/layout/base/head-language-select.html
index ff4077ed..ada4678f 100644
--- a/_includes/layout/base/head-language-select.html
+++ b/_includes/layout/base/head-language-select.html
@@ -1,5 +1,9 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}    <div id="langselect" class="langselect"><select onchange="window.location=this.value;">
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+<div id="langselect" class="langselect"><select onchange="window.location=this.value;">
     {% for lang in site.langsorder %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' selected="selected"'%}{% endif %}
           <option value="/{{ lang }}/{% translate {{page.id}} url {{lang}} %}"{{ active }}>{{ site.langs[lang] }}</option>
     {% endfor %}
-    </select></div>
+</select></div>
diff --git a/_includes/layout/base/head-logo.html b/_includes/layout/base/head-logo.html
index e40134e5..1de7c8f6 100644
--- a/_includes/layout/base/head-logo.html
+++ b/_includes/layout/base/head-logo.html
@@ -1 +1,6 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}    <a class="logo" href="/{{ page.lang }}/"><img src="/img/icons/logotop.svg" alt="Bitcoin"></a>
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<a class="logo" href="/{{ page.lang }}/"><img src="/img/icons/logotop.svg" alt="Bitcoin"></a>
diff --git a/_includes/layout/base/head-menu.html b/_includes/layout/base/head-menu.html
index 4fc657b3..5f56ccd4 100644
--- a/_includes/layout/base/head-menu.html
+++ b/_includes/layout/base/head-menu.html
@@ -1,30 +1,35 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}    <ul id="menusimple" class="menusimple" onclick="mobileMenuHover(event);" ontouchstart="mobileMenuHover(event);">
-      <li><a href="#" onclick="return false;">{% translate menu-intro layout %}</a>
-        <ul>
-          <li{% if page.id == 'bitcoin-for-individuals' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-individuals url %}">{% translate menu-bitcoin-for-individuals layout %}</a></li>
-          <li{% if page.id == 'bitcoin-for-businesses' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-businesses url %}">{% translate menu-bitcoin-for-businesses layout %}</a></li>
-          <li{% if page.id == 'bitcoin-for-developers' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-developers url %}">{% translate menu-bitcoin-for-developers layout %}</a></li>
-          <li{% if page.id == 'getting-started' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate getting-started url %}">{% translate menu-getting-started layout %}</a></li>
-          <li{% if page.id == 'how-it-works' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate how-it-works url %}">{% translate menu-how-it-works layout %}</a></li>
-          <li{% if page.id == 'you-need-to-know' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate you-need-to-know url %}">{% translate menu-you-need-to-know layout %}</a></li>
-        </ul>
-      </li>
-      <li><a href="#" onclick="return false;">{% translate menu-resources layout %}</a>
-        <ul>
-          <li{% if page.id == 'resources' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate resources url %}">{% translate menu-resources layout %}</a></li>
-          <li{% if page.id == 'community' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate community url %}">{% translate menu-community layout %}</a></li>
-          {% if page.lang == 'en' %}<li{% if page.id == 'developer-documentation' %} class="active"{% endif %}><a href="/en/developer-documentation">Documentation</a></li>{% endif %}
-          <li{% if page.id == 'vocabulary' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate vocabulary url %}">{% translate menu-vocabulary layout %}</a></li>
-          <li{% if page.id == 'events' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate events url %}">{% translate menu-events layout %}</a></li>
-        </ul>
-      </li>
-      <li{% if page.id == 'innovation' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate innovation url %}">{% translate menu-innovation layout %}</a></li>
-      <li><a href="#" onclick="return false;">{% translate menu-participate layout %}</a>
-        <ul>
-          <li{% if page.id == 'support-bitcoin' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate support-bitcoin url %}">{% translate menu-support-bitcoin layout %}</a>
-          {% if page.lang == 'en' %}<li{% if page.id == 'full-node' %} class="active"{% endif %}><a href="/en/full-node">Running a full node</a></li>{% endif %}
-          <li{% if page.id == 'development' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate development url %}">{% translate menu-development layout %}</a></li>
-        </ul>
-      </li>
-      <li{% if page.id == 'faq' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate faq url %}">{% translate menu-faq layout %}</a></li>
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<ul id="menusimple" class="menusimple" onclick="mobileMenuHover(event);" ontouchstart="mobileMenuHover(event);">
+  <li><a href="#" onclick="return false;">{% translate menu-intro layout %}</a>
+    <ul>
+      <li{% if page.id == 'bitcoin-for-individuals' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-individuals url %}">{% translate menu-bitcoin-for-individuals layout %}</a></li>
+      <li{% if page.id == 'bitcoin-for-businesses' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-businesses url %}">{% translate menu-bitcoin-for-businesses layout %}</a></li>
+      <li{% if page.id == 'bitcoin-for-developers' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-developers url %}">{% translate menu-bitcoin-for-developers layout %}</a></li>
+      <li{% if page.id == 'getting-started' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate getting-started url %}">{% translate menu-getting-started layout %}</a></li>
+      <li{% if page.id == 'how-it-works' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate how-it-works url %}">{% translate menu-how-it-works layout %}</a></li>
+      <li{% if page.id == 'you-need-to-know' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate you-need-to-know url %}">{% translate menu-you-need-to-know layout %}</a></li>
     </ul>
+  </li>
+  <li><a href="#" onclick="return false;">{% translate menu-resources layout %}</a>
+    <ul>
+      <li{% if page.id == 'resources' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate resources url %}">{% translate menu-resources layout %}</a></li>
+      <li{% if page.id == 'community' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate community url %}">{% translate menu-community layout %}</a></li>
+      {% if page.lang == 'en' %}<li{% if page.id == 'developer-documentation' %} class="active"{% endif %}><a href="/en/developer-documentation">Documentation</a></li>{% endif %}
+      <li{% if page.id == 'vocabulary' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate vocabulary url %}">{% translate menu-vocabulary layout %}</a></li>
+      <li{% if page.id == 'events' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate events url %}">{% translate menu-events layout %}</a></li>
+    </ul>
+  </li>
+  <li{% if page.id == 'innovation' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate innovation url %}">{% translate menu-innovation layout %}</a></li>
+  <li><a href="#" onclick="return false;">{% translate menu-participate layout %}</a>
+    <ul>
+      <li{% if page.id == 'support-bitcoin' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate support-bitcoin url %}">{% translate menu-support-bitcoin layout %}</a>
+      {% if page.lang == 'en' %}<li{% if page.id == 'full-node' %} class="active"{% endif %}><a href="/en/full-node">Running a full node</a></li>{% endif %}
+      <li{% if page.id == 'development' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate development url %}">{% translate menu-development layout %}</a></li>
+    </ul>
+  </li>
+  <li{% if page.id == 'faq' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate faq url %}">{% translate menu-faq layout %}</a></li>
+</ul>
diff --git a/_includes/layout/base/head-mobile-menu.html b/_includes/layout/base/head-mobile-menu.html
index 071ea8e5..b093d36e 100644
--- a/_includes/layout/base/head-mobile-menu.html
+++ b/_includes/layout/base/head-mobile-menu.html
@@ -1 +1,6 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}    <a id="menumobile" class="menumobile" onclick="mobileMenuShow(event);" ontouchstart="mobileMenuShow(event);" href="#"></a>
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<a id="menumobile" class="menumobile" onclick="mobileMenuShow(event);" ontouchstart="mobileMenuShow(event);" href="#"></a>
diff --git a/_includes/layout/base/html-head.html b/_includes/layout/base/html-head.html
index 932bac00..2b6b4b05 100644
--- a/_includes/layout/base/html-head.html
+++ b/_includes/layout/base/html-head.html
@@ -1,4 +1,9 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <meta property="og:image" content="https://bitcoin.org/img/icons/opengraph.png" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 <title>{% capture title %}{% translate title %}{% endcapture %}{% if title != '' %}{{ title }}{% else %}{{ page.title }}{% endif %}</title>
diff --git a/_includes/layout/base/pagetop-alert.html b/_includes/layout/base/pagetop-alert.html
index c37a5814..6e2a2836 100644
--- a/_includes/layout/base/pagetop-alert.html
+++ b/_includes/layout/base/pagetop-alert.html
@@ -1,4 +1,9 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}{% if site.ALERT %}
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+{% if site.ALERT %}
   <div class="banner-message {{ site.ALERTCLASS }}">
     <a href="{{ site.ALERTURL }}"><span>{{ site.ALERT }}</span></a>
   </div>
diff --git a/_includes/layout/base/pagetop-detect-mobile.html b/_includes/layout/base/pagetop-detect-mobile.html
index 81f46d6f..45e06444 100644
--- a/_includes/layout/base/pagetop-detect-mobile.html
+++ b/_includes/layout/base/pagetop-detect-mobile.html
@@ -1 +1,6 @@
-{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT.  {% endcomment %}<div id="detectmobile" class="detectmobile"></div>
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<div id="detectmobile" class="detectmobile"></div>
diff --git a/_layouts/base.html b/_layouts/base.html
index 371af2b3..110a9125 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -4,15 +4,33 @@
 ---
 <!DOCTYPE HTML>
 <html lang="{{ page.lang }}">
+
 <head>
-{% include layout/base/html-head.html %}</head>
+{% include layout/base/html-head.html %}
+</head>
+
 <body>
-{% include layout/base/pagetop-detect-mobile.html %}{% include layout/base/pagetop-alert.html %}  <div class="head"><div>
-{% include layout/base/head-language-dropdown.html %}{% include layout/base/head-mobile-menu.html %}{% include layout/base/head-logo.html %}{% include layout/base/head-language-select.html %}{% include layout/base/head-menu.html %}  </div></div>
-  <div class="body">
-{% include layout/base/content.html %}    <div class="footer">
-{% include layout/base/footer-menu.html %}{% include layout/base/footer-sponsor.html %}{% include layout/base/footer-license.html %}    </div>
+{% include layout/base/pagetop-detect-mobile.html %}
+{% include layout/base/pagetop-alert.html %}
+
+<div class="head"><div>
+  {% include layout/base/head-language-dropdown.html %}
+  {% include layout/base/head-mobile-menu.html %}
+  {% include layout/base/head-logo.html %}
+  {% include layout/base/head-language-select.html %}
+  {% include layout/base/head-menu.html %}
+</div></div>
+
+<div class="body">
+  {% include layout/base/content.html %}
+  <div class="footer">
+    {% include layout/base/footer-menu.html %}
+    {% include layout/base/footer-sponsor.html %}
+    {% include layout/base/footer-license.html %}
   </div>
-{% include layout/base/footer-js.html %}</body>
+</div>
+
+{% include layout/base/footer-js.html %}
+</body>
 
 </html>