diff --git a/core/themes/bartik/templates/comment-wrapper.tpl.php b/core/themes/bartik/templates/comment-wrapper.tpl.php
index fd8dfa7..e7691d7 100644
--- a/core/themes/bartik/templates/comment-wrapper.tpl.php
+++ b/core/themes/bartik/templates/comment-wrapper.tpl.php
@@ -35,14 +35,18 @@
 <section id="comments" <?php print $attributes; ?>>
   <?php if ($content['comments'] && $node->type != 'forum'): ?>
     <?php print render($title_prefix); ?>
-    <h2 class="title"><?php print t('Comments'); ?></h2>
+    <h2 class="title">
+      <?php print t('Comments'); ?>
+    </h2>
     <?php print render($title_suffix); ?>
   <?php endif; ?>
 
   <?php print render($content['comments']); ?>
 
   <?php if ($content['comment_form']): ?>
-    <h2 class="title comment-form"><?php print t('Add new comment'); ?></h2>
+    <h2 class="title comment-form">
+      <?php print t('Add new comment'); ?>
+    </h2>
     <?php print render($content['comment_form']); ?>
   <?php endif; ?>
 </section>
diff --git a/core/themes/bartik/templates/comment.tpl.php b/core/themes/bartik/templates/comment.tpl.php
index a8c4924..7d28e27 100644
--- a/core/themes/bartik/templates/comment.tpl.php
+++ b/core/themes/bartik/templates/comment.tpl.php
@@ -99,17 +99,21 @@
     </div> <!-- /.attribution -->
 
     <div class="comment-text">
-      <div class="comment-arrow"></div>
+      <div class="comment-arrow">
+      </div>
 
       <?php if ($new): ?>
-        <span class="new"><?php print $new; ?></span>
+        <span class="new">
+          <?php print $new; ?>
+        </span>
       <?php endif; ?>
 
       <?php print render($title_prefix); ?>
-      <h3<?php print $title_attributes; ?>><?php print $title; ?></h3>
+      <h3<?php print $title_attributes; ?>>
+        <?php print $title; ?>
+      </h3>
       <?php print render($title_suffix); ?>
     </div> <!-- /.comment-text -->
-
   </header> <!-- /.comment-header -->
 
   <div class="content"<?php print $content_attributes; ?>>
diff --git a/core/themes/bartik/templates/maintenance-page.tpl.php b/core/themes/bartik/templates/maintenance-page.tpl.php
index 8e56378..0afd8ed 100644
--- a/core/themes/bartik/templates/maintenance-page.tpl.php
+++ b/core/themes/bartik/templates/maintenance-page.tpl.php
@@ -15,53 +15,74 @@
 ?>
 <!DOCTYPE html>
 <html lang="<?php print $language->langcode; ?>" dir="<?php print $language->dir; ?>">
-<head>
-  <?php print $head; ?>
-  <title><?php print $head_title; ?></title>
-  <?php print $styles; ?>
-  <?php print $scripts; ?>
-</head>
-<body class="<?php print $attributes['class']; ?>" <?php print $attributes;?>>
+  <head>
+    <?php print $head; ?>
+    <title>
+      <?php print $head_title; ?>
+    </title>
+    <?php print $styles; ?>
+    <?php print $scripts; ?>
+  </head>
+  <body class="<?php print $attributes['class']; ?>" <?php print $attributes;?>>
 
-  <div id="skip-link">
-    <a href="#main-content" class="element-invisible element-focusable"><?php print t('Skip to main content'); ?></a>
-  </div>
+    <div id="skip-link">
+      <a href="#main-content" class="element-invisible element-focusable">
+        <?php print t('Skip to main content'); ?>
+      </a>
+    </div>
 
-  <div id="page-wrapper"><div id="page">
+    <div id="page-wrapper">
+      <div id="page">
 
-    <header id="header" role="banner"><div class="section clearfix">
-      <?php if ($site_name || $site_slogan): ?>
-        <div id="name-and-slogan"<?php if ($hide_site_name && $hide_site_slogan) { print ' class="element-invisible"'; } ?>>
-          <?php if ($site_name): ?>
-            <div id="site-name"<?php if ($hide_site_name) { print ' class="element-invisible"'; } ?>>
-              <strong>
-                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
-              </strong>
-            </div>
-          <?php endif; ?>
-          <?php if ($site_slogan): ?>
-            <div id="site-slogan"<?php if ($hide_site_slogan) { print ' class="element-invisible"'; } ?>>
-              <?php print $site_slogan; ?>
-            </div>
-          <?php endif; ?>
-        </div> <!-- /#name-and-slogan -->
-      <?php endif; ?>
-    </div></header> <!-- /.section, /#header -->
+        <header id="header" role="banner">
+          <div class="section clearfix">
+            <?php if ($site_name || $site_slogan): ?>
+              <div id="name-and-slogan"<?php if ($hide_site_name && $hide_site_slogan) { print ' class="element-invisible"'; } ?>>
+                <?php if ($site_name): ?>
+                  <div id="site-name"<?php if ($hide_site_name) { print ' class="element-invisible"'; } ?>>
+                    <strong>
+                      <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home">
+                        <span>
+                          <?php print $site_name; ?>
+                        </span>
+                      </a>
+                    </strong>
+                  </div>
+                <?php endif; ?>
+                <?php if ($site_slogan): ?>
+                  <div id="site-slogan"<?php if ($hide_site_slogan) { print ' class="element-invisible"'; } ?>>
+                    <?php print $site_slogan; ?>
+                  </div>
+                <?php endif; ?>
+              </div> <!-- /#name-and-slogan -->
+            <?php 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>
-        <?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
-        <?php print $content; ?>
-        <?php if ($messages): ?>
-          <div id="messages"><div class="section clearfix">
-            <?php print $messages; ?>
-          </div></div> <!-- /.section, /#messages -->
-        <?php endif; ?>
-      </section></main> <!-- /.section, /#content -->
-    </div></div> <!-- /#main, /#main-wrapper -->
-
-  </div></div> <!-- /#page, /#page-wrapper -->
-
-</body>
+        <div id="main-wrapper">
+          <div id="main" class="clearfix">
+            <main id="content" class="column" role="main">
+              <section class="section">
+                <a id="main-content">
+                </a>
+                <?php if ($title): ?>
+                  <h1 class="title" id="page-title">
+                    <?php print $title; ?>
+                  </h1>
+                <?php endif; ?>
+                <?php print $content; ?>
+                <?php if ($messages): ?>
+                  <div id="messages">
+                    <div class="section clearfix">
+                      <?php print $messages; ?>
+                    </div>
+                  </div> <!-- /.section, /#messages -->
+                <?php endif; ?>
+              </section>
+            </main> <!-- /.section, /#content -->
+          </div>
+        </div> <!-- /#main, /#main-wrapper -->
+      </div>
+    </div> <!-- /#page, /#page-wrapper -->
+  </body>
 </html>
diff --git a/core/themes/bartik/templates/node.tpl.php b/core/themes/bartik/templates/node.tpl.php
index d32f9ac..432df1d 100644
--- a/core/themes/bartik/templates/node.tpl.php
+++ b/core/themes/bartik/templates/node.tpl.php
@@ -82,7 +82,9 @@
     <?php print render($title_prefix); ?>
     <?php if (!$page): ?>
       <h2<?php print $title_attributes; ?>>
-        <a href="<?php print $node_url; ?>"><?php print $label; ?></a>
+        <a href="<?php print $node_url; ?>">
+          <?php print $label; ?>
+        </a>
       </h2>
     <?php endif; ?>
     <?php print render($title_suffix); ?>
diff --git a/core/themes/bartik/templates/page.tpl.php b/core/themes/bartik/templates/page.tpl.php
index 08cc357..30986d2 100644
--- a/core/themes/bartik/templates/page.tpl.php
+++ b/core/themes/bartik/templates/page.tpl.php
@@ -87,163 +87,197 @@
  * @ingroup themeable
  */
 ?>
-<div id="page-wrapper"><div id="page">
-
-  <header id="header" class="<?php print $secondary_menu ? 'with-secondary-menu': 'without-secondary-menu'; ?>" role="banner"><div class="section clearfix">
-    <?php if ($secondary_menu): ?>
-      <nav id="secondary-menu" class="navigation" role="navigation">
-        <?php print theme('links__system_secondary_menu', array(
-          'links' => $secondary_menu,
-          'attributes' => array(
-            'id' => 'secondary-menu-links',
-            'class' => array('links', 'inline', 'clearfix'),
-          ),
-          'heading' => array(
-            'text' => t('Secondary menu'),
-            'level' => 'h2',
-            'class' => array('element-invisible'),
-          ),
-        )); ?>
-      </nav> <!-- /#secondary-menu -->
-    <?php endif; ?>
+<div id="page-wrapper">
+  <div id="page">
 
+    <header id="header" class="<?php print $secondary_menu ? 'with-secondary-menu': 'without-secondary-menu'; ?>" role="banner">
+      <div class="section clearfix">
+        <?php if ($secondary_menu): ?>
+          <nav id="secondary-menu" class="navigation" role="navigation">
+            <?php print theme('links__system_secondary_menu', array(
+              'links' => $secondary_menu,
+              'attributes' => array(
+                'id' => 'secondary-menu-links',
+                'class' => array('links', 'inline', 'clearfix'),
+              ),
+              'heading' => array(
+                'text' => t('Secondary menu'),
+                'level' => 'h2',
+                'class' => array('element-invisible'),
+              ),
+            )); ?>
+          </nav> <!-- /#secondary-menu -->
+        <?php endif; ?>
 
-    <?php if ($logo): ?>
-      <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
-        <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
-      </a>
-    <?php endif; ?>
+        <?php if ($logo): ?>
+          <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
+            <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
+          </a>
+        <?php endif; ?>
+
+        <?php if ($site_name || $site_slogan): ?>
+          <div id="name-and-slogan"<?php if ($hide_site_name && $hide_site_slogan) { print ' class="element-invisible"'; } ?>>
+
+            <?php if ($site_name): ?>
+              <?php if ($title): ?>
+                <div id="site-name"<?php if ($hide_site_name) { print ' class="element-invisible"'; } ?>>
+                  <strong>
+                    <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home">
+                      <span>
+                        <?php print $site_name; ?>
+                      </span>
+                    </a>
+                  </strong>
+                </div>
+              <?php else: /* Use h1 when the content title is empty */ ?>
+                <h1 id="site-name"<?php if ($hide_site_name) { print ' class="element-invisible"'; } ?>>
+                  <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home">
+                    <span>
+                      <?php print $site_name; ?>
+                    </span>
+                  </a>
+                </h1>
+              <?php endif; ?>
+            <?php endif; ?>
+
+            <?php if ($site_slogan): ?>
+              <div id="site-slogan"<?php if ($hide_site_slogan) { print ' class="element-invisible"'; } ?>>
+                <?php print $site_slogan; ?>
+              </div>
+            <?php endif; ?>
 
-    <?php if ($site_name || $site_slogan): ?>
-      <div id="name-and-slogan"<?php if ($hide_site_name && $hide_site_slogan) { print ' class="element-invisible"'; } ?>>
-
-        <?php if ($site_name): ?>
-          <?php if ($title): ?>
-            <div id="site-name"<?php if ($hide_site_name) { print ' class="element-invisible"'; } ?>>
-              <strong>
-                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
-              </strong>
-            </div>
-          <?php else: /* Use h1 when the content title is empty */ ?>
-            <h1 id="site-name"<?php if ($hide_site_name) { print ' class="element-invisible"'; } ?>>
-              <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
-            </h1>
-          <?php endif; ?>
+          </div> <!-- /#name-and-slogan -->
         <?php endif; ?>
 
-        <?php if ($site_slogan): ?>
-          <div id="site-slogan"<?php if ($hide_site_slogan) { print ' class="element-invisible"'; } ?>>
-            <?php print $site_slogan; ?>
-          </div>
+        <?php print render($page['header']); ?>
+
+        <?php if ($main_menu): ?>
+          <nav id="main-menu" class="navigation" role="navigation">
+            <?php print theme('links__system_main_menu', array(
+              'links' => $main_menu,
+              'attributes' => array(
+                'id' => 'main-menu-links',
+                'class' => array('links', 'clearfix'),
+              ),
+              'heading' => array(
+                'text' => t('Main menu'),
+                'level' => 'h2',
+                'class' => array('element-invisible'),
+              ),
+            )); ?>
+          </nav> <!-- /#main-menu -->
         <?php endif; ?>
+      </div>
+    </header> <!-- /.section, /#header -->
 
-      </div> <!-- /#name-and-slogan -->
+    <?php if ($messages): ?>
+      <div id="messages">
+        <div class="section clearfix">
+          <?php print $messages; ?>
+        </div>
+      </div> <!-- /.section, /#messages -->
     <?php endif; ?>
 
-    <?php print render($page['header']); ?>
-
-    <?php if ($main_menu): ?>
-      <nav id="main-menu" class="navigation" role="navigation">
-        <?php print theme('links__system_main_menu', array(
-          'links' => $main_menu,
-          'attributes' => array(
-            'id' => 'main-menu-links',
-            'class' => array('links', 'clearfix'),
-          ),
-          'heading' => array(
-            'text' => t('Main menu'),
-            'level' => 'h2',
-            'class' => array('element-invisible'),
-          ),
-        )); ?>
-      </nav> <!-- /#main-menu -->
+    <?php if ($page['featured']): ?>
+      <aside id="featured">
+        <div class="section clearfix">
+          <?php print render($page['featured']); ?>
+        </div>
+      </aside> <!-- /.section, /#featured -->
     <?php endif; ?>
 
+    <div id="main-wrapper" class="clearfix">
+      <div id="main" class="clearfix">
 
+        <?php print $breadcrumb; ?>
 
-  </div></header> <!-- /.section, /#header -->
-
-  <?php if ($messages): ?>
-    <div id="messages"><div class="section clearfix">
-      <?php print $messages; ?>
-    </div></div> <!-- /.section, /#messages -->
-  <?php endif; ?>
-
-  <?php if ($page['featured']): ?>
-    <aside id="featured"><div class="section clearfix">
-      <?php print render($page['featured']); ?>
-    </div></aside> <!-- /.section, /#featured -->
-  <?php endif; ?>
-
-  <div id="main-wrapper" class="clearfix"><div id="main" class="clearfix">
-
-    <?php print $breadcrumb; ?>
-
-    <main id="content" class="column" role="main"><section class="section">
-      <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
-      <a id="main-content"></a>
-      <?php print render($title_prefix); ?>
-      <?php if ($title): ?>
-        <h1 class="title" id="page-title">
-          <?php print $title; ?>
-        </h1>
-      <?php endif; ?>
-      <?php print render($title_suffix); ?>
-      <?php if ($tabs): ?>
-        <nav class="tabs" role="navigation">
-          <?php print render($tabs); ?>
-        </nav>
-      <?php endif; ?>
-      <?php print render($page['help']); ?>
-      <?php if ($action_links): ?>
-        <ul class="action-links">
-          <?php print render($action_links); ?>
-        </ul>
-      <?php endif; ?>
-      <?php print render($page['content']); ?>
-      <?php print $feed_icons; ?>
-
-    </section></main> <!-- /.section, /#content -->
-
-    <?php if ($page['sidebar_first']): ?>
-      <div id="sidebar-first" class="column sidebar"><aside class="section">
-        <?php print render($page['sidebar_first']); ?>
-      </aside></div> <!-- /.section, /#sidebar-first -->
-    <?php endif; ?>
+        <main id="content" class="column" role="main">
+          <section class="section">
+            <?php if ($page['highlighted']): ?>
+              <div id="highlighted">
+                <?php print render($page['highlighted']); ?>
+              </div>
+            <?php endif; ?>
 
-    <?php if ($page['sidebar_second']): ?>
-      <div id="sidebar-second" class="column sidebar"><aside class="section">
-        <?php print render($page['sidebar_second']); ?>
-      </aside></div> <!-- /.section, /#sidebar-second -->
-    <?php endif; ?>
+            <a id="main-content">
+            </a>
 
-  </div></div> <!-- /#main, /#main-wrapper -->
-
-  <?php if ($page['triptych_first'] || $page['triptych_middle'] || $page['triptych_last']): ?>
-    <div id="triptych-wrapper"><aside id="triptych" class="clearfix">
-      <?php print render($page['triptych_first']); ?>
-      <?php print render($page['triptych_middle']); ?>
-      <?php print render($page['triptych_last']); ?>
-    </aside></div> <!-- /#triptych, /#triptych-wrapper -->
-  <?php endif; ?>
-
-  <div id="footer-wrapper"><footer class="section" role="contentinfo">
-
-    <?php if ($page['footer_firstcolumn'] || $page['footer_secondcolumn'] || $page['footer_thirdcolumn'] || $page['footer_fourthcolumn']): ?>
-      <div id="footer-columns" class="clearfix">
-        <?php print render($page['footer_firstcolumn']); ?>
-        <?php print render($page['footer_secondcolumn']); ?>
-        <?php print render($page['footer_thirdcolumn']); ?>
-        <?php print render($page['footer_fourthcolumn']); ?>
-      </div> <!-- /#footer-columns -->
-    <?php endif; ?>
+            <?php print render($title_prefix); ?>
+            <?php if ($title): ?>
+              <h1 class="title" id="page-title">
+                <?php print $title; ?>
+              </h1>
+            <?php endif; ?>
+            <?php print render($title_suffix); ?>
+
+            <?php if ($tabs): ?>
+              <nav class="tabs" role="navigation">
+                <?php print render($tabs); ?>
+              </nav>
+            <?php endif; ?>
+
+            <?php print render($page['help']); ?>
 
-    <?php if ($page['footer']): ?>
-      <div id="footer" role="contentinfo" class="clearfix">
-        <?php print render($page['footer']); ?>
-      </div> <!-- /#footer -->
+            <?php if ($action_links): ?>
+              <ul class="action-links">
+                <?php print render($action_links); ?>
+              </ul>
+            <?php endif; ?>
+
+            <?php print render($page['content']); ?>
+            <?php print $feed_icons; ?>
+          </section>
+        </main> <!-- /.section, /#content -->
+
+        <?php if ($page['sidebar_first']): ?>
+          <div id="sidebar-first" class="column sidebar">
+            <aside class="section">
+              <?php print render($page['sidebar_first']); ?>
+            </aside>
+          </div> <!-- /.section, /#sidebar-first -->
+        <?php endif; ?>
+
+        <?php if ($page['sidebar_second']): ?>
+          <div id="sidebar-second" class="column sidebar">
+            <aside class="section">
+              <?php print render($page['sidebar_second']); ?>
+            </aside>
+          </div> <!-- /.section, /#sidebar-second -->
+        <?php endif; ?>
+
+      </div>
+    </div> <!-- /#main, /#main-wrapper -->
+
+    <?php if ($page['triptych_first'] || $page['triptych_middle'] || $page['triptych_last']): ?>
+      <div id="triptych-wrapper">
+        <aside id="triptych" class="clearfix">
+          <?php print render($page['triptych_first']); ?>
+          <?php print render($page['triptych_middle']); ?>
+          <?php print render($page['triptych_last']); ?>
+        </aside>
+      </div> <!-- /#triptych, /#triptych-wrapper -->
     <?php endif; ?>
 
-  </footer></div> <!-- /.section, /#footer-wrapper -->
+    <div id="footer-wrapper">
+      <footer class="section" role="contentinfo">
+
+        <?php if ($page['footer_firstcolumn'] || $page['footer_secondcolumn'] || $page['footer_thirdcolumn'] || $page['footer_fourthcolumn']): ?>
+          <div id="footer-columns" class="clearfix">
+            <?php print render($page['footer_firstcolumn']); ?>
+            <?php print render($page['footer_secondcolumn']); ?>
+            <?php print render($page['footer_thirdcolumn']); ?>
+            <?php print render($page['footer_fourthcolumn']); ?>
+          </div> <!-- /#footer-columns -->
+        <?php endif; ?>
+
+        <?php if ($page['footer']): ?>
+          <div id="footer" role="contentinfo" class="clearfix">
+            <?php print render($page['footer']); ?>
+          </div> <!-- /#footer -->
+        <?php endif; ?>
+
+      </footer>
+    </div> <!-- /.section, /#footer-wrapper -->
 
-</div></div> <!-- /#page, /#page-wrapper -->
+  </div>
+</div> <!-- /#page, /#page-wrapper -->
