diff --git a/404.php b/404.php
index 03a279a..0e4fb9e 100644
--- a/404.php
+++ b/404.php
@@ -4,74 +4,76 @@
  * @package understrap
  */
 
-get_header(); ?>
+ get_header();
+?>
 <div class="wrapper" id="404-wrapper">
-    
-    <div  id="content" class="container">
 
-        <div class="row">
-        
-            <div id="primary" class="content-area">
+  <div  id="content" class="container">
 
-                <main id="main" class="site-main" role="main">
+    <div class="row">
 
-                    <section class="error-404 not-found">
-                        
-                        <header class="page-header">
+      <div id="primary" class="content-area">
 
-                            <h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'understrap' ); ?></h1>
-                        </header><!-- .page-header -->
+        <main id="main" class="site-main" role="main">
 
-                        <div class="page-content">
+          <section class="error-404 not-found">
 
-                            <p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'understrap' ); ?></p>
+            <header class="page-header">
 
-                            <?php get_search_form(); ?>
+              <h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'understrap' ); ?></h1>
 
-                            <?php the_widget( 'WP_Widget_Recent_Posts' ); ?>
+            </header><!-- .page-header -->
 
-                            <?php if ( understrap_categorized_blog() ) : // Only show the widget if site has multiple categories. ?>
+            <div class="page-content">
 
-                                <div class="widget widget_categories">
+              <p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'understrap' ); ?></p>
 
-                                    <h2 class="widget-title"><?php _e( 'Most Used Categories', 'understrap' ); ?></h2>
+              <?php get_search_form(); ?>
 
-                                    <ul>
-                                    <?php
-                                        wp_list_categories( array(
-                                            'orderby'    => 'count',
-                                            'order'      => 'DESC',
-                                            'show_count' => 1,
-                                            'title_li'   => '',
-                                            'number'     => 10,
-                                        ) );
-                                    ?>
-                                    </ul>
+              <?php the_widget( 'WP_Widget_Recent_Posts' ); ?>
 
-                                </div><!-- .widget -->
-                            
-                            <?php endif; ?>
+              <?php if ( understrap_categorized_blog() ) : // Only show the widget if site has multiple categories. ?>
 
-                            <?php
-                                /* translators: %1$s: smiley */
-                                $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'understrap' ), convert_smilies( ':)' ) ) . '</p>';
-                                the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );
-                            ?>
+                <div class="widget widget_categories">
 
-                            <?php the_widget( 'WP_Widget_Tag_Cloud' ); ?>
+                  <h2 class="widget-title"><?php _e( 'Most Used Categories', 'understrap' ); ?></h2>
 
-                        </div><!-- .page-content -->
-                        
-                    </section><!-- .error-404 -->
+                  <ul>
+                    <?php
+                      wp_list_categories( array(
+                        'orderby'    => 'count',
+                        'order'      => 'DESC',
+                        'show_count' => 1,
+                        'title_li'   => '',
+                        'number'     => 10,
+                      ) );
+                    ?>
+                  </ul>
 
-                </main><!-- #main -->
-                
-            </div><!-- #primary -->
+                </div><!-- .widget -->
+
+              <?php endif; ?>
+
+              <?php
+                /* translators: %1$s: smiley */
+                $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'understrap' ), convert_smilies( ':)' ) ) . '</p>';
+                the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );
+              ?>
+
+              <?php the_widget( 'WP_Widget_Tag_Cloud' ); ?>
+
+            </div><!-- .page-content -->
+
+          </section><!-- .error-404 -->
+
+        </main><!-- #main -->
+
+      </div><!-- #primary -->
+
+    </div> <!-- .row -->
+
+  </div><!-- Container end -->
 
-        </div> <!-- .row -->
-        
-    </div><!-- Container end -->
-    
 </div><!-- Wrapper end -->
 
 <?php get_footer(); ?>
diff --git a/archive.php b/archive.php
index 3cdd972..749fe9b 100644
--- a/archive.php
+++ b/archive.php
@@ -7,58 +7,59 @@
  * @package understrap
  */
 
-get_header(); ?>
+ get_header();
+?>
 
 <div class="wrapper" id="archive-wrapper">
-    
-    <div  id="content" class="container">
 
-        <div class="row">
-        
-    	    <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
-               
-            <main id="main" class="site-main" role="main">
+  <div  id="content" class="container">
 
-                      <?php if ( have_posts() ) : ?>
+    <div class="row">
 
-                        <header class="page-header">
-                            <?php
-                                the_archive_title( '<h1 class="page-title">', '</h1>' );
-                                the_archive_description( '<div class="taxonomy-description">', '</div>' );
-                            ?>
-                        </header><!-- .page-header -->
+      <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
 
-                        <?php /* Start the Loop */ ?>
-                        <?php while ( have_posts() ) : the_post(); ?>
+        <main id="main" class="site-main" role="main">
 
-                            <?php
-                                /* Include the Post-Format-specific template for the content.
-                                 * If you want to override this in a child theme, then include a file
-                                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-                                 */
-                                get_template_part( 'loop-templates/content', get_post_format() );
-                            ?>
+          <?php if ( have_posts() ) : ?>
 
-                        <?php endwhile; ?>
+            <header class="page-header">
+              <?php
+                the_archive_title( '<h1 class="page-title">', '</h1>' );
+                the_archive_description( '<div class="taxonomy-description">', '</div>' );
+              ?>
+            </header><!-- .page-header -->
 
-                            <?php the_posts_navigation(); ?>
+            <?php /* Start the Loop */ ?>
+            <?php while ( have_posts() ) : the_post(); ?>
 
-                        <?php else : ?>
+              <?php
+                /* Include the Post-Format-specific template for the content.
+                 * If you want to override this in a child theme, then include a file
+                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
+                 */
+                get_template_part( 'loop-templates/content', get_post_format() );
+              ?>
 
-                            <?php get_template_part( 'loop-templates/content', 'none' ); ?>
+            <?php endwhile; ?>
 
-                        <?php endif; ?>
+            <?php the_posts_navigation(); ?>
 
-            </main><!-- #main -->
-               
-    	    </div><!-- #primary -->
+          <?php else : ?>
 
-        <?php get_sidebar(); ?>
+            <?php get_template_part( 'loop-templates/content', 'none' ); ?>
+
+          <?php endif; ?>
+
+        </main><!-- #main -->
+
+      </div><!-- #primary -->
+
+      <?php get_sidebar(); ?>
 
     </div> <!-- .row -->
-        
-    </div><!-- Container end -->
-    
+
+  </div><!-- Container end -->
+
 </div><!-- Wrapper end -->
 
 <?php get_footer(); ?>
diff --git a/author.php b/author.php
index aec32bc..b00bba9 100644
--- a/author.php
+++ b/author.php
@@ -6,80 +6,81 @@
  *
  * @package understrap
  */
-get_header(); ?>
+ get_header();
+?>
 
 <div class="wrapper" id="author-wrapper">
-    
-    <div  id="content" class="container">
 
-        <div class="row">
-        
-            <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
-               
-                <main id="main" class="site-main" role="main">
-                        
-                    <header class="page-header author-header">
-                        
-                        <?php
-                            $curauth = (isset($_GET['author_name'])) ? get_user_by('slug', $author_name) : get_userdata(intval($author));
-                        ?>
+  <div  id="content" class="container">
 
-                        <h1><?php esc_html_e( 'About:', 'understrap' ); ?> <?php echo $curauth->nickname; ?></h1>
+    <div class="row">
 
-                        <?php if ( ! empty( $curauth->ID ) ) : ?>
-                            <?php echo get_avatar($curauth->ID); ?>
-                        <?php endif; ?>
+      <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
 
-                        <dl>
-                            <?php if ( ! empty( $curauth->user_url ) ) : ?>
-                                <dt><?php esc_html_e( 'Website', 'understrap' ); ?></dt>
-                                <dd><a href="<?php echo $curauth->user_url; ?>"><?php echo $curauth->user_url; ?></a></dd>
-                            <?php endif; ?>
+        <main id="main" class="site-main" role="main">
 
-                            <?php if ( ! empty( $curauth->user_description ) ) : ?>
-                                <dt><?php esc_html_e( 'Profile', 'understrap' ); ?></dt>
-                                <dd><?php echo $curauth->user_description; ?></dd>
-                            <?php endif; ?>
-                        </dl>
-                        
-                        <h2><?php esc_html_e( 'Posts by', 'understrap' ); ?> <?php echo $curauth->nickname; ?>:</h2>
-                            
-                    </header><!-- .page-header -->
-                    
-                    <ul>
-                        <!-- The Loop -->
-                        
-                        <?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
-                               <li>
-                                    <a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>">
-                                    <?php the_title(); ?></a>,
-                                    <?php the_time('d M Y'); ?> in <?php the_category('&');?>
-                            </li>
-                        
-                        <?php endwhile; ?>
+          <header class="page-header author-header">
 
-                            <?php the_posts_navigation(); ?>
+            <?php
+              $curauth = (isset($_GET['author_name'])) ? get_user_by('slug', $author_name) : get_userdata(intval($author));
+            ?>
 
-                        <?php else : ?>
+            <h1><?php esc_html_e( 'About:', 'understrap' ); ?> <?php echo $curauth->nickname; ?></h1>
 
-                            <?php get_template_part( 'loop-templates/content', 'none' ); ?>
+            <?php if ( ! empty( $curauth->ID ) ) : ?>
+              <?php echo get_avatar($curauth->ID); ?>
+            <?php endif; ?>
 
-                        <?php endif; ?>
-                        
-                        <!-- End Loop -->
-        
-                    </ul>
+            <dl>
+              <?php if ( ! empty( $curauth->user_url ) ) : ?>
+                <dt><?php esc_html_e( 'Website', 'understrap' ); ?></dt>
+                <dd><a href="<?php echo $curauth->user_url; ?>"><?php echo $curauth->user_url; ?></a></dd>
+              <?php endif; ?>
 
-                </main><!-- #main -->
-               
-            </div><!-- #primary -->
+              <?php if ( ! empty( $curauth->user_description ) ) : ?>
+                <dt><?php esc_html_e( 'Profile', 'understrap' ); ?></dt>
+                <dd><?php echo $curauth->user_description; ?></dd>
+              <?php endif; ?>
+            </dl>
 
-            <?php get_sidebar(); ?>
+            <h2><?php esc_html_e( 'Posts by', 'understrap' ); ?> <?php echo $curauth->nickname; ?>:</h2>
+
+          </header><!-- .page-header -->
+
+          <ul>
+
+            <!-- The Loop -->
+            <?php if ( have_posts() ) : ?>
+              <?php while ( have_posts() ) : the_post(); ?>
+              <li>
+                <a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>">
+                <?php the_title(); ?></a>,
+                <?php the_time('d M Y'); ?> in <?php the_category('&');?>
+              </li>
+              <?php endwhile; ?>
+
+              <?php the_posts_navigation(); ?>
+
+            <?php else : ?>
+
+              <?php get_template_part( 'loop-templates/content', 'none' ); ?>
+
+            <?php endif; ?>
+
+            <!-- End Loop -->
+
+          </ul>
+
+        </main><!-- #main -->
+
+      </div><!-- #primary -->
+
+      <?php get_sidebar(); ?>
+
+    </div> <!-- .row -->
+
+  </div><!-- Container end -->
 
-        </div> <!-- .row -->
-        
-    </div><!-- Container end -->
-    
 </div><!-- Wrapper end -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/comments.php b/comments.php
index b66224a..d75a09e 100644
--- a/comments.php
+++ b/comments.php
@@ -14,70 +14,70 @@
  * return early without loading the comments.
  */
 if ( post_password_required() ) {
-    return;
+  return;
 }
 ?>
 
 <div id="comments" class="comments-area">
 
-    <?php // You can start editing here -- including this comment! ?>
+  <?php // You can start editing here -- including this comment! ?>
 
-    <?php if ( have_comments() ) : ?>
-        <h2 class="comments-title">
-            <?php
-                printf( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'understrap' ),
-                    number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
-            ?>
-        </h2>
+  <?php if ( have_comments() ) : ?>
+    <h2 class="comments-title">
+      <?php
+        printf( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'understrap' ),
+        number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
+      ?>
+    </h2>
 
-        <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
-        <nav id="comment-nav-above" class="comment-navigation" role="navigation">
-            <h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'understrap' ); ?></h1>
-<?php if ( get_previous_comments_link() ) { ?>
-            <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'understrap' ) ); ?></div>
- <?php }
-                    if ( get_next_comments_link() ) { ?>
-            <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'understrap' ) ); ?></div>
- <?php } ?>
-        </nav><!-- #comment-nav-above -->
-        <?php endif; // check for comment navigation ?>
+    <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
+      <nav id="comment-nav-above" class="comment-navigation" role="navigation">
+        <h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'understrap' ); ?></h1>
+        <?php if ( get_previous_comments_link() ) { ?>
+          <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'understrap' ) ); ?></div>
+        <?php } if ( get_next_comments_link() ) { ?>
+          <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'understrap' ) ); ?></div>
+        <?php } ?>
+      </nav><!-- #comment-nav-above -->
+    <?php endif; // check for comment navigation ?>
 
-        <ol class="comment-list">
-            <?php
-                wp_list_comments( array(
-                    'style'      => 'ol',
-                    'short_ping' => true,
-                ) );
-            ?>
-        </ol><!-- .comment-list -->
+    <ol class="comment-list">
+      <?php
+        wp_list_comments( array(
+          'style'      => 'ol',
+          'short_ping' => true,
+        ) );
+      ?>
+    </ol><!-- .comment-list -->
 
-        <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
-        <nav id="comment-nav-below" class="comment-navigation" role="navigation">
-            <h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'understrap' ); ?></h1>
-<?php if ( get_previous_comments_link() ) { ?>
-            <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'understrap' ) ); ?></div>
-<?php }
-                    if ( get_next_comments_link() ) { ?>
-            <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'understrap' ) ); ?></div>
- <?php } ?>
-        </nav><!-- #comment-nav-below -->
-        <?php endif; // check for comment navigation ?>
+    <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
+      <nav id="comment-nav-below" class="comment-navigation" role="navigation">
+        <h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'understrap' ); ?></h1>
+        <?php if ( get_previous_comments_link() ) { ?>
+          <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'understrap' ) );?></div>
+        <?php } if ( get_next_comments_link() ) { ?>
+          <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'understrap' ) ); ?></div>
+        <?php } ?>
+      </nav><!-- #comment-nav-below -->
+    <?php endif; // check for comment navigation ?>
 
-    <?php endif; // have_comments() ?>
+  <?php endif; // have_comments() ?>
 
-    <?php
-        // If comments are closed and there are comments, let's leave a little note, shall we?
-        if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
-    ?>
-        <p class="no-comments"><?php _e( 'Comments are closed.', 'understrap' ); ?></p>
-    <?php endif; ?>
+  <?php
+    // If comments are closed and there are comments, let's leave a little note, shall we?
+    if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
+  ?>
 
- <?php
-        /* Loads the comment-form.php template
-        /* get_template_part('comment-form');
-        */
-    ?>
+    <p class="no-comments"><?php _e( 'Comments are closed.', 'understrap' ); ?></p>
 
-    <?php comment_form(); ?>
+  <?php endif; ?>
+
+   <?php
+    /* Loads the comment-form.php template
+    /* get_template_part('comment-form');
+    */
+  ?>
+
+  <?php comment_form(); ?>
 
 </div><!-- #comments -->
diff --git a/footer.php b/footer.php
index 69cb705..9c8b9c7 100644
--- a/footer.php
+++ b/footer.php
@@ -6,41 +6,42 @@
  *
  * @package understrap
  */
+ 
  $the_theme = wp_get_theme();
 ?>
 
-<?php get_sidebar('footerfull'); ?>
+    <?php get_sidebar('footerfull'); ?>
 
-<div class="wrapper" id="wrapper-footer">
+    <div class="wrapper" id="wrapper-footer">
 
-    <div class="container">
+      <div class="container">
 
         <div class="row">
 
-            <div class="col-md-12">
+          <div class="col-md-12">
 
-                <footer id="colophon" class="site-footer" role="contentinfo">
+            <footer id="colophon" class="site-footer" role="contentinfo">
 
-                    <div class="site-info">
-                        <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'understrap' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'understrap' ), 'WordPress' ); ?></a>
-                        <span class="sep"> | </span>
-                        <?php printf( __( 'Theme: %1$s by %2$s.', 'understrap' ), $the_theme->get( 'Name' ), '<a href="http://understrap.com/" rel="designer">understrap.com</a>' ); ?>
-                        (<?php printf( __( 'Version: %1$s', 'understrap' ), $the_theme->get( 'Version' ) ); ?>)
-                    </div><!-- .site-info -->
+              <div class="site-info">
+                <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'understrap' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'understrap' ), 'WordPress' ); ?></a>
+                <span class="sep"> | </span>
+                <?php printf( __( 'Theme: %1$s by %2$s.', 'understrap' ), $the_theme->get( 'Name' ), '<a href="http://understrap.com/" rel="designer">understrap.com</a>' ); ?>
+                (<?php printf( __( 'Version: %1$s', 'understrap' ), $the_theme->get( 'Version' ) ); ?>)
+              </div><!-- .site-info -->
 
-                </footer><!-- #colophon -->
+            </footer><!-- #colophon -->
 
-            </div><!--col end -->
+          </div><!--col end -->
 
         </div><!-- row end -->
 
-    </div><!-- container end -->
+      </div><!-- container end -->
 
-</div><!-- wrapper end -->
+    </div><!-- wrapper end -->
 
-</div><!-- #page -->
+  </div><!-- #page -->
 
-<?php wp_footer(); ?>
+  <?php wp_footer(); ?>
 
 </body>
 
diff --git a/functions.php b/functions.php
index 00564e9..1cd5296 100644
--- a/functions.php
+++ b/functions.php
@@ -62,7 +62,6 @@ require get_template_directory() . '/inc/bootstrap-wp-navwalker.php';
 */
 require get_template_directory() . '/inc/bootstrap-wp-gallery.php';
 
-
 /**
 * Load WooCommerce functions.
 */
diff --git a/header.php b/header.php
index 2c4c4fa..3ba7f05 100755
--- a/header.php
+++ b/header.php
@@ -6,72 +6,62 @@
  *
  * @package understrap
  */
-?><!DOCTYPE html>
+?>
+<!DOCTYPE html>
 <html <?php language_attributes(); ?>>
 <head>
-<meta charset="<?php bloginfo( 'charset' ); ?>">
-<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-title" content="<?php bloginfo('name'); ?> - <?php bloginfo('description'); ?>">
-<link rel="profile" href="http://gmpg.org/xfn/11">
-<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
-<?php wp_head(); ?>
+  <meta charset="<?php bloginfo( 'charset' ); ?>">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-title" content="<?php bloginfo('name'); ?> - <?php bloginfo('description'); ?>">
+  <link rel="profile" href="http://gmpg.org/xfn/11">
+  <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
+  <?php wp_head(); ?>
 </head>
 
 <body <?php body_class(); ?>>
 
-<div id="page" class="hfeed site">
-    
+  <div id="page" class="hfeed site">
+
     <!-- ******************* The Navbar Area ******************* -->
     <div class="wrapper-fluid wrapper-navbar" id="wrapper-navbar">
-	
-        <a class="skip-link screen-reader-text sr-only" href="#content"><?php _e( 'Skip to content', 'understrap' ); ?></a>
 
-        <nav class="navbar navbar-dark bg-inverse site-navigation" itemscope="itemscope" itemtype="http://schema.org/SiteNavigationElement">
-                            
+      <a class="skip-link screen-reader-text sr-only" href="#content"><?php _e( 'Skip to content', 'understrap' ); ?></a>
 
-                <div class="container">
+      <nav class="navbar navbar-dark bg-inverse site-navigation" itemscope="itemscope" itemtype="http://schema.org/SiteNavigationElement">
 
+        <div class="container">
 
-                            <div class="navbar-header">
+          <div class="navbar-header">
 
-                                <!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
+            <!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
+            <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target=".exCollapsingNavbar" aria-controls="exCollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation">&#9776;</button>
 
-                                <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target=".exCollapsingNavbar" aria-controls="exCollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation">
-    					&#9776;
-  				</button>
+            <!-- Your site title as branding in the menu -->
+            <?php if (!has_custom_logo()) { ?>
+              <a class="navbar-brand" href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
+                <?php bloginfo( 'name' ); ?>
+              </a>
+            <?php } else { the_custom_logo(); } ?><!-- end custom logo -->
 
-                                <!-- Your site title as branding in the menu -->
-	                                <?php if (!has_custom_logo()) { ?>
-		                                <a class="navbar-brand" href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
-		                                	<?php bloginfo( 'name' ); ?>
-		                                </a>
-	                                <?php } else { the_custom_logo(); } ?><!-- end custom logo -->
+          </div>
 
-                            </div>
+          <!-- The WordPress Menu goes here -->
+          <?php wp_nav_menu(
+            array(
+              'theme_location' => 'primary',
+              'container_class' => 'collapse navbar-toggleable-xs exCollapsingNavbar',
+              'menu_class' => 'nav navbar-nav',
+              'fallback_cb' => '',
+              'menu_id' => 'main-menu',
+              'walker' => new wp_bootstrap_navwalker()
+            )
+          ); ?>
 
-                            <!-- The WordPress Menu goes here -->
-                            <?php wp_nav_menu(
-                                    array(
-                                        'theme_location' => 'primary',
-                                        'container_class' => 'collapse navbar-toggleable-xs exCollapsingNavbar',
-                                        'menu_class' => 'nav navbar-nav',
-                                        'fallback_cb' => '',
-                                        'menu_id' => 'main-menu',
-                                        'walker' => new wp_bootstrap_navwalker()
-                                    )
-                            ); ?>
+        </div> <!-- .container -->
+
+      </nav><!-- .site-navigation -->
 
-                </div> <!-- .container -->
-            
-        </nav><!-- .site-navigation -->
-        
     </div><!-- .wrapper-navbar end -->
-
-
-
-
-
-
diff --git a/index.php b/index.php
index 325fec8..97d41d1 100644
--- a/index.php
+++ b/index.php
@@ -11,64 +11,61 @@
  * @package understrap
  */
 
-get_header(); ?>
+  get_header();
 
-    <?php
-    if ( is_front_page() && is_home() ) {
+  if ( is_front_page() && is_home() ) {
+    get_sidebar('hero');
 
-        get_sidebar('hero'); 
-
-        get_sidebar('statichero');
-        
-    } else {
+    get_sidebar('statichero');
+  } else {
     // Do nothing...or?
-    }
-    ?>
+  }
+?>
 
-    <div class="wrapper" id="wrapper-index">
-        
-	   <div id="content" class="container">
+<div class="wrapper" id="wrapper-index">
 
-            <div class="row">
-           
-    	       <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
-                   
-                     <main id="main" class="site-main" role="main">
-                    
-                    <?php if ( have_posts() ) : ?>
+  <div id="content" class="container">
 
-                        <?php /* Start the Loop */ ?>
+    <div class="row">
 
-                        <?php while ( have_posts() ) : the_post(); ?>
+      <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
 
-                                <?php
-                                    /* Include the Post-Format-specific template for the content.
-                                     * If you want to override this in a child theme, then include a file
-                                     * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-                                     */
-                                    get_template_part( 'loop-templates/content', get_post_format() );
-                                ?>
+        <main id="main" class="site-main" role="main">
 
-                        <?php endwhile; ?>
-                        
-                        <?php the_posts_navigation(); ?>
-                        
-                    <?php else : ?>
+          <?php if ( have_posts() ) : ?>
 
-                        <?php get_template_part( 'loop-templates/content', 'none' ); ?>
-                        
-                    <?php endif; ?>
-                        
-                    </main><!-- #main -->
-                   
-    	       </div><!-- #primary -->
-        
-            <?php get_sidebar(); ?>
+            <?php /* Start the Loop */ ?>
 
-            </div><!-- .row -->
-           
-       </div><!-- Container end -->
-        
-    </div><!-- Wrapper end -->
+            <?php while ( have_posts() ) : the_post(); ?>
+
+              <?php
+                /* Include the Post-Format-specific template for the content.
+                 * If you want to override this in a child theme, then include a file
+                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
+                 */
+                get_template_part( 'loop-templates/content', get_post_format() );
+              ?>
+
+            <?php endwhile; ?>
+
+            <?php the_posts_navigation(); ?>
+
+          <?php else : ?>
+
+            <?php get_template_part( 'loop-templates/content', 'none' ); ?>
+
+          <?php endif; ?>
+
+        </main><!-- #main -->
+
+      </div><!-- #primary -->
+
+      <?php get_sidebar(); ?>
+
+    </div><!-- .row -->
+
+  </div><!-- Container end -->
+
+</div><!-- Wrapper end -->
 
 <?php get_footer(); ?>
diff --git a/loop-templates/content-blank.php b/loop-templates/content-blank.php
index b491e01..956858e 100644
--- a/loop-templates/content-blank.php
+++ b/loop-templates/content-blank.php
@@ -6,5 +6,4 @@
  */
 ?>
 
-	<?php the_content(); ?>
-
+  <?php the_content(); ?>
diff --git a/loop-templates/content-empty.php b/loop-templates/content-empty.php
index b491e01..956858e 100644
--- a/loop-templates/content-empty.php
+++ b/loop-templates/content-empty.php
@@ -6,5 +6,4 @@
  */
 ?>
 
-	<?php the_content(); ?>
-
+  <?php the_content(); ?>
diff --git a/loop-templates/content-none.php b/loop-templates/content-none.php
index 38429da..1d66c08 100644
--- a/loop-templates/content-none.php
+++ b/loop-templates/content-none.php
@@ -11,31 +11,31 @@
 
 <article id="post-0" class="post no-results not-found">
 
-	<header class="page-header">
+  <header class="page-header">
 
-		<h2 class="page-title"><?php _e( 'Nothing Found', 'understrap' ); ?></h2>
+    <h2 class="page-title"><?php _e( 'Nothing Found', 'understrap' ); ?></h2>
 
-	</header><!-- .page-header -->
+  </header><!-- .page-header -->
 
-	<div class="page-content">
+  <div class="page-content">
 
-		<?php if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
+    <?php if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
 
-			<p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'understrap' ), esc_url( admin_url( 'post-new.php' ) ) ); ?></p>
+      <p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'understrap' ), esc_url( admin_url( 'post-new.php' ) ) ); ?></p>
 
-		<?php elseif ( is_search() ) : ?>
+    <?php elseif ( is_search() ) : ?>
 
-			<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'understrap' ); ?></p>
-			<?php get_search_form(); ?>
+      <p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'understrap' ); ?></p>
+      <?php get_search_form(); ?>
 
-		<?php else : ?>
+    <?php else : ?>
 
-			<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'understrap' ); ?></p>
+      <p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'understrap' ); ?></p>
 
-			<?php get_search_form(); ?>
+      <?php get_search_form(); ?>
 
-		<?php endif; ?>
+    <?php endif; ?>
+
+  </div><!-- .page-content -->
 
-	</div><!-- .page-content -->
-	
 </article><!-- .no-results -->
diff --git a/loop-templates/content-page.php b/loop-templates/content-page.php
index 0ac1495..ac8eb68 100644
--- a/loop-templates/content-page.php
+++ b/loop-templates/content-page.php
@@ -8,31 +8,31 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-	<header class="entry-header">
+  <header class="entry-header">
 
-		<?php the_title( '<h2 class="entry-title">', '</h2>' ); ?>
+    <?php the_title( '<h2 class="entry-title">', '</h2>' ); ?>
 
-	</header><!-- .entry-header -->
+  </header><!-- .entry-header -->
 
-     <?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?> 
-    
-	<div class="entry-content">
+  <?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?>
 
-		<?php the_content(); ?>
+  <div class="entry-content">
 
-		<?php
-			wp_link_pages( array(
-				'before' => '<div class="page-links">' . __( 'Pages:', 'understrap' ),
-				'after'  => '</div>',
-			) );
-		?>
+    <?php the_content(); ?>
 
-	</div><!-- .entry-content -->
+    <?php
+      wp_link_pages( array(
+        'before' => '<div class="page-links">' . __( 'Pages:', 'understrap' ),
+        'after'  => '</div>',
+      ) );
+    ?>
 
-	<footer class="entry-footer">
+  </div><!-- .entry-content -->
 
-		<?php edit_post_link( __( 'Edit', 'understrap' ), '<span class="edit-link">', '</span>' ); ?>
+  <footer class="entry-footer">
 
-	</footer><!-- .entry-footer -->
+    <?php edit_post_link( __( 'Edit', 'understrap' ), '<span class="edit-link">', '</span>' ); ?>
+
+  </footer><!-- .entry-footer -->
 
 </article><!-- #post-## -->
diff --git a/loop-templates/content-search.php b/loop-templates/content-search.php
index 871b96f..cada198 100644
--- a/loop-templates/content-search.php
+++ b/loop-templates/content-search.php
@@ -6,32 +6,32 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-	<header class="entry-header">
+  <header class="entry-header">
 
-		<?php the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' ); ?>
+    <?php the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' ); ?>
 
-		<?php if ( 'post' == get_post_type() ) : ?>
+    <?php if ( 'post' == get_post_type() ) : ?>
 
-			<div class="entry-meta">
+      <div class="entry-meta">
 
-				<?php understrap_posted_on(); ?>
+        <?php understrap_posted_on(); ?>
 
-			</div><!-- .entry-meta -->
+      </div><!-- .entry-meta -->
 
-		<?php endif; ?>
+    <?php endif; ?>
 
-	</header><!-- .entry-header -->
+  </header><!-- .entry-header -->
 
-	<div class="entry-summary">
+  <div class="entry-summary">
 
-		<?php the_excerpt(); ?>
+    <?php the_excerpt(); ?>
 
-	</div><!-- .entry-summary -->
+  </div><!-- .entry-summary -->
 
-	<footer class="entry-footer">
+  <footer class="entry-footer">
 
-		<?php understrap_entry_footer(); ?>
+    <?php understrap_entry_footer(); ?>
 
-	</footer><!-- .entry-footer -->
+  </footer><!-- .entry-footer -->
 
 </article><!-- #post-## -->
diff --git a/loop-templates/content-single.php b/loop-templates/content-single.php
index 988f665..cb49f93 100644
--- a/loop-templates/content-single.php
+++ b/loop-templates/content-single.php
@@ -6,37 +6,37 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-	<header class="entry-header">
+  <header class="entry-header">
 
-		<?php the_title( '<h2 class="entry-title">', '</h2>' ); ?>
+    <?php the_title( '<h2 class="entry-title">', '</h2>' ); ?>
 
-		<div class="entry-meta">
+    <div class="entry-meta">
 
-			<?php understrap_posted_on(); ?>
+      <?php understrap_posted_on(); ?>
 
-		</div><!-- .entry-meta -->
+    </div><!-- .entry-meta -->
 
-	</header><!-- .entry-header -->
+  </header><!-- .entry-header -->
 
-     <?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?> 
-    
-	<div class="entry-content">
+     <?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?>
 
-		<?php the_content(); ?>
-		
-		<?php
-			wp_link_pages( array(
-				'before' => '<div class="page-links">' . __( 'Pages:', 'understrap' ),
-				'after'  => '</div>',
-			) );
-		?>
+  <div class="entry-content">
 
-	</div><!-- .entry-content -->
+    <?php the_content(); ?>
 
-	<footer class="entry-footer">
+    <?php
+      wp_link_pages( array(
+        'before' => '<div class="page-links">' . __( 'Pages:', 'understrap' ),
+        'after'  => '</div>',
+      ) );
+    ?>
 
-		<?php understrap_entry_footer(); ?>
+  </div><!-- .entry-content -->
 
-	</footer><!-- .entry-footer -->
+  <footer class="entry-footer">
+
+    <?php understrap_entry_footer(); ?>
+
+  </footer><!-- .entry-footer -->
 
 </article><!-- #post-## -->
diff --git a/loop-templates/content-verticalpage.php b/loop-templates/content-verticalpage.php
index 2ec44ec..6b20865 100755
--- a/loop-templates/content-verticalpage.php
+++ b/loop-templates/content-verticalpage.php
@@ -10,31 +10,31 @@
 
 <article id="<?php echo strtolower( $post->post_title ); ?>" <?php post_class(); ?>>
 
-	<header class="entry-header">
+  <header class="entry-header">
 
-		<?php the_title( '<h2 class="entry-title">', '</h2>' ); ?>
+    <?php the_title( '<h2 class="entry-title">', '</h2>' ); ?>
 
-	</header><!-- .entry-header -->
+  </header><!-- .entry-header -->
 
-	<?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?>
+  <?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?>
 
-	<div class="entry-content">
+  <div class="entry-content">
 
-		<?php the_content(); ?>
+    <?php the_content(); ?>
 
-		<?php
-		wp_link_pages( array(
-			'before' => '<div class="page-links">' . __( 'Pages:', 'understrap' ),
-			'after'  => '</div>',
-		) );
-		?>
+    <?php
+    wp_link_pages( array(
+      'before' => '<div class="page-links">' . __( 'Pages:', 'understrap' ),
+      'after'  => '</div>',
+    ) );
+    ?>
 
-	</div><!-- .entry-content -->
+  </div><!-- .entry-content -->
 
-	<footer class="entry-footer">
+  <footer class="entry-footer">
 
-		<?php edit_post_link( __( 'Edit', 'understrap' ), '<span class="edit-link">', '</span>' ); ?>
+    <?php edit_post_link( __( 'Edit', 'understrap' ), '<span class="edit-link">', '</span>' ); ?>
 
-	</footer><!-- .entry-footer -->
+  </footer><!-- .entry-footer -->
 
 </article><!-- #post-## -->
diff --git a/loop-templates/content.php b/loop-templates/content.php
index f45242f..b3d2558 100644
--- a/loop-templates/content.php
+++ b/loop-templates/content.php
@@ -5,42 +5,42 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-    
-	<header class="entry-header">
-        
-		<?php the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' ); ?>
 
-		<?php if ( 'post' == get_post_type() ) : ?>
+  <header class="entry-header">
 
-			<div class="entry-meta">
-				<?php understrap_posted_on(); ?>
-			</div><!-- .entry-meta -->
+    <?php the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' ); ?>
 
-		<?php endif; ?>
-        
-	</header><!-- .entry-header -->
+    <?php if ( 'post' == get_post_type() ) : ?>
 
-       <?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?> 
-    
-		<div class="entry-content">
+      <div class="entry-meta">
+        <?php understrap_posted_on(); ?>
+      </div><!-- .entry-meta -->
 
-	            <?php
-	                the_excerpt();
-	            ?>
+    <?php endif; ?>
 
-			<?php
-				wp_link_pages( array(
-					'before' => '<div class="page-links">' . __( 'Pages:', 'understrap' ),
-					'after'  => '</div>',
-				) );
-			?>
-	        
-		</div><!-- .entry-content -->
+  </header><!-- .entry-header -->
 
-	<footer class="entry-footer">
+  <?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?>
 
-		<?php understrap_entry_footer(); ?>
-		
-	</footer><!-- .entry-footer -->
-    
-</article><!-- #post-## -->
\ No newline at end of file
+  <div class="entry-content">
+
+    <?php
+      the_excerpt();
+    ?>
+
+    <?php
+      wp_link_pages( array(
+        'before' => '<div class="page-links">' . __( 'Pages:', 'understrap' ),
+        'after'  => '</div>',
+      ) );
+    ?>
+
+  </div><!-- .entry-content -->
+
+  <footer class="entry-footer">
+
+    <?php understrap_entry_footer(); ?>
+
+  </footer><!-- .entry-footer -->
+
+</article><!-- #post-## -->
diff --git a/page-templates/blank.php b/page-templates/blank.php
index 59959f7..ec1aa51 100644
--- a/page-templates/blank.php
+++ b/page-templates/blank.php
@@ -7,10 +7,9 @@
  * @package understrap
  */
 ?>
-
 <!DOCTYPE html>
 <html <?php language_attributes(); ?>>
-<head>
+  <head>
     <meta charset="<?php bloginfo('charset'); ?>">
     <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -20,13 +19,13 @@
     <link rel="profile" href="http://gmpg.org/xfn/11">
     <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>">
     <?php wp_head(); ?>
-</head>
-<body>
-<?php while (have_posts()) : the_post(); ?>
+  </head>
+  <body>
+    <?php while (have_posts()) : the_post(); ?>
 
-    <?php get_template_part('loop-templates/content', 'blank'); ?>
+      <?php get_template_part('loop-templates/content', 'blank'); ?>
 
-<?php endwhile; // end of the loop. ?>
-<?php wp_footer();?>
-</body>
+    <?php endwhile; // end of the loop. ?>
+    <?php wp_footer();?>
+  </body>
 </html>
diff --git a/page-templates/empty.php b/page-templates/empty.php
index 2f70db7..4834180 100644
--- a/page-templates/empty.php
+++ b/page-templates/empty.php
@@ -7,12 +7,13 @@
  * @package understrap
  */
 
-get_header(); ?>
+ get_header();
+?>
 
-                <?php while ( have_posts() ) : the_post(); ?>
+<?php while ( have_posts() ) : the_post(); ?>
 
-                    <?php get_template_part( 'loop-templates/content', 'empty' ); ?>
+  <?php get_template_part( 'loop-templates/content', 'empty' ); ?>
 
-                <?php endwhile; // end of the loop. ?>
+<?php endwhile; // end of the loop. ?>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/page-templates/fullwidthpage.php b/page-templates/fullwidthpage.php
index aae9ba1..7535760 100644
--- a/page-templates/fullwidthpage.php
+++ b/page-templates/fullwidthpage.php
@@ -7,37 +7,38 @@
  * @package understrap
  */
 
-get_header(); ?>
+ get_header();
+?>
 
 <div class="wrapper" id="full-width-page-wrapper">
-    
-    <div  id="content" class="container">
-        
-	   <div id="primary" class="col-md-12 content-area">
 
-            <main id="main" class="site-main" role="main">
+  <div  id="content" class="container">
 
-                <?php while ( have_posts() ) : the_post(); ?>
+    <div id="primary" class="col-md-12 content-area">
 
-                    <?php get_template_part( 'loop-templates/content', 'page' ); ?>
+      <main id="main" class="site-main" role="main">
 
-                    <?php
-                        // If comments are open or we have at least one comment, load up the comment template
-                        if ( comments_open() || get_comments_number() ) :
+        <?php while ( have_posts() ) : the_post(); ?>
 
-                            comments_template();
-                        
-                        endif;
-                    ?>
+          <?php get_template_part( 'loop-templates/content', 'page' ); ?>
 
-                <?php endwhile; // end of the loop. ?>
+          <?php
+            // If comments are open or we have at least one comment, load up the comment template
+            if ( comments_open() || get_comments_number() ) :
+
+              comments_template();
+
+            endif;
+          ?>
+
+        <?php endwhile; // end of the loop. ?>
+
+      </main><!-- #main -->
+
+    </div><!-- #primary -->
+
+  </div><!-- Container end -->
 
-            </main><!-- #main -->
-           
-	    </div><!-- #primary -->
-        
-    </div><!-- Container end -->
-    
 </div><!-- Wrapper end -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/page-templates/vertical-one-page.php b/page-templates/vertical-one-page.php
index affe81d..36ede50 100755
--- a/page-templates/vertical-one-page.php
+++ b/page-templates/vertical-one-page.php
@@ -7,46 +7,46 @@
  * @package understrap
  */
 
-get_header(); ?>
+ get_header();
+?>
 
 <?php
 /*
  * Exclude the posts page from being shown in this layout.
  * Order pages by their order number.
  */
-$exclude = get_option( 'page_for_posts' );
-$args    = array(
-	'post_type'    => 'page',
-	'post__not_in' => array( $exclude ),
-	'orderby'      => 'menu_order',
-	'order'        => 'ASC'
-);
-
-$qry = new WP_Query( $args );
+ $exclude = get_option( 'page_for_posts' );
+ $args    = array(
+  'post_type'    => 'page',
+  'post__not_in' => array( $exclude ),
+  'orderby'      => 'menu_order',
+  'order'        => 'ASC'
+ );
 
+ $qry = new WP_Query( $args );
 ?>
 
 <div class="wrapper" id="full-width-page-wrapper">
 
-	<div id="content" class="container">
+  <div id="content" class="container">
 
-		<div id="primary" class="col-md-12 content-area">
+    <div id="primary" class="col-md-12 content-area">
 
-			<main id="main" class="site-main" role="main">
+      <main id="main" class="site-main" role="main">
 
-				<?php if ( have_posts() ): while ( $qry->have_posts() ): $qry->the_post() ?>
-					<div class="page">
-						<?php get_template_part( 'loop-templates/content', 'verticalpage' ); ?>
-					</div>
+        <?php if ( have_posts() ): while ( $qry->have_posts() ): $qry->the_post() ?>
+          <div class="page">
+            <?php get_template_part( 'loop-templates/content', 'verticalpage' ); ?>
+          </div>
 
-					<?php wp_reset_postdata(); //reset custom query?>
-				<?php endwhile; endif; ?>
+          <?php wp_reset_postdata(); //reset custom query?>
+        <?php endwhile; endif; ?>
 
-			</main><!-- #main -->
+      </main><!-- #main -->
 
-		</div><!-- #primary -->
+    </div><!-- #primary -->
 
-	</div><!-- Container end -->
+  </div><!-- Container end -->
 
 </div><!-- Wrapper end -->
 
diff --git a/page.php b/page.php
index 86045db..481e85b 100644
--- a/page.php
+++ b/page.php
@@ -10,41 +10,42 @@
  * @package understrap
  */
 
-get_header(); ?>
+ get_header();
+?>
 
 <div class="wrapper" id="page-wrapper">
-    
-    <div  id="content" class="container">
 
-        <div class="row">
-        
-    	   <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
-           
-                 <main id="main" class="site-main" role="main">
+  <div  id="content" class="container">
 
-                    <?php while ( have_posts() ) : the_post(); ?>
+    <div class="row">
 
-                        <?php get_template_part( 'loop-templates/content', 'page' ); ?>
+      <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
 
-                        <?php
-                            // If comments are open or we have at least one comment, load up the comment template
-                            if ( comments_open() || get_comments_number() ) :
-                                comments_template();
-                            endif;
-                        ?>
+        <main id="main" class="site-main" role="main">
 
-                    <?php endwhile; // end of the loop. ?>
+          <?php while ( have_posts() ) : the_post(); ?>
 
-                </main><!-- #main -->
-               
-    	    </div><!-- #primary -->
-            
-            <?php get_sidebar(); ?>
+            <?php get_template_part( 'loop-templates/content', 'page' ); ?>
+
+            <?php
+              // If comments are open or we have at least one comment, load up the comment template
+              if ( comments_open() || get_comments_number() ) :
+                  comments_template();
+              endif;
+            ?>
+
+          <?php endwhile; // end of the loop. ?>
+
+        </main><!-- #main -->
+
+      </div><!-- #primary -->
+
+      <?php get_sidebar(); ?>
+
+    </div><!-- .row -->
+
+  </div><!-- Container end -->
 
-        </div><!-- .row -->
-        
-    </div><!-- Container end -->
-    
 </div><!-- Wrapper end -->
 
 <?php get_footer(); ?>
diff --git a/search.php b/search.php
index 268b6f3..3e49474 100644
--- a/search.php
+++ b/search.php
@@ -5,57 +5,58 @@
  * @package understrap
  */
 
-get_header(); ?>
+ get_header();
+?>
 <div class="wrapper search-wrapper">
-    
-    <div class="container">
 
-        <div class="row">
-        
-            <section id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
-                
-                <main id="main" class="site-main" role="main">
+  <div class="container">
 
-                <?php if ( have_posts() ) : ?>
+    <div class="row">
 
-                    <header class="page-header">
+      <section id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
 
-                        <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'understrap' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
-                        
-                    </header><!-- .page-header -->
+        <main id="main" class="site-main" role="main">
 
-                    <?php /* Start the Loop */ ?>
-                    <?php while ( have_posts() ) : the_post(); ?>
+          <?php if ( have_posts() ) : ?>
 
-                        <?php
-                        /**
-                         * Run the loop for the search to output the results.
-                         * If you want to overload this in a child theme then include a file
-                         * called content-search.php and that will be used instead.
-                         */
-                        get_template_part( 'loop-templates/content', 'search' );
-                        ?>
+            <header class="page-header">
 
-                    <?php endwhile; ?>
+              <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'understrap' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
 
-                    <?php the_posts_navigation(); ?>
+            </header><!-- .page-header -->
 
-                <?php else : ?>
+            <?php /* Start the Loop */ ?>
+            <?php while ( have_posts() ) : the_post(); ?>
 
-                    <?php get_template_part( 'loop-templates/content', 'none' ); ?>
+              <?php
+                /**
+                 * Run the loop for the search to output the results.
+                 * If you want to overload this in a child theme then include a file
+                 * called content-search.php and that will be used instead.
+                 */
+                get_template_part( 'loop-templates/content', 'search' );
+              ?>
 
-                <?php endif; ?>
+            <?php endwhile; ?>
 
-                </main><!-- #main -->
-                
-            </section><!-- #primary -->
+            <?php the_posts_navigation(); ?>
 
-            <?php get_sidebar(); ?>
+          <?php else : ?>
+
+            <?php get_template_part( 'loop-templates/content', 'none' ); ?>
+
+          <?php endif; ?>
+
+        </main><!-- #main -->
+
+      </section><!-- #primary -->
+
+      <?php get_sidebar(); ?>
+
+    </div><!-- .row -->
+
+  </div><!-- Container end -->
 
-        </div><!-- .row -->
-    
-    </div><!-- Container end -->
-    
 </div><!-- Wrapper end -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/searchform.php b/searchform.php
index dba8180..84e7db2 100644
--- a/searchform.php
+++ b/searchform.php
@@ -5,12 +5,13 @@
  * @package understrap
  */
 ?>
-	<form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>" role="search">
-		<label for="s" class="assistive-text"><?php _e( 'Search', 'understrap' ); ?></label>
-		<div class="input-group">
-			<input type="text" class="field form-control" name="s" id="s" placeholder="<?php esc_attr_e( 'Search &hellip;', 'understrap' ); ?>" />
-			<span class="input-group-btn">
-				<input type="submit" class="submit btn btn-primary" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'understrap' ); ?>" />
-			</span>
-		</div>
-	</form>
+
+<form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>" role="search">
+  <label for="s" class="assistive-text"><?php _e( 'Search', 'understrap' ); ?></label>
+  <div class="input-group">
+    <input type="text" class="field form-control" name="s" id="s" placeholder="<?php esc_attr_e( 'Search &hellip;', 'understrap' ); ?>" />
+    <span class="input-group-btn">
+      <input type="submit" class="submit btn btn-primary" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'understrap' ); ?>" />
+    </span>
+  </div>
+</form>
diff --git a/sidebar-footerfull.php b/sidebar-footerfull.php
index acfbff7..144140f 100644
--- a/sidebar-footerfull.php
+++ b/sidebar-footerfull.php
@@ -1,11 +1,11 @@
 <?php if ( is_active_sidebar( 'footerfull' ) ): ?>
 
-    <!-- ******************* The Hero Widget Area ******************* -->
+  <!-- ******************* The Hero Widget Area ******************* -->
 
-    <div class="wrapper" id="wrapper-footer-full">
+  <div class="wrapper" id="wrapper-footer-full">
 
-		<?php dynamic_sidebar( 'footerfull' ); ?>
+    <?php dynamic_sidebar( 'footerfull' ); ?>
 
-    </div><!-- #wrapper-footer-full -->
+  </div><!-- #wrapper-footer-full -->
 
 <?php endif; ?>
diff --git a/sidebar-hero.php b/sidebar-hero.php
index d9559e8..fc83046 100644
--- a/sidebar-hero.php
+++ b/sidebar-hero.php
@@ -1,15 +1,15 @@
 <?php if ( is_active_sidebar( 'hero' ) ): ?>
 
-    <!-- ******************* The Hero Widget Area ******************* -->
+  <!-- ******************* The Hero Widget Area ******************* -->
 
-    <div class="wrapper" id="wrapper-hero">
+  <div class="wrapper" id="wrapper-hero">
 
-        <div class="owl-carousel">
+    <div class="owl-carousel">
 
-            <?php dynamic_sidebar( 'hero' ); ?>
+      <?php dynamic_sidebar( 'hero' ); ?>
 
-        </div><!-- .owl-carousel -->
+    </div><!-- .owl-carousel -->
 
-    </div><!-- #wrapper-hero -->
+  </div><!-- #wrapper-hero -->
 
 <?php endif; ?>
diff --git a/sidebar-statichero.php b/sidebar-statichero.php
index 466305e..a07df9c 100644
--- a/sidebar-statichero.php
+++ b/sidebar-statichero.php
@@ -1,11 +1,11 @@
 <?php if ( is_active_sidebar( 'statichero' ) ): ?>
 
-    <!-- ******************* The Hero Widget Area ******************* -->
-    
-    <div class="wrapper" id="wrapper-static-hero">
+  <!-- ******************* The Hero Widget Area ******************* -->
 
-        <?php dynamic_sidebar( 'statichero' ); ?>
+  <div class="wrapper" id="wrapper-static-hero">
 
-    </div><!-- #wrapper-static-hero -->
+    <?php dynamic_sidebar( 'statichero' ); ?>
+
+  </div><!-- #wrapper-static-hero -->
 
 <?php endif; ?>
diff --git a/sidebar.php b/sidebar.php
index 0648f4e..b0c23a7 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -6,12 +6,12 @@
  */
 
 if ( ! is_active_sidebar( 'sidebar-1' ) ) {
-	return;
+  return;
 }
 ?>
 
 <div id="secondary" class="col-md-4 widget-area" role="complementary">
 
-	<?php dynamic_sidebar( 'sidebar-1' ); ?>
-	
+  <?php dynamic_sidebar( 'sidebar-1' ); ?>
+
 </div><!-- #secondary -->
diff --git a/single.php b/single.php
index d552f77..7241fef 100644
--- a/single.php
+++ b/single.php
@@ -5,42 +5,43 @@
  * @package understrap
  */
 
-get_header(); ?>
+ get_header();
+?>
 <div class="wrapper" id="single-wrapper">
-    
-    <div  id="content" class="container">
 
-        <div class="row">
-        
-            <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
-                
-                <main id="main" class="site-main" role="main">
+  <div  id="content" class="container">
 
-                    <?php while ( have_posts() ) : the_post(); ?>
+    <div class="row">
 
-                        <?php get_template_part( 'loop-templates/content', 'single' ); ?>
+      <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
 
-                        <?php the_post_navigation(); ?>
+        <main id="main" class="site-main" role="main">
 
-                        <?php
-                        // If comments are open or we have at least one comment, load up the comment template
-                        if ( comments_open() || get_comments_number() ) :
-                            comments_template();
-                        endif;
-                        ?>
-                        
-                    <?php endwhile; // end of the loop. ?>
+          <?php while ( have_posts() ) : the_post(); ?>
 
-                </main><!-- #main -->
-                
-            </div><!-- #primary -->
-        
-        <?php get_sidebar(); ?>
+            <?php get_template_part( 'loop-templates/content', 'single' ); ?>
+
+            <?php the_post_navigation(); ?>
+
+            <?php
+              // If comments are open or we have at least one comment, load up the comment template
+              if ( comments_open() || get_comments_number() ) :
+                  comments_template();
+              endif;
+            ?>
+
+          <?php endwhile; // end of the loop. ?>
+
+        </main><!-- #main -->
+
+      </div><!-- #primary -->
+
+      <?php get_sidebar(); ?>
+
+    </div><!-- .row -->
+
+  </div><!-- Container end -->
 
-        </div><!-- .row -->
-        
-    </div><!-- Container end -->
-    
 </div><!-- Wrapper end -->
 
 <?php get_footer(); ?>
diff --git a/woocommerce.php b/woocommerce.php
index 90b9134..92689a5 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -10,40 +10,41 @@
  * @package understrap
  */
 
-get_header(); ?>
+ get_header();
+?>
 
 <div class="wrapper" id="woocommerce-wrapper">
-    
-    <div class="container">
-        
-	   <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
-	   
-            <main id="main" class="site-main" role="main">
 
-                <!-- The WooCommerce loop -->
+  <div class="container">
 
-                    <?php
-                        if (is_singular('product')) {
+    <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
 
-                            woocommerce_content();
+      <main id="main" class="site-main" role="main">
 
-                        } else {
+        <!-- The WooCommerce loop -->
 
-                            //For ANY product archive.
-                            //Product taxonomy, product search or /shop landing page etc.
-                            woocommerce_get_template('archive-product.php');
-                            
-                        }
-                    ?>
+        <?php
+          if (is_singular('product')) {
+
+            woocommerce_content();
+
+          } else {
+
+            //For ANY product archive.
+            //Product taxonomy, product search or /shop landing page etc.
+            woocommerce_get_template('archive-product.php');
+
+          }
+        ?>
+
+      </main><!-- #main -->
+
+    </div><!-- #primary -->
+
+    <?php get_sidebar(); ?>
+
+  </div><!-- Container end -->
 
-            </main><!-- #main -->
-           
-	    </div><!-- #primary -->
-        
-        <?php get_sidebar(); ?>
-        
-    </div><!-- Container end -->
-    
 </div><!-- Wrapper end -->
 
 <?php get_footer(); ?>