diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 7a22fc0..d64010c 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -84,9 +84,9 @@
           // reader without this information.
         #}
         {% if parent %}
-        <p class="comment-parent visually-hidden">
-          {{ parent }}
-        </p>
+          <p class="comment-parent visually-hidden">
+            {{ parent }}
+          </p>
         {% endif %}
       </div>
     </div> <!-- /.attribution -->
@@ -114,16 +114,15 @@
 
     <footer class="comment-footer">
       {% if signature %}
-      <div class="user-signature clearfix">
-        {{ signature }}
-      </div>
+        <div class="user-signature clearfix">
+          {{ signature }}
+        </div>
+      {% endif %}
+      {% if content.links %}
+        <nav>
+          {{ content.links }}
+        </nav>
       {% endif %}
-
-        {% if content.links %}
-          <nav>
-            {{ content.links }}
-          </nav>
-        {% endif %}
     </footer> <!-- /.comment-footer -->
   </div> <!-- /.comment-text -->
 
diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig
index 5de50cc..7096697 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -8,38 +8,50 @@
  * @see template_preprocess_maintenance_page()
  */
  #}
-  <div id="page-wrapper"><div id="page">
+<div id="page-wrapper">
+  <div id="page">
 
-    <header id="header" role="banner"><div class="section clearfix">
-      {% if site_name or site_slogan %}
-        <div id="name-and-slogan"{{ hide_site_name and hide_site_slogan ? ' class="visually-hidden"' }}>
-          {% if site_name %}
-            <div id="site-name"{{ hide_site_name ? ' class="visually-hidden"' }}>
-              <strong>
-                <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
-              </strong>
-            </div>
-          {% endif %}
-          {% if site_slogan %}
-            <div id="site-slogan"{{ hide_site_slogan ? ' class="visually-hidden"' }}>
-              {{ site_slogan }}
-            </div>
-          {% endif %}
-        </div> <!-- /#name-and-slogan -->
-      {% endif %}
-    </div></header> <!-- /.section, /#header -->
-
-    <div id="main-wrapper"><div id="main" class="clearfix">
-      <main id="content" class="column" role="main"><section class="section">
-        <a id="main-content"></a>
-        {% if title %}<h1 class="title" id="page-title">{{ title }}</h1>{% endif %}
-        {{ page.content }}
-        {% if messages %}
-          <div id="messages"><div class="section clearfix">
-            {{ messages }}
-          </div></div> <!-- /.section, /#messages -->
+    <header id="header" role="banner">
+      <div class="section clearfix">
+        {% if site_name or site_slogan %}
+          <div id="name-and-slogan"{{ hide_site_name and hide_site_slogan ? ' class="visually-hidden"' }}>
+            {% if site_name %}
+              <div id="site-name"{{ hide_site_name ? ' class="visually-hidden"' }}>
+                <strong>
+                  <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
+                </strong>
+              </div>
+            {% endif %}
+            {% if site_slogan %}
+              <div id="site-slogan"{{ hide_site_slogan ? ' class="visually-hidden"' }}>
+                {{ site_slogan }}
+              </div>
+            {% endif %}
+          </div> <!-- /#name-and-slogan -->
         {% endif %}
-      </section></main> <!-- /.section, /#content -->
-    </div></div> <!-- /#main, /#main-wrapper -->
+      </div> <!-- /.section -->
+    </header> <!-- /#header -->
+
+    <div id="main-wrapper">
+      <div id="main" class="clearfix">
+        <main id="content" class="column" role="main">
+          <section class="section">
+            <a id="main-content"></a>
+            {% if title %}
+              <h1 class="title" id="page-title">{{ title }}</h1>
+            {% endif %}
+            {{ page.content }}
+            {% if messages %}
+              <div id="messages">
+                <div class="section clearfix">
+                  {{ messages }}
+                </div>
+              </div> <!-- /#messages -->
+            {% endif %}
+          </section> <!-- /.section -->
+        </main> <!-- /#content -->
+      </div> <!-- /.section -->
+    </div> <!-- /#main-wrapper -->
 
-  </div></div> <!-- /#page, /#page-wrapper -->
+  </div>
+</div> <!-- /#page, /#page-wrapper -->
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index d52d3db..b208658 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -82,35 +82,61 @@
 
     {{ page.secondary_menu }}
 
-    {% if logo %}
-      <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home" id="logo">
-        <img src="{{ logo }}" alt="{{ 'Home'|t }}" />
-      </a>
-    {% endif %}
+        {% if logo %}
+          <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home" id="logo">
+            <img src="{{ logo }}" alt="{{ 'Home'|t }}" />
+          </a>
+        {% endif %}
 
-    {% if site_name or site_slogan %}
-      <div id="name-and-slogan"{% if hide_site_name and hide_site_slogan %} class="visually-hidden"{% endif %}>
-        {% if site_name %}
-          {% if title %}
-            <div id="site-name"{% if hide_site_name %} class="visually-hidden"{% endif %}>
-              <strong>
-                <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
-              </strong>
-            </div>
-          {# Use h1 when the content title is empty #}
-          {% else %}
-            <h1 id="site-name"{% if hide_site_name %} class="visually-hidden" {% endif %}>
-              <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
-            </h1>
-          {% endif %}
+        {% if site_name or site_slogan %}
+          <div id="name-and-slogan"{% if hide_site_name and hide_site_slogan %} class="visually-hidden"{% endif %}>
+            {% if site_name %}
+              {% if title %}
+                <div id="site-name"{% if hide_site_name %} class="visually-hidden"{% endif %}>
+                  <strong>
+                    <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home">
+                      <span>{{ site_name }}</span>
+                    </a>
+                  </strong>
+                </div>
+                {# Use h1 when the content title is empty #}
+              {% else %}
+                <h1 id="site-name"{% if hide_site_name %} class="visually-hidden" {% endif %}>
+                  <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home">
+                    <span>{{ site_name }}</span>
+                  </a>
+                </h1>
+              {% endif %}
+            {% endif %}
+
+            {% if site_slogan %}
+              <div id="site-slogan"{% if hide_site_slogan %} class="visually-hidden"{% endif %}>
+                {{ site_slogan }}
+              </div>
+            {% endif %}
+          </div> <!-- /#name-and-slogan -->
         {% endif %}
 
-        {% if site_slogan %}
-          <div id="site-slogan"{% if hide_site_slogan %} class="visually-hidden"{% endif %}>
-            {{ site_slogan }}
-          </div>
+        {{ page.header }}
+
+        {% if main_menu %}
+          <nav id ="main-menu" class="navigation" role="navigation" aria-labelledby="links__system_main_menu">
+            <div id="nav"></div>
+            <div id="no-nav"></div>
+            <a class="main-menu-reveal" href="#nav">{{ 'Menu'|t }}</a>
+            <a class="main-menu-reveal main-menu-reveal--hide" href="#no-nav">{{ 'Menu'|t }}</a>
+            {{ main_menu }}
+          </nav> <!-- /#main-menu -->
         {% endif %}
-      </div><!-- /#name-and-slogan -->
+      </div> <!-- /.section -->
+    </header> <!-- /#header-->
+
+    {% if messages %}
+      <div id="messages">
+        <div class="section clearfix">
+        {{ messages }}
+        </div> <!-- /.section -->
+      </div> <!-- /#messages -->
     {% endif %}
 
     {{ page.header }}
@@ -148,55 +174,47 @@
             {{ tabs }}
           </nav>
         {% endif %}
-      {{ page.help }}
-        {% if action_links %}
-          <ul class="action-links">
-            {{ action_links }}
-          </ul>
+
+        {% if page.sidebar_second %}
+          <div id="sidebar-second" class="column sidebar">
+            <aside class="section">
+              {{ page.sidebar_second }}
+            </aside> <!-- /.section -->
+          </div> <!-- /#sidebar-second -->
         {% endif %}
-      {{ page.content }}
-      {{ feed_icons }}
-    </section></main> <!-- /.section, /#content -->
-
-    {% if page.sidebar_first %}
-      <div id="sidebar-first" class="column sidebar"><aside class="section">
-        {{ page.sidebar_first }}
-      </aside></div><!-- /.section, /#sidebar-first -->
-    {% endif %}
 
-    {% if page.sidebar_second %}
-      <div id="sidebar-second" class="column sidebar"><aside class="section">
-        {{ page.sidebar_second }}
-      </aside></div><!-- /.section, /#sidebar-second -->
+      </div> <!-- /#main -->
+    </div> <!-- /#main-wrapper -->
+
+    {% if page.triptych_first or page.triptych_middle or page.triptych_last %}
+      <div id="triptych-wrapper">
+        <aside id="triptych" class="clearfix">
+          {{ page.triptych_first }}
+          {{ page.triptych_middle }}
+          {{ page.triptych_last }}
+        </aside> <!-- /#triptych -->
+      </div> <!-- /#triptych-wrapper -->
     {% endif %}
 
-  </div></div><!-- /#main, /#main-wrapper -->
-
-  {% if page.triptych_first or page.triptych_middle or page.triptych_last %}
-    <div id="triptych-wrapper"><aside id="triptych" class="clearfix">
-      {{ page.triptych_first }}
-      {{ page.triptych_middle }}
-      {{ page.triptych_last }}
-    </aside></div><!-- /#triptych, /#triptych-wrapper -->
-  {% endif %}
-
-  <div id="footer-wrapper"><footer class="section">
-
-    {% if page.footer_firstcolumn or page.footer_secondcolumn or page.footer_thirdcolumn or page.footer_fourthcolumn %}
-      <div id="footer-columns" class="clearfix">
-        {{ page.footer_firstcolumn }}
-        {{ page.footer_secondcolumn }}
-        {{ page.footer_thirdcolumn }}
-        {{ page.footer_fourthcolumn }}
-      </div><!-- /#footer-columns -->
-    {% endif %}
+    <div id="footer-wrapper">
+      <footer class="section">
+        {% if page.footer_firstcolumn or page.footer_secondcolumn or page.footer_thirdcolumn or page.footer_fourthcolumn %}
+          <div id="footer-columns" class="clearfix">
+            {{ page.footer_firstcolumn }}
+            {{ page.footer_secondcolumn }}
+            {{ page.footer_thirdcolumn }}
+            {{ page.footer_fourthcolumn }}
+          </div> <!-- /#footer-columns -->
+        {% endif %}
 
-    {% if page.footer %}
-      <div id="footer" role="contentinfo" class="clearfix">
-        {{ page.footer }}
-      </div> <!-- /#footer -->
-   {% endif %}
+        {% if page.footer %}
+          <div id="footer" role="contentinfo" class="clearfix">
+            {{ page.footer }}
+          </div> <!-- /#footer -->
+        {% endif %}
 
-  </footer></div> <!-- /.section, /#footer-wrapper -->
+      </footer> <!-- /.section -->
+    </div>  <!-- /#footer-wrapper -->
 
-</div></div> <!-- /#page, /#page-wrapper -->
+  </div> <!-- /#page -->
+</div> <!-- /#page-wrapper -->