diff --git a/.jshintrc b/.jshintrc
index 75230df..3955e12 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -22,6 +22,7 @@
     "Vimeo" : false,
     "shapelyWelcomeScreenObject" : false,
     "console": false,
-    "shapelyWelcomeScreenCustomizerObject" : false
+    "shapelyWelcomeScreenCustomizerObject" : false,
+    "ShapelyBuilder" : false
   }
 }
diff --git a/archive-jetpack-portfolio.php b/archive-jetpack-portfolio.php
index b331ff7..c5f6072 100644
--- a/archive-jetpack-portfolio.php
+++ b/archive-jetpack-portfolio.php
@@ -1,7 +1,7 @@
 <?php
 get_header();
 
-$layout = get_theme_mod( 'projects_layout_view', 'mansonry' );
+$layout       = get_theme_mod( 'projects_layout_view', 'mansonry' );
 $layout_class = shapely_get_layout_class();
 
 $item_classes = 'post-snippet col-md-3 col-sm-6 project';
@@ -9,12 +9,10 @@
 	$item_classes .= ' masonry-item';
 }
 
+if ( 'sidebar-left' == $layout_class ) :
+	get_sidebar();
+endif;
 ?>
-	<?php
-	if ( 'sidebar-left' == $layout_class ) :
-		get_sidebar();
-	endif;
-	?>
 	<div id="primary" class="content-area col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
 		<main id="main" class="site-main" role="main">
 
@@ -29,7 +27,7 @@
 					</div>
 				</div>
 			<?php endif ?>
-			
+
 			<div class="<?php echo 'mansonry' == $layout ? 'masonry masonryFlyIn' : ''; ?>">
 				<?php
 				/* Start the Loop */
@@ -41,35 +39,35 @@
 					$project_types = wp_get_post_terms( $post->ID, 'jetpack-portfolio-type', $projects_args );
 
 					$thumbnail_url = get_the_post_thumbnail_url( get_the_ID(), 'full' );
-					$item_style = '';
+					$item_style    = '';
 					if ( 'mansonry' != $layout ) {
 						$item_style = 'background-image: url(' . $thumbnail_url . ')';
 					}
-				?>
+					?>
 
 					<article id="post-<?php the_ID(); ?>" <?php post_class( $item_classes ); ?>>
-						<div class="image-tile inner-title hover-reveal text-center"  style="<?php echo $item_style; ?>">
-																										<?php
-																										if ( has_post_thumbnail() ) {
-																										?>
-																											<a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
-								<?php
-								if ( 'mansonry' == $layout ) {
-									the_post_thumbnail( 'medium' );
-								}
+						<div class="image-tile inner-title hover-reveal text-center" style="<?php echo $item_style; ?>">
+							<?php
+							if ( has_post_thumbnail() ) {
 								?>
-								<div class="title">
-								<?php
-								the_title( '<h5 class="mb0">', '</h5>' );
-								if ( ! empty( $project_types ) ) {
-									echo '<span>' . implode( ' / ', $project_types ) . '</span>';
-								}
-								?>
-								</div>
+								<a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
+									<?php
+									if ( 'mansonry' == $layout ) {
+										the_post_thumbnail( 'medium' );
+									}
+									?>
+									<div class="title">
+										<?php
+										the_title( '<h5 class="mb0">', '</h5>' );
+										if ( ! empty( $project_types ) ) {
+											echo '<span>' . implode( ' / ', $project_types ) . '</span>';
+										}
+										?>
+									</div>
 								</a>
 								<?php
-																										}
-						?>
+							}
+							?>
 						</div>
 					</article><!-- #post-## -->
 					<?php
@@ -87,10 +85,9 @@
 
 		</main><!-- #main -->
 	</div><!-- #primary -->
-	<?php
-	if ( 'sidebar-right' == $layout_class ) :
-		get_sidebar();
-	endif;
-	?>
 <?php
+if ( 'sidebar-right' == $layout_class ) :
+	get_sidebar();
+endif;
+
 get_footer();
diff --git a/assets/js/customizer-builder.js b/assets/js/customizer-builder.js
new file mode 100644
index 0000000..3838894
--- /dev/null
+++ b/assets/js/customizer-builder.js
@@ -0,0 +1,36 @@
+(function( $ ) {// jscs:ignore validateLineBreaks
+
+  'use strict';
+
+  var api = wp.customize;
+
+  api.bind( 'ready', function() {
+    var currentURL = api.settings.url.preview,
+        urlBase,
+        urlParts,
+        pageSidebarID,
+        pageSidebarSection;
+    if ( currentURL !== ShapelyBuilder.siteURL ) {
+      urlParts = currentURL.split( '/' );
+      urlParts.pop();
+      urlBase = urlParts[ urlParts.length - 1 ];
+      if ( undefined !== ShapelyBuilder.pages[ urlBase ] ) {
+        pageSidebarID = 'sidebar-widgets-shapely-' + urlBase;
+        /*
+         * Defer focus until:
+         * 1. The section exist.
+         * 2. The instance is embedded in the document (and so is focusable).
+         * 3. The preview has finished loading so that the active states have been set.
+         */
+        pageSidebarSection = api.section( pageSidebarID, function( instance ) {
+          instance.deferred.embedded.done( function() {
+            api.previewer.deferred.active.done( function() {
+              instance.focus();
+            } );
+          } );
+        } );
+      }
+    }
+  } );
+
+})( jQuery );
diff --git a/assets/js/customizer-preview.js b/assets/js/customizer-preview.js
index f34faa5..0f14e10 100644
--- a/assets/js/customizer-preview.js
+++ b/assets/js/customizer-preview.js
@@ -1,34 +1,34 @@
 (function( $ ) {// jscs:ignore validateLineBreaks
 
-	if ( 'undefined' !== typeof( wp ) ) {
-		if ( 'undefined' !== typeof( wp.customize ) ) {
-			wp.customize.bind( 'preview-ready', function() {
-				wp.customize.preview.bind( 'update-inline-css', function( object ) {
-					var data = {
-						'action': object.action,
-						'args': object.data,
-						'id': object.id
-					};
+  if ( 'undefined' !== typeof( wp ) ) {
+    if ( 'undefined' !== typeof( wp.customize ) ) {
+      wp.customize.bind( 'preview-ready', function() {
+        wp.customize.preview.bind( 'update-inline-css', function( object ) {
+          var data = {
+            'action': object.action,
+            'args': object.data,
+            'id': object.id
+          };
 
-					jQuery.ajax({
-						dataType: 'json',
-						type: 'POST',
-						url: WPUrls.ajaxurl,
-						data: data,
-						complete: function( json ) {
-							var sufix = object.action + object.id;
-							var style = $( '#shapely-style-' + sufix );
+          jQuery.ajax( {
+            dataType: 'json',
+            type: 'POST',
+            url: WPUrls.ajaxurl,
+            data: data,
+            complete: function( json ) {
+              var sufix = object.action + object.id;
+              var style = $( '#shapely-style-' + sufix );
 
-							if ( ! style.length ) {
-								style = $( 'head' ).append( '<style type="text/css" id="shapely-style-' + sufix + '" />' ).find( '#shapely-style-' + sufix );
-							}
+              if ( ! style.length ) {
+                style = $( 'head' ).append( '<style type="text/css" id="shapely-style-' + sufix + '" />' ).find( '#shapely-style-' + sufix );
+              }
 
-							style.html( json.responseText );
-						}
-					});
-				});
-			});
-		}
-	}
+              style.html( json.responseText );
+            }
+          } );
+        } );
+      } );
+    }
+  }
 
 })( jQuery );
diff --git a/assets/js/customizer.js b/assets/js/customizer.js
index b92c866..2c87b44 100644
--- a/assets/js/customizer.js
+++ b/assets/js/customizer.js
@@ -93,9 +93,10 @@
 
         control.setting( {} );
         control.setting( values );
-
+        control.hasLogo = true;
         control.toggle( true );
       } else {
+        control.hasLogo = false;
         control.toggle( false );
       }
     },
diff --git a/assets/js/shapely-scripts.js b/assets/js/shapely-scripts.js
index 380e054..93d0602 100644
--- a/assets/js/shapely-scripts.js
+++ b/assets/js/shapely-scripts.js
@@ -6,6 +6,10 @@
 
     //"use strict";
 
+    jQuery( 'body' ).imagesLoaded( function() {
+      jQuery( window ).trigger( 'resize' ).trigger( 'scroll' );
+    } );
+
     jQuery( '.shapely-dropdown' ).click( function( evt ) {
       evt.preventDefault();
       jQuery( this ).parent().find( '> ul' ).toggleClass( 'active' );
@@ -25,6 +29,15 @@
       element = $( '#site-navigation #menu a[href=' + window.location.hash + ']' );
       if ( element ) {
         scrollToID = '#' + element.data( 'scroll' );
+
+        if ( jQuery( scrollToID ).length < 1 ) {
+          scrollToID = window.location.hash;
+        }
+
+        if ( jQuery( scrollToID ).length < 1 ) {
+          return;
+        }
+
         $( 'html,body' ).animate( {
           scrollTop: $( scrollToID ).offset().top
         }, 2000 );
@@ -37,6 +50,15 @@
 
     $( '#site-navigation #menu a[href^=#]:not([href=#])' ).click( function( evt ) {
       var scrollToID = '#' + $( this ).data( 'scroll' );
+
+      if ( jQuery( scrollToID ).length < 1 ) {
+        scrollToID = $( this ).attr( 'href' );
+      }
+
+      if ( jQuery( scrollToID ).length < 1 ) {
+        return;
+      }
+
       evt.preventDefault();
       $( 'html,body' ).animate( {
         scrollTop: $( scrollToID ).offset().top
diff --git a/functions.php b/functions.php
index 87d80d3..386674f 100644
--- a/functions.php
+++ b/functions.php
@@ -32,9 +32,9 @@ function shapely_setup() {
 		 */
 		add_theme_support(
 			'custom-logo', array(
-				'height'     => 55,
-				'width'      => 135,
-				'flex-width' => true,
+				'height'      => 55,
+				'width'       => 135,
+				'flex-width'  => true,
 				'flex-height' => true,
 			)
 		);
@@ -119,7 +119,7 @@ function shapely_setup() {
 			global $shapely_required_actions, $shapely_recommended_plugins;
 
 			$shapely_recommended_plugins = array(
-				'contact-form-7' => array(
+				'contact-form-7'         => array(
 					'recommended' => false,
 				),
 				'fancybox-for-wordpress' => array(
@@ -181,7 +181,7 @@ function shapely_setup() {
 		}// End if().
 
 		// Enable Shortcodes in widgets
-		add_filter( 'widget_text','do_shortcode' );
+		add_filter( 'widget_text', 'do_shortcode' );
 
 	}
 endif;
@@ -333,6 +333,7 @@ function shapely_scripts() {
 $args = array(
 	'controls' => array( 'slider', 'toggle' ), // array of controls to load
 	'sections' => array( 'recommended-actions', 'pro' ), // array of sections to load
+	'backup'   => false,
 );
 
 new Epsilon_Framework( $args );
@@ -377,3 +378,8 @@ function shapely_scripts() {
  */
 require get_template_directory() . '/inc/admin/welcome-screen/class-shapely-notify-system.php';
 
+/**
+ * Load the shapely page builder class
+ */
+require get_template_directory() . '/inc/class-shapely-builder.php';
+Shapely_Builder::get_instance();
diff --git a/header.php b/header.php
index 8963e00..af0edb1 100644
--- a/header.php
+++ b/header.php
@@ -59,12 +59,11 @@
 		</div>
 	</header><!-- #masthead -->
 	<div id="content" class="main-container">
-		<?php if ( ! is_page_template( 'page-templates/template-home.php' ) && ! is_404() ) : ?>
+		<?php if ( ! is_page_template( 'page-templates/template-home.php' ) && ! is_404() && ! is_page_template( 'page-templates/template-widget.php' ) ) : ?>
 			<div class="header-callout">
 				<?php shapely_top_callout(); ?>
 			</div>
 		<?php endif; ?>
 
 		<section class="content-area <?php echo ( get_theme_mod( 'top_callout', true ) ) ? '' : ' pt0 '; ?>">
-			<div id="main" class="<?php echo ( ! is_page_template( 'page-templates/template-home.php' ) ) ? 'container' : ''; ?>"
-				 role="main">
+			<div id="main" class="<?php echo ( ! is_page_template( 'page-templates/template-home.php' ) && ! is_page_template( 'page-templates/template-widget.php' ) ) ? 'container' : ''; ?>" role="main">
diff --git a/inc/admin/welcome-screen/class-shapely-welcome.php b/inc/admin/welcome-screen/class-shapely-welcome.php
index 4c6f05d..ac95567 100644
--- a/inc/admin/welcome-screen/class-shapely-welcome.php
+++ b/inc/admin/welcome-screen/class-shapely-welcome.php
@@ -32,7 +32,7 @@ public function __construct() {
 			)
 		);
 
-		$theme = wp_get_theme();
+		$theme            = wp_get_theme();
 		$this->theme_name = $theme->get( 'Name' );
 		$this->theme_slug = $theme->get( 'TextDomain' );
 
@@ -109,8 +109,7 @@ public function shapely_welcome_admin_notice() {
 		?>
 		<div class="updated notice is-dismissible">
 			<p><?php echo sprintf( esc_html__( 'Welcome! Thank you for choosing Shapely! To fully take advantage of the best our theme can offer please make sure you visit our %1$swelcome page%2$s.', 'shapely' ), '<a href="' . esc_url( admin_url( 'themes.php?page=shapely-welcome' ) ) . '">', '</a>' ); ?></p>
-			<p><a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome' ) ); ?>" class="button"
-				  style="text-decoration: none;"><?php echo esc_html__( 'Get started with Shapely', 'shapely' ); ?></a>
+			<p><a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome' ) ); ?>" class="button" style="text-decoration: none;"><?php echo esc_html__( 'Get started with Shapely', 'shapely' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -289,13 +288,13 @@ public function check_active( $slug ) {
 
 			return array(
 				'status' => is_plugin_active( $slug2 ),
-				'needs' => $needs,
+				'needs'  => $needs,
 			);
 		}
 
 		return array(
 			'status' => false,
-			'needs' => 'install',
+			'needs'  => 'install',
 		);
 	}
 
@@ -337,7 +336,7 @@ public function create_action_link( $state, $slug ) {
 						'plugin_status' => 'all',
 						'paged'         => '1',
 						'_wpnonce'      => wp_create_nonce( 'deactivate-plugin_' . $slug2 ),
-					), network_admin_url( 'plugins.php' )
+					), admin_url( 'plugins.php' )
 				);
 				break;
 			case 'activate':
@@ -348,7 +347,7 @@ public function create_action_link( $state, $slug ) {
 						'plugin_status' => 'all',
 						'paged'         => '1',
 						'_wpnonce'      => wp_create_nonce( 'activate-plugin_' . $slug2 ),
-					), network_admin_url( 'plugins.php' )
+					), admin_url( 'plugins.php' )
 				);
 				break;
 		}
@@ -381,15 +380,11 @@ class="about-text"><?php echo esc_html__( 'Shapely is now installed and ready to
 
 
 			<h2 class="nav-tab-wrapper wp-clearfix">
-				<a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=getting_started' ) ); ?>"
-				   class="nav-tab <?php echo 'getting_started' == $active_tab ? 'nav-tab-active' : ''; ?>"><?php echo esc_html__( 'Getting Started', 'shapely' ); ?></a>
-				<a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=recommended_actions' ) ); ?>"
-				   class="nav-tab <?php echo 'recommended_actions' == $active_tab ? 'nav-tab-active' : ''; ?> "><?php echo esc_html__( 'Recommended Actions', 'shapely' ); ?>
+				<a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=getting_started' ) ); ?>" class="nav-tab <?php echo 'getting_started' == $active_tab ? 'nav-tab-active' : ''; ?>"><?php echo esc_html__( 'Getting Started', 'shapely' ); ?></a>
+				<a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=recommended_actions' ) ); ?>" class="nav-tab <?php echo 'recommended_actions' == $active_tab ? 'nav-tab-active' : ''; ?> "><?php echo esc_html__( 'Recommended Actions', 'shapely' ); ?>
 					<?php echo $action_count > 0 ? '<span class="badge-action-count">' . esc_html( $action_count ) . '</span>' : ''; ?></a>
-				<a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=recommended_plugins' ) ); ?>"
-				   class="nav-tab <?php echo 'recommended_plugins' == $active_tab ? 'nav-tab-active' : ''; ?> "><?php echo esc_html__( 'Recommended Plugins', 'shapely' ); ?></a>
-				<a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=support' ) ); ?>"
-				   class="nav-tab <?php echo 'support' == $active_tab ? 'nav-tab-active' : ''; ?> "><?php echo esc_html__( 'Support', 'shapely' ); ?></a>
+				<a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=recommended_plugins' ) ); ?>" class="nav-tab <?php echo 'recommended_plugins' == $active_tab ? 'nav-tab-active' : ''; ?> "><?php echo esc_html__( 'Recommended Plugins', 'shapely' ); ?></a>
+				<a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=support' ) ); ?>" class="nav-tab <?php echo 'support' == $active_tab ? 'nav-tab-active' : ''; ?> "><?php echo esc_html__( 'Support', 'shapely' ); ?></a>
 			</h2>
 
 			<?php
diff --git a/inc/admin/welcome-screen/sections/getting-started.php b/inc/admin/welcome-screen/sections/getting-started.php
index 5ce4167..e5e7863 100644
--- a/inc/admin/welcome-screen/sections/getting-started.php
+++ b/inc/admin/welcome-screen/sections/getting-started.php
@@ -34,8 +34,7 @@
 	<div class="col">
 		<h3><?php esc_html_e( 'Step 3 - Customize everything', 'shapely' ); ?></h3>
 		<p><?php esc_html_e( 'Using the WordPress Customizer you can easily customize every aspect of the theme.', 'shapely' ); ?></p>
-		<p><a target="_blank" href="<?php echo esc_url( $customizer_url ); ?>"
-			  class="button button-primary"><?php esc_html_e( 'Go to Customizer', 'shapely' ); ?></a>
+		<p><a target="_blank" href="<?php echo esc_url( $customizer_url ); ?>" class="button button-primary"><?php esc_html_e( 'Go to Customizer', 'shapely' ); ?></a>
 		</p>
 	</div><!--/.col-->
 </div><!--/.feature-section-->
diff --git a/inc/admin/welcome-screen/sections/support.php b/inc/admin/welcome-screen/sections/support.php
index 78f3585..0605613 100644
--- a/inc/admin/welcome-screen/sections/support.php
+++ b/inc/admin/welcome-screen/sections/support.php
@@ -4,8 +4,7 @@
 		<p>
 			<i><?php esc_html_e( 'We offer excellent support through our advanced ticketing system. Make sure to register your purchase before contacting support!', 'shapely' ); ?></i>
 		</p>
-		<p><a target="_blank"  class="button button-primary"
-			  href="<?php echo esc_url( 'https://colorlib.com/wp/forums/' ); ?>"><?php esc_html_e( 'Contact Support', 'shapely' ); ?></a>
+		<p><a target="_blank"  class="button button-primary" href="<?php echo esc_url( 'https://colorlib.com/wp/forums/' ); ?>"><?php esc_html_e( 'Contact Support', 'shapely' ); ?></a>
 		</p>
 	</div><!--/.col-->
 
diff --git a/inc/class-shapely-builder.php b/inc/class-shapely-builder.php
new file mode 100644
index 0000000..95dc6f5
--- /dev/null
+++ b/inc/class-shapely-builder.php
@@ -0,0 +1,107 @@
+<?php
+
+/**
+*
+*/
+class Shapely_Builder {
+
+	private static $instance = null;
+
+	private $pages    = array();
+	private $sidebars = array();
+
+	function __construct() {
+
+		$this->get_all_pages();
+
+		// Hooks
+		if ( ! empty( $this->pages ) ) {
+
+			add_action( 'widgets_init', array( $this, 'register_sidebars' ) );
+			add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_builder_js' ) );
+			add_filter( 'sidebars_widgets', array( $this, 'remove_specific_widget' ) );
+
+		}
+
+	}
+
+	public function get_all_pages() {
+
+		$args = array(
+			'post_type'      => 'page',
+			'posts_per_page' => -1,
+			'meta_query'     => array(
+				array(
+					'key'   => '_wp_page_template',
+					'value' => 'page-templates/template-widget.php',
+				),
+			),
+		);
+
+		$the_pages = new WP_Query( $args );
+
+		if ( $the_pages->have_posts() ) {
+			foreach ( $the_pages->posts as $post ) {
+				$this->pages[ $post->post_name ] = array(
+					'id'    => absint( $post->ID ),
+					'title' => esc_html( $post->post_title ),
+				);
+				$this->sidebars[]                = 'shapely-' . $post->post_name;
+			}
+		}
+
+	}
+
+	public static function get_instance() {
+		if ( is_null( self::$instance ) ) {
+			self::$instance = new self();
+		}
+		return self::$instance;
+	}
+
+	public function register_sidebars() {
+
+		foreach ( $this->pages as $slug => $page ) {
+			register_sidebar(
+				array(
+					'name'          => sprintf( esc_html__( 'Page: %s', 'shapely' ), $page['title'] ),
+					'id'            => 'shapely-' . $slug,
+					'description'   => sprintf( esc_html__( 'This widgets will appear in %s page', 'shapely' ), $page['title'] ),
+					'before_widget' => '<div id="%1$s" class="widget %2$s">',
+					'after_widget'  => '</div>',
+					'before_title'  => '<h2 class="widget-title">',
+					'after_title'   => '</h2>',
+				)
+			);
+		}
+
+	}
+
+	public function enqueue_builder_js() {
+		$builder_settings = array(
+			'siteURL' => esc_url( site_url() ),
+			'pages'   => $this->pages,
+		);
+		wp_enqueue_script( 'shapely_builder_customizer', get_template_directory_uri() . '/assets/js/customizer-builder.js', array(), '20140317', true );
+
+		wp_localize_script( 'shapely_builder_customizer', 'ShapelyBuilder', $builder_settings );
+	}
+
+	public function remove_specific_widget( $sidebars_widgets ) {
+
+		foreach ( $sidebars_widgets as $widget_area => $widget_list ) {
+			if ( ! in_array( $widget_area, $this->sidebars ) && 'sidebar-home' != $widget_area ) {
+				foreach ( $widget_list as $pos => $widget_id ) {
+					if ( strpos( $widget_id, 'shapely-page-content' ) !== false || strpos( $widget_id, 'shapely-page-title' ) !== false ) {
+						unset( $sidebars_widgets[ $widget_area ][ $pos ] );
+						;
+					}
+				}
+			}
+		}
+
+		return $sidebars_widgets;
+
+	}
+
+}
diff --git a/inc/class-shapely-related-posts.php b/inc/class-shapely-related-posts.php
index c1614cf..50cb4c9 100644
--- a/inc/class-shapely-related-posts.php
+++ b/inc/class-shapely-related-posts.php
@@ -123,8 +123,8 @@ public function get_related_posts( $post_id, $number_posts = - 1 ) {
 				$terms_args = array(
 					'fields' => 'ids',
 				);
-				$types = wp_get_object_terms( get_the_ID(), 'jetpack-portfolio-type', $terms_args );
-				$tags = wp_get_object_terms( get_the_ID(), 'jetpack-portfolio-tag', $terms_args );
+				$types      = wp_get_object_terms( get_the_ID(), 'jetpack-portfolio-type', $terms_args );
+				$tags       = wp_get_object_terms( get_the_ID(), 'jetpack-portfolio-tag', $terms_args );
 
 				$tax_query = array();
 
@@ -235,9 +235,7 @@ function output_related_posts() {
 					echo '<div class="shapely-related-post-title">';
 
 					# Post Title
-					echo '<a href="' . esc_url( get_the_permalink() ) . '">' . wp_trim_words( get_the_title(), 5 ) .
-						 '</a>';
-
+					echo '<a href="' . esc_url( get_the_permalink() ) . '">' . wp_trim_words( get_the_title(), 5 ) . '</a>';
 					echo '</div>';
 
 				}
diff --git a/inc/class-wp-bootstrap-navwalker.php b/inc/class-wp-bootstrap-navwalker.php
index 1afa3af..7b85177 100644
--- a/inc/class-wp-bootstrap-navwalker.php
+++ b/inc/class-wp-bootstrap-navwalker.php
@@ -10,7 +10,7 @@ class Wp_Bootstrap_Navwalker extends Walker_Nav_Menu {
 	 * @param int    $depth  Depth of page. Used for padding.
 	 */
 	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent = str_repeat( "\t", $depth );
+		$indent  = str_repeat( "\t", $depth );
 		$output .= "\n$indent<ul role=\"menu\" class=\" dropdown-menu\">\n";
 	}
 
@@ -26,7 +26,7 @@ public function start_lvl( &$output, $depth = 0, $args = array() ) {
 	 */
 	public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
 		$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
-		$extra = get_post_meta( $item->ID, '_menu_item_extra', true );
+		$extra  = get_post_meta( $item->ID, '_menu_item_extra', true );
 		$widget = get_post_meta( $item->ID, '_menu_item_widget', true );
 
 		/**
@@ -48,7 +48,7 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 		} else {
 
 			$class_names = '';
-			$value = '';
+			$value       = '';
 
 			$classes   = empty( $item->classes ) ? array() : (array) $item->classes;
 			$classes[] = 'menu-item-' . $item->ID;
@@ -99,7 +99,7 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 			$attributes = '';
 			foreach ( $atts as $attr => $value ) {
 				if ( ! empty( $value ) ) {
-					$value = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
+					$value       = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
 					$attributes .= ' ' . $attr . '="' . $value . '"';
 				}
 			}
diff --git a/inc/custom-controls/class-shapely-logo-dimensions.php b/inc/custom-controls/class-shapely-logo-dimensions.php
index 7a1fa1a..f45a55e 100644
--- a/inc/custom-controls/class-shapely-logo-dimensions.php
+++ b/inc/custom-controls/class-shapely-logo-dimensions.php
@@ -15,17 +15,17 @@ public function get_dimensions() {
 
 		if ( ! $current_value ) {
 			$current_value = array(
-				'width' => '',
+				'width'  => '',
 				'height' => '',
-				'ratio' => 1,
+				'ratio'  => 1,
 			);
 
 			$custom_logo = get_theme_mod( 'custom_logo' );
 			if ( $custom_logo ) {
-				$logo = wp_get_attachment_image_src( $custom_logo , 'full' );
+				$logo = wp_get_attachment_image_src( $custom_logo, 'full' );
 				if ( is_array( $logo ) ) {
 
-					$current_value['width'] = $logo[1];
+					$current_value['width']  = $logo[1];
 					$current_value['height'] = $logo[2];
 
 				}
@@ -37,12 +37,12 @@ public function get_dimensions() {
 	}
 
 	public function json() {
-		$json = parent::json();
-		$json['id']      = $this->id;
-		$json['link']    = $this->get_link();
-		$json['value']   = $this->get_dimensions();
-		$json['widthLabel'] = esc_attr__( 'Logo Width:', 'shapely' );
-		$json['heightLabel'] = esc_attr__( 'Logo Height:', 'shapely' );
+		$json                   = parent::json();
+		$json['id']             = $this->id;
+		$json['link']           = $this->get_link();
+		$json['value']          = $this->get_dimensions();
+		$json['widthLabel']     = esc_attr__( 'Logo Width:', 'shapely' );
+		$json['heightLabel']    = esc_attr__( 'Logo Height:', 'shapely' );
 		$json['checkboxtLabel'] = esc_attr__( 'Keep logo ratio.', 'shapely' );
 
 		return $json;
diff --git a/inc/customizer.php b/inc/customizer.php
index 2f4e4fa..d1e4ec0 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -140,7 +140,7 @@ function shapely_customizer( $wp_customize ) {
 			'theme_supports' => '',
 			'title'          => esc_html__( 'Theme Options', 'shapely' ),
 			'description'    => esc_html__( 'Panel to update shapely theme options', 'shapely' ), // Include html tags such as <p>.
-		'priority'       => 10, // Mixed with top-level-section hierarchy.
+			'priority'       => 10, // Mixed with top-level-section hierarchy.
 		)
 	);
 
@@ -150,7 +150,7 @@ function shapely_customizer( $wp_customize ) {
 			'theme_supports' => '',
 			'title'          => esc_html__( 'Blog Settings', 'shapely' ),
 			'description'    => esc_html__( 'Panel to update Blog related options', 'shapely' ), // Include html tags such as <p>.
-		'priority'       => 10, // Mixed with top-level-section hierarchy.
+			'priority'       => 10, // Mixed with top-level-section hierarchy.
 		)
 	);
 
@@ -163,30 +163,30 @@ function shapely_customizer( $wp_customize ) {
 	$wp_customize->add_control(
 		new Shapely_Logo_Dimensions(
 			$wp_customize, 'shapely_logo_dimension', array(
-				'section'     => 'title_tagline',
-				'priority'    => 9,
+				'section'  => 'title_tagline',
+				'priority' => 9,
 			)
 		)
 	);
 
 	$title_tagline = $wp_customize->get_section( 'title_tagline' );
 	if ( $title_tagline ) {
-		$title_tagline->panel = 'shapely_main_options';
+		$title_tagline->panel    = 'shapely_main_options';
 		$title_tagline->priority = 1;
 	}
 
 	// add "Sidebar" section
 	$color_section = $wp_customize->get_section( 'colors' );
 	if ( $color_section ) {
-		$color_section->panel = 'shapely_main_options';
+		$color_section->panel    = 'shapely_main_options';
 		$color_section->priority = 31;
 	}
 
 	$header_image = $wp_customize->get_control( 'header_image' );
 	if ( $header_image ) {
-		$header_image->section = 'shapely_blog_section';
+		$header_image->section     = 'shapely_blog_section';
 		$header_image->description = esc_html__( 'Blog Index Header Image', 'shapely' );
-		$header_image->priority = 31;
+		$header_image->priority    = 31;
 	}
 
 	$wp_customize->add_section(
@@ -301,21 +301,21 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'top_callout', array(
-					'label'    => esc_html__( 'Show Blog Title', 'shapely' ),
+					'label'       => esc_html__( 'Show Blog Title', 'shapely' ),
 					'description' => esc_html__( 'Show/hide the title from the Blog Page', 'shapely' ),
-					'section'  => 'shapely_blog_section',
-					'priority' => 20,
+					'section'     => 'shapely_blog_section',
+					'priority'    => 20,
 				)
 			)
 		);
 	} else {
 		$wp_customize->add_control(
 			'top_callout', array(
-				'label'    => esc_html__( 'Show Blog Title', 'shapely' ),
+				'label'       => esc_html__( 'Show Blog Title', 'shapely' ),
 				'description' => esc_html__( 'Show/hide the title from the Blog Page', 'shapely' ),
-				'section'  => 'shapely_blog_section',
-				'priority' => 20,
-				'type'     => 'checkbox',
+				'section'     => 'shapely_blog_section',
+				'priority'    => 20,
+				'type'        => 'checkbox',
 			)
 		);
 	}
@@ -371,19 +371,19 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'mobile_menu_on_desktop', array(
-					'label'   => esc_html__( 'Mobile Menu on Desktop', 'shapely' ),
+					'label'       => esc_html__( 'Mobile Menu on Desktop', 'shapely' ),
 					'description' => esc_html__( 'Always the menu will be like the mobile menu', 'shapely' ),
-					'section' => 'shapely_main_section',
+					'section'     => 'shapely_main_section',
 				)
 			)
 		);
 	} else {
 		$wp_customize->add_control(
 			'mobile_menu_on_desktop', array(
-				'label'   => esc_html__( 'Mobile Menu on Desktop', 'shapely' ),
+				'label'       => esc_html__( 'Mobile Menu on Desktop', 'shapely' ),
 				'description' => esc_html__( 'Always the menu will be like the mobile menu', 'shapely' ),
-				'section' => 'shapely_main_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_main_section',
+				'type'        => 'checkbox',
 			)
 		);
 	}
@@ -411,9 +411,9 @@ function shapely_customizer( $wp_customize ) {
 	);
 	$wp_customize->add_control(
 		'footer_callout_btntext', array(
-			'label'   => esc_html__( 'Text for Footer Callout Button', 'shapely' ),
+			'label'       => esc_html__( 'Text for Footer Callout Button', 'shapely' ),
 			'description' => esc_html__( 'The label of the call to action section\'s button from the footer', 'shapely' ),
-			'section' => 'shapely_main_section',
+			'section'     => 'shapely_main_section',
 		)
 	);
 	$wp_customize->add_setting(
@@ -530,9 +530,9 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'title_in_header', array(
-					'label'   => esc_html__( 'Show title in header', 'shapely' ),
+					'label'       => esc_html__( 'Show title in header', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the post title from callout', 'shapely' ),
-					'section' => 'shapely_single_post_section',
+					'section'     => 'shapely_single_post_section',
 				)
 			)
 		);
@@ -540,9 +540,9 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'title_above_post', array(
-					'label'   => esc_html__( 'Show title above post', 'shapely' ),
+					'label'       => esc_html__( 'Show title above post', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the post title above post content', 'shapely' ),
-					'section' => 'shapely_single_post_section',
+					'section'     => 'shapely_single_post_section',
 				)
 			)
 		);
@@ -550,9 +550,9 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'post_date', array(
-					'label'   => esc_html__( 'Show the date', 'shapely' ),
+					'label'       => esc_html__( 'Show the date', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the date when post was published', 'shapely' ),
-					'section' => 'shapely_single_post_section',
+					'section'     => 'shapely_single_post_section',
 				)
 			)
 		);
@@ -560,9 +560,9 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'post_author', array(
-					'label'   => esc_html__( 'Show the author', 'shapely' ),
+					'label'       => esc_html__( 'Show the author', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the author who written the post under the post title', 'shapely' ),
-					'section' => 'shapely_single_post_section',
+					'section'     => 'shapely_single_post_section',
 				)
 			)
 		);
@@ -570,9 +570,9 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'post_category', array(
-					'label'   => esc_html__( 'Show the category', 'shapely' ),
+					'label'       => esc_html__( 'Show the category', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the categories of post', 'shapely' ),
-					'section' => 'shapely_single_post_section',
+					'section'     => 'shapely_single_post_section',
 				)
 			)
 		);
@@ -580,104 +580,104 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'first_letter_caps', array(
-					'label'   => esc_html__( 'First Letter Caps', 'shapely' ),
+					'label'       => esc_html__( 'First Letter Caps', 'shapely' ),
 					'description' => esc_html__( 'This will transform your first letter from a post into uppercase', 'shapely' ),
-					'section' => 'shapely_single_post_section',
+					'section'     => 'shapely_single_post_section',
 				)
 			)
 		);
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'tags_post_meta', array(
-					'label'   => esc_html__( 'Tags Post Meta', 'shapely' ),
+					'label'       => esc_html__( 'Tags Post Meta', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide tags from the end of post', 'shapely' ),
-					'section' => 'shapely_single_post_section',
+					'section'     => 'shapely_single_post_section',
 				)
 			)
 		);
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'related_posts_area', array(
-					'label'   => esc_html__( 'Related Posts Area', 'shapely' ),
+					'label'       => esc_html__( 'Related Posts Area', 'shapely' ),
 					'description' => esc_html__( 'This will enable/disable the related posts', 'shapely' ),
-					'section' => 'shapely_single_post_section',
+					'section'     => 'shapely_single_post_section',
 				)
 			)
 		);
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'post_author_area', array(
-					'label'   => esc_html__( 'Post Author Area', 'shapely' ),
+					'label'       => esc_html__( 'Post Author Area', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the author box', 'shapely' ),
-					'section' => 'shapely_single_post_section',
+					'section'     => 'shapely_single_post_section',
 				)
 			)
 		);
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'post_author_left_side', array(
-					'label'   => esc_html__( 'Post Author Left Side', 'shapely' ),
+					'label'       => esc_html__( 'Post Author Left Side', 'shapely' ),
 					'description' => esc_html__( 'This will move the author box from the bottom of the post on top on the left side', 'shapely' ),
-					'section' => 'shapely_single_post_section',
+					'section'     => 'shapely_single_post_section',
 				)
 			)
 		);
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'post_author_email', array(
-					'label'   => esc_html__( 'Show Author Email', 'shapely' ),
+					'label'       => esc_html__( 'Show Author Email', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the author\'s email from the author box', 'shapely' ),
-					'section' => 'shapely_single_post_section',
+					'section'     => 'shapely_single_post_section',
 				)
 			)
 		);
 	} else {
 		$wp_customize->add_control(
 			'first_letter_caps', array(
-				'label'   => esc_html__( 'First Letter Caps', 'shapely' ),
+				'label'       => esc_html__( 'First Letter Caps', 'shapely' ),
 				'description' => esc_html__( 'This will transform your first letter from a post into uppercase', 'shapely' ),
-				'section' => 'shapely_single_post_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_post_section',
+				'type'        => 'checkbox',
 			)
 		);
 		$wp_customize->add_control(
 			'tags_post_meta', array(
-				'label'   => esc_html__( 'Tags Post Meta', 'shapely' ),
+				'label'       => esc_html__( 'Tags Post Meta', 'shapely' ),
 				'description' => esc_html__( 'This will show/hide tags from the end of post', 'shapely' ),
-				'section' => 'shapely_single_post_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_post_section',
+				'type'        => 'checkbox',
 			)
 		);
 		$wp_customize->add_control(
 			'related_posts_area', array(
-				'label'   => esc_html__( 'Related Posts Area', 'shapely' ),
+				'label'       => esc_html__( 'Related Posts Area', 'shapely' ),
 				'description' => esc_html__( 'This will enable/disable the related posts', 'shapely' ),
-				'section' => 'shapely_single_post_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_post_section',
+				'type'        => 'checkbox',
 			)
 		);
 		$wp_customize->add_control(
 			'post_author_area', array(
-				'label'   => esc_html__( 'Post Author Area', 'shapely' ),
+				'label'       => esc_html__( 'Post Author Area', 'shapely' ),
 				'description' => esc_html__( 'This will show/hide the author box', 'shapely' ),
-				'section' => 'shapely_single_post_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_post_section',
+				'type'        => 'checkbox',
 			)
 		);
 		$wp_customize->add_control(
 			'post_author_left_side', array(
-				'label'   => esc_html__( 'Post Author Left Side', 'shapely' ),
+				'label'       => esc_html__( 'Post Author Left Side', 'shapely' ),
 				'description' => esc_html__( 'This will move the author box from the bottom of the post on top on the left side', 'shapely' ),
-				'section' => 'shapely_single_post_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_post_section',
+				'type'        => 'checkbox',
 			)
 		);
 		$wp_customize->add_control(
 			'post_author_email', array(
-				'label'   => esc_html__( 'Show Author Email', 'shapely' ),
+				'label'       => esc_html__( 'Show Author Email', 'shapely' ),
 				'description' => esc_html__( 'This will show/hide the author\'s email from the author box', 'shapely' ),
-				'section' => 'shapely_single_post_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_post_section',
+				'type'        => 'checkbox',
 			)
 		);
 	} // End if().
@@ -690,11 +690,11 @@ function shapely_customizer( $wp_customize ) {
 
 	$wp_customize->add_control(
 		'single_post_layout_template', array(
-			'label'   => esc_html__( 'Single Post Template', 'shapely' ),
+			'label'       => esc_html__( 'Single Post Template', 'shapely' ),
 			'description' => esc_html__( 'Set the default template for single posts', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-			'type'    => 'select',
-			'choices' => array(
+			'section'     => 'shapely_single_post_section',
+			'type'        => 'select',
+			'choices'     => array(
 				'full-width'    => esc_html__( 'Full Width', 'shapely' ),
 				'no-sidebar'    => esc_html__( 'No Sidebar', 'shapely' ),
 				'sidebar-left'  => esc_html__( 'Sidebar Left', 'shapely' ),
@@ -712,11 +712,11 @@ function shapely_customizer( $wp_customize ) {
 
 	$wp_customize->add_control(
 		'blog_layout_view', array(
-			'label'   => esc_html__( 'Blog Layout', 'shapely' ),
+			'label'       => esc_html__( 'Blog Layout', 'shapely' ),
 			'description' => esc_html__( 'Choose how you want to display posts in grid', 'shapely' ),
-			'section' => 'shapely_blog_section',
-			'type'    => 'select',
-			'choices' => array(
+			'section'     => 'shapely_blog_section',
+			'type'        => 'select',
+			'choices'     => array(
 				'grid'             => esc_html__( 'Grid only', 'shapely' ),
 				'large_image_grid' => esc_html__( 'Large Image and Grid', 'shapely' ),
 				'large_image'      => esc_html__( 'Large Images', 'shapely' ),
@@ -733,11 +733,11 @@ function shapely_customizer( $wp_customize ) {
 
 	$wp_customize->add_control(
 		'blog_layout_template', array(
-			'label'   => esc_html__( 'Blog Template', 'shapely' ),
+			'label'       => esc_html__( 'Blog Template', 'shapely' ),
 			'description' => esc_html__( 'Choose the template for your posts page', 'shapely' ),
-			'section' => 'shapely_blog_section',
-			'type'    => 'select',
-			'choices' => array(
+			'section'     => 'shapely_blog_section',
+			'type'        => 'select',
+			'choices'     => array(
 				'full-width'    => esc_html__( 'Full Width', 'shapely' ),
 				'no-sidebar'    => esc_html__( 'No Sidebar', 'shapely' ),
 				'sidebar-left'  => esc_html__( 'Sidebar Left', 'shapely' ),
@@ -757,19 +757,19 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'show_category_on_category_page', array(
-					'label'   => esc_html__( 'Show Category on Posts', 'shapely' ),
+					'label'       => esc_html__( 'Show Category on Posts', 'shapely' ),
 					'description' => esc_html__( 'Show/hide posts\' categories from the Category Page', 'shapely' ),
-					'section' => 'shapely_blog_section',
+					'section'     => 'shapely_blog_section',
 				)
 			)
 		);
 	} else {
 		$wp_customize->add_control(
 			'show_category_on_category_page', array(
-				'label'   => esc_html__( 'Show Category on Posts', 'shapely' ),
+				'label'       => esc_html__( 'Show Category on Posts', 'shapely' ),
 				'description' => esc_html__( 'Show/hide posts\' categories from the Category Page', 'shapely' ),
-				'section' => 'shapely_blog_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_blog_section',
+				'type'        => 'checkbox',
 			)
 		);
 	}
@@ -813,19 +813,19 @@ function shapely_customizer( $wp_customize ) {
 			$wp_customize->add_control(
 				new Epsilon_Control_Toggle(
 					$wp_customize, 'portfolio_archive_title', array(
-						'label'    => esc_html__( 'Show Portfolio Archive Title', 'shapely' ),
+						'label'       => esc_html__( 'Show Portfolio Archive Title', 'shapely' ),
 						'description' => esc_html__( 'Show/hide the title from the Portfolio Archive Page', 'shapely' ),
-						'section'  => 'shapely_projects_section',
+						'section'     => 'shapely_projects_section',
 					)
 				)
 			);
 		} else {
 			$wp_customize->add_control(
 				'portfolio_archive_title', array(
-					'label'    => esc_html__( 'Show Portfolio Archive Title', 'shapely' ),
+					'label'       => esc_html__( 'Show Portfolio Archive Title', 'shapely' ),
 					'description' => esc_html__( 'Show/hide the title from the Portfolio Archive Page', 'shapely' ),
-					'section'  => 'shapely_projects_section',
-					'type'     => 'checkbox',
+					'section'     => 'shapely_projects_section',
+					'type'        => 'checkbox',
 				)
 			);
 		}
@@ -837,9 +837,9 @@ function shapely_customizer( $wp_customize ) {
 		);
 		$wp_customize->add_control(
 			'portfolio_name', array(
-				'label'   => esc_html__( 'Portfolio Archive Title', 'shapely' ),
+				'label'       => esc_html__( 'Portfolio Archive Title', 'shapely' ),
 				'description' => esc_html__( 'Add a title on the Portfolio Archive Page.', 'shapely' ),
-				'section' => 'shapely_projects_section',
+				'section'     => 'shapely_projects_section',
 			)
 		);
 
@@ -851,10 +851,10 @@ function shapely_customizer( $wp_customize ) {
 		);
 		$wp_customize->add_control(
 			'portfolio_description', array(
-				'type'    => 'textarea',
-				'label'   => esc_html__( 'Portfolio Archive Description', 'shapely' ),
+				'type'        => 'textarea',
+				'label'       => esc_html__( 'Portfolio Archive Description', 'shapely' ),
 				'description' => esc_html__( 'Add a description on the Portfolio Archive Page.', 'shapely' ),
-				'section' => 'shapely_projects_section',
+				'section'     => 'shapely_projects_section',
 			)
 		);
 
@@ -867,13 +867,13 @@ function shapely_customizer( $wp_customize ) {
 
 		$wp_customize->add_control(
 			'projects_layout_view', array(
-				'label'   => esc_html__( 'Projects Layout', 'shapely' ),
+				'label'       => esc_html__( 'Projects Layout', 'shapely' ),
 				'description' => esc_html__( 'Choose how you want to display projects', 'shapely' ),
-				'section' => 'shapely_projects_section',
-				'type'    => 'select',
-				'choices' => array(
+				'section'     => 'shapely_projects_section',
+				'type'        => 'select',
+				'choices'     => array(
 					'mansonry' => esc_html__( 'Masonry', 'shapely' ),
-					'grid' => esc_html__( 'Grid', 'shapely' ),
+					'grid'     => esc_html__( 'Grid', 'shapely' ),
 				),
 			)
 		);
@@ -887,11 +887,11 @@ function shapely_customizer( $wp_customize ) {
 
 		$wp_customize->add_control(
 			'projects_layout_template', array(
-				'label'   => esc_html__( 'Projects Template', 'shapely' ),
+				'label'       => esc_html__( 'Projects Template', 'shapely' ),
 				'description' => esc_html__( 'Choose the template for your projects archive page', 'shapely' ),
-				'section' => 'shapely_projects_section',
-				'type'    => 'select',
-				'choices' => array(
+				'section'     => 'shapely_projects_section',
+				'type'        => 'select',
+				'choices'     => array(
 					'full-width'    => esc_html__( 'Full Width', 'shapely' ),
 					'no-sidebar'    => esc_html__( 'No Sidebar', 'shapely' ),
 					'sidebar-left'  => esc_html__( 'Sidebar Left', 'shapely' ),
@@ -976,9 +976,9 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'project_title_in_header', array(
-					'label'   => esc_html__( 'Show title in header', 'shapely' ),
+					'label'       => esc_html__( 'Show title in header', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the project title from callout', 'shapely' ),
-					'section' => 'shapely_single_project_section',
+					'section'     => 'shapely_single_project_section',
 				)
 			)
 		);
@@ -986,9 +986,9 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'title_above_project', array(
-					'label'   => esc_html__( 'Show title above project', 'shapely' ),
+					'label'       => esc_html__( 'Show title above project', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the project title above project content', 'shapely' ),
-					'section' => 'shapely_single_project_section',
+					'section'     => 'shapely_single_project_section',
 				)
 			)
 		);
@@ -996,9 +996,9 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'project_date', array(
-					'label'   => esc_html__( 'Show the date', 'shapely' ),
+					'label'       => esc_html__( 'Show the date', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the date when project was published', 'shapely' ),
-					'section' => 'shapely_single_project_section',
+					'section'     => 'shapely_single_project_section',
 				)
 			)
 		);
@@ -1006,9 +1006,9 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'project_author', array(
-					'label'   => esc_html__( 'Show the author', 'shapely' ),
+					'label'       => esc_html__( 'Show the author', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the author who written the project under the project title', 'shapely' ),
-					'section' => 'shapely_single_project_section',
+					'section'     => 'shapely_single_project_section',
 				)
 			)
 		);
@@ -1016,9 +1016,9 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'project_category', array(
-					'label'   => esc_html__( 'Show the project type', 'shapely' ),
+					'label'       => esc_html__( 'Show the project type', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the type of project', 'shapely' ),
-					'section' => 'shapely_single_project_section',
+					'section'     => 'shapely_single_project_section',
 				)
 			)
 		);
@@ -1026,104 +1026,104 @@ function shapely_customizer( $wp_customize ) {
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'project_first_letter_caps', array(
-					'label'   => esc_html__( 'First Letter Caps', 'shapely' ),
+					'label'       => esc_html__( 'First Letter Caps', 'shapely' ),
 					'description' => esc_html__( 'This will transform your first letter from a project into uppercase', 'shapely' ),
-					'section' => 'shapely_single_project_section',
+					'section'     => 'shapely_single_project_section',
 				)
 			)
 		);
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'tags_project_meta', array(
-					'label'   => esc_html__( 'Tags Project Meta', 'shapely' ),
+					'label'       => esc_html__( 'Tags Project Meta', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide tags from the end of project', 'shapely' ),
-					'section' => 'shapely_single_project_section',
+					'section'     => 'shapely_single_project_section',
 				)
 			)
 		);
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'related_projects_area', array(
-					'label'   => esc_html__( 'Related Projects Area', 'shapely' ),
+					'label'       => esc_html__( 'Related Projects Area', 'shapely' ),
 					'description' => esc_html__( 'This will enable/disable the related projects', 'shapely' ),
-					'section' => 'shapely_single_project_section',
+					'section'     => 'shapely_single_project_section',
 				)
 			)
 		);
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'project_author_area', array(
-					'label'   => esc_html__( 'Project Author Area', 'shapely' ),
+					'label'       => esc_html__( 'Project Author Area', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the author box', 'shapely' ),
-					'section' => 'shapely_single_project_section',
+					'section'     => 'shapely_single_project_section',
 				)
 			)
 		);
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'project_author_left_side', array(
-					'label'   => esc_html__( 'Project Author Left Side', 'shapely' ),
+					'label'       => esc_html__( 'Project Author Left Side', 'shapely' ),
 					'description' => esc_html__( 'This will move the author box from the bottom of the project on top on the left side', 'shapely' ),
-					'section' => 'shapely_single_project_section',
+					'section'     => 'shapely_single_project_section',
 				)
 			)
 		);
 		$wp_customize->add_control(
 			new Epsilon_Control_Toggle(
 				$wp_customize, 'project_author_email', array(
-					'label'   => esc_html__( 'Show Author Email', 'shapely' ),
+					'label'       => esc_html__( 'Show Author Email', 'shapely' ),
 					'description' => esc_html__( 'This will show/hide the author\'s email from the author box', 'shapely' ),
-					'section' => 'shapely_single_project_section',
+					'section'     => 'shapely_single_project_section',
 				)
 			)
 		);
 	} else {
 		$wp_customize->add_control(
 			'project_first_letter_caps', array(
-				'label'   => esc_html__( 'First Letter Caps', 'shapely' ),
+				'label'       => esc_html__( 'First Letter Caps', 'shapely' ),
 				'description' => esc_html__( 'This will transform your first letter from a project into uppercase', 'shapely' ),
-				'section' => 'shapely_single_project_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_project_section',
+				'type'        => 'checkbox',
 			)
 		);
 		$wp_customize->add_control(
 			'tags_project_meta', array(
-				'label'   => esc_html__( 'Tags Project Meta', 'shapely' ),
+				'label'       => esc_html__( 'Tags Project Meta', 'shapely' ),
 				'description' => esc_html__( 'This will show/hide tags from the end of project', 'shapely' ),
-				'section' => 'shapely_single_project_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_project_section',
+				'type'        => 'checkbox',
 			)
 		);
 		$wp_customize->add_control(
 			'related_projects_area', array(
-				'label'   => esc_html__( 'Related Projects Area', 'shapely' ),
+				'label'       => esc_html__( 'Related Projects Area', 'shapely' ),
 				'description' => esc_html__( 'This will enable/disable the related projects', 'shapely' ),
-				'section' => 'shapely_single_project_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_project_section',
+				'type'        => 'checkbox',
 			)
 		);
 		$wp_customize->add_control(
 			'project_author_area', array(
-				'label'   => esc_html__( 'Project Author Area', 'shapely' ),
+				'label'       => esc_html__( 'Project Author Area', 'shapely' ),
 				'description' => esc_html__( 'This will show/hide the author box', 'shapely' ),
-				'section' => 'shapely_single_project_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_project_section',
+				'type'        => 'checkbox',
 			)
 		);
 		$wp_customize->add_control(
 			'project_author_left_side', array(
-				'label'   => esc_html__( 'Project Author Left Side', 'shapely' ),
+				'label'       => esc_html__( 'Project Author Left Side', 'shapely' ),
 				'description' => esc_html__( 'This will move the author box from the bottom of the project on top on the left side', 'shapely' ),
-				'section' => 'shapely_single_project_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_project_section',
+				'type'        => 'checkbox',
 			)
 		);
 		$wp_customize->add_control(
 			'project_author_email', array(
-				'label'   => esc_html__( 'Show Author Email', 'shapely' ),
+				'label'       => esc_html__( 'Show Author Email', 'shapely' ),
 				'description' => esc_html__( 'This will show/hide the author\'s email from the author box', 'shapely' ),
-				'section' => 'shapely_single_project_section',
-				'type'    => 'checkbox',
+				'section'     => 'shapely_single_project_section',
+				'type'        => 'checkbox',
 			)
 		);
 	} // End if().
@@ -1136,11 +1136,11 @@ function shapely_customizer( $wp_customize ) {
 
 	$wp_customize->add_control(
 		'single_project_layout_template', array(
-			'label'   => esc_html__( 'Single Project Template', 'shapely' ),
+			'label'       => esc_html__( 'Single Project Template', 'shapely' ),
 			'description' => esc_html__( 'Set the default template for single project', 'shapely' ),
-			'section' => 'shapely_single_project_section',
-			'type'    => 'select',
-			'choices' => array(
+			'section'     => 'shapely_single_project_section',
+			'type'        => 'select',
+			'choices'     => array(
 				'full-width'    => esc_html__( 'Full Width', 'shapely' ),
 				'no-sidebar'    => esc_html__( 'No Sidebar', 'shapely' ),
 				'sidebar-left'  => esc_html__( 'Sidebar Left', 'shapely' ),
diff --git a/inc/extras.php b/inc/extras.php
index 707de60..c732bf0 100644
--- a/inc/extras.php
+++ b/inc/extras.php
@@ -205,7 +205,7 @@ function shapely_caption( $output, $attr, $content ) {
 		return $content;
 	}
 
-	$output = '<figure id="' . esc_attr( $attr['id'] ) . '" class="thumbnail wp-caption ' . esc_attr( $attr['align'] ) . ' style="width: ' . ( esc_attr( $attr['width'] ) + 10 ) . 'px">';
+	$output  = '<figure id="' . esc_attr( $attr['id'] ) . '" class="thumbnail wp-caption ' . esc_attr( $attr['align'] ) . ' style="width: ' . ( esc_attr( $attr['width'] ) + 10 ) . 'px">';
 	$output .= do_shortcode( $content );
 	$output .= '<figcaption class="caption wp-caption-text">' . wp_kses_post( $attr['caption'] ) . '</figcaption>';
 	$output .= '</figure>';
@@ -312,13 +312,13 @@ function shapely_author_bio() {
 			return;
 		}
 
-		$author_displayname = get_the_author_meta( 'display_name' );
-		$author_nickname    = get_the_author_meta( 'nickname' );
-		$author_fullname    = ( '' != get_the_author_meta( 'first_name' ) && '' != get_the_author_meta( 'last_name' ) ) ? get_the_author_meta( 'first_name' ) . ' ' . get_the_author_meta( 'last_name' ) : '';
-		$author_email       = get_the_author_meta( 'email' );
-		$author_description = get_the_author_meta( 'description' );
-		$author_name = ( '' != trim( $author_nickname ) ) ? $author_nickname : ( trim( $author_displayname ) != '' ) ? $author_displayname : $author_fullname;
-		$show_athor_email = get_theme_mod( 'post_author_email', false );
+		$author_displayname       = get_the_author_meta( 'display_name' );
+		$author_nickname          = get_the_author_meta( 'nickname' );
+		$author_fullname          = ( '' != get_the_author_meta( 'first_name' ) && '' != get_the_author_meta( 'last_name' ) ) ? get_the_author_meta( 'first_name' ) . ' ' . get_the_author_meta( 'last_name' ) : '';
+		$author_email             = get_the_author_meta( 'email' );
+		$author_description       = get_the_author_meta( 'description' );
+		$author_name              = ( '' != trim( $author_nickname ) ) ? $author_nickname : ( trim( $author_displayname ) != '' ) ? $author_displayname : $author_fullname;
+		$show_athor_email         = get_theme_mod( 'post_author_email', false );
 		$show_project_athor_email = get_theme_mod( 'project_author_email', false );
 		?>
 
@@ -331,13 +331,13 @@ function shapely_author_bio() {
 				</div>
 				<div class="col-sm-10">
 					<b class="fn"><?php echo esc_html( $author_name ); ?></b>
-					<p>
+					<div>
 					<?php
 					if ( '' != trim( $author_description ) ) {
-						echo esc_html( $author_description );
+						echo wp_kses_post( $author_description );
 					}
 					?>
-					</p>
+					</div>
 					<?php if ( ( $show_athor_email && ! is_singular( 'jetpack-portfolio' ) ) || ( is_singular( 'jetpack-portfolio' ) && $show_project_athor_email ) ) : ?>
 						<a class="author-email" href="mailto:<?php echo esc_attr( antispambot( $author_email ) ); ?>"><?php echo esc_html( antispambot( $author_email ) ); ?></a>
 					<?php endif ?>
@@ -381,7 +381,7 @@ function shapely_author_bio() {
 						?>
 							<li>
 							<a href="<?php echo esc_url( $github_profile ); ?>">
-								<i class="fa fa-vimeo"></i>
+								<i class="fa fa-github"></i>
 							</a>
 							</li>
 							<?php
@@ -392,7 +392,7 @@ function shapely_author_bio() {
 						?>
 							<li>
 							<a href="<?php echo esc_url( $vimeo_profile ); ?>">
-								<i class="fa fa-github"></i>
+								<i class="fa fa-vimeo"></i>
 							</a>
 							</li>
 							<?php
@@ -492,9 +492,9 @@ function shapely_custom_comment_form() {
 	$fields    = array(
 		'author' => '<input id="author" placeholder="' . esc_html__( 'Your Name', 'shapely' ) . ( $req ? '*' : '' ) . '" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" ' . $aria_req . ' required="required" />',
 
-		'email' => '<input id="email" name="email" type="email" placeholder="' . esc_html__( 'Email Address', 'shapely' ) . ( $req ? '*' : '' ) . '" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' required="required" />',
+		'email'  => '<input id="email" name="email" type="email" placeholder="' . esc_html__( 'Email Address', 'shapely' ) . ( $req ? '*' : '' ) . '" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' required="required" />',
 
-		'url' => '<input placeholder="' . esc_html__( 'Your Website (optional)', 'shapely' ) . '" id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" />',
+		'url'    => '<input placeholder="' . esc_html__( 'Your Website (optional)', 'shapely' ) . '" id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" />',
 	);
 
 	$comments_args = array(
@@ -731,8 +731,7 @@ function shapely_footer_callout() {
 							<h3 class="cfa-text"><?php echo wp_kses_post( get_theme_mod( 'footer_callout_text' ) ); ?></h3>
 						</div>
 						<div class="col-sm-3">
-							<a href='<?php echo esc_url( get_theme_mod( 'footer_callout_link' ) ); ?>'
-							   class="mb0 btn btn-lg btn-filled cfa-button">
+							<a href='<?php echo esc_url( get_theme_mod( 'footer_callout_link' ) ); ?>' class="mb0 btn btn-lg btn-filled cfa-button">
 								<?php echo wp_kses_post( get_theme_mod( 'footer_callout_btntext' ) ); ?>
 							</a>
 						</div>
diff --git a/inc/libraries/epsilon-framework b/inc/libraries/epsilon-framework
index 17d79a5..3465a79 160000
--- a/inc/libraries/epsilon-framework
+++ b/inc/libraries/epsilon-framework
@@ -1 +1 @@
-Subproject commit 17d79a5321a5de9cde0cc2a4036b4c6463e2f57e
+Subproject commit 3465a7906b2bc66827a053bdb4558eaca28fc692
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 200a133..015c8ce 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -45,11 +45,11 @@ function shapely_posted_on() {
 	function shapely_posted_on_no_cat() {
 
 		if ( is_singular( 'jetpack-portfolio' ) ) {
-			$post_author  = get_theme_mod( 'project_author', true );
-			$post_date  = get_theme_mod( 'project_date', true );
+			$post_author = get_theme_mod( 'project_author', true );
+			$post_date   = get_theme_mod( 'project_date', true );
 		} else {
-			$post_author  = get_theme_mod( 'post_author', true );
-			$post_date  = get_theme_mod( 'post_date', true );
+			$post_author = get_theme_mod( 'post_author', true );
+			$post_date   = get_theme_mod( 'post_date', true );
 		}
 
 		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
@@ -72,11 +72,9 @@ function shapely_posted_on_no_cat() {
 		<?php if ( $post_date ) : ?>
 			<li><span class="posted-on"><?php echo $time_string; ?></span></li>
 		<?php endif ?>
-		
 		<?php if ( $post_author ) : ?>
 			<li><span><?php echo esc_html__( 'by', 'shapely' ); ?> <a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" title="<?php echo esc_attr( get_the_author() ); ?>"><?php esc_html( the_author() ); ?></a></span></li>
 		<?php endif ?>
-		
 		</ul>
 		<?php
 		endif;
diff --git a/page-templates/template-widget.php b/page-templates/template-widget.php
new file mode 100644
index 0000000..ccab608
--- /dev/null
+++ b/page-templates/template-widget.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ *
+ * Template Name: Builder Page
+ *
+ */
+?>
+<?php
+
+get_header();
+
+while ( have_posts() ) {
+	the_post();
+	global $post;
+	$sidebar_id = 'shapely-' . $post->post_name;
+
+	if ( ! function_exists( 'dynamic_sidebar' ) || ! dynamic_sidebar( $sidebar_id ) ) {
+		echo '<div class="container p24 wp-caption-text">';
+			echo '<h5>' . sprintf( esc_html__( 'This is the %s sidebar, add some widgets to it to change it.', 'shapely' ), get_the_title() ) . '</h5>';
+		echo '</div>';
+	}
+}
+
+get_footer();
+
+
diff --git a/style.css b/style.css
index 485ee5d..5c0b72d 100644
--- a/style.css
+++ b/style.css
@@ -4168,6 +4168,13 @@ footer.bg-dark a {
 .woocommerce-page #content table.cart td.actions .coupon .input-text {
     width: auto;
 }
+.create-account label.woocommerce-form__label {
+    width: 100% !important;
+    display: block !important;
+}
+.woocommerce form .form-row.create-account .input-checkbox {
+    position: relative;
+}
 
 /* Contact Form 7 */
 .wpcf7-form div.wpcf7-validation-errors {
@@ -4188,4 +4195,11 @@ footer.bg-dark a {
 }
 span.wpcf7-not-valid-tip {
     margin-top: -24px;
+}
+.page-template-template-widget section.content-area  {
+    padding-top: 0;
+}
+.widget .text-center .img-responsive {
+    margin-left: auto;
+    margin-right: auto;
 }
\ No newline at end of file
diff --git a/template-parts/content-grid-small.php b/template-parts/content-grid-small.php
index af15730..05c39c8 100644
--- a/template-parts/content-grid-small.php
+++ b/template-parts/content-grid-small.php
@@ -11,12 +11,12 @@
 	<article id="post-<?php the_ID(); ?>" <?php post_class( 'post-content post-grid-small col-md-6' ); ?> >
 		<header class="entry-header nolist">
 			<?php
-			$category = get_the_category();
+			$category      = get_the_category();
 			$show_category = true;
 			if ( is_category() ) {
 				$show_category = get_theme_mod( 'show_category_on_category_page', 1 );
 			}
-			$image    = '<img class="wp-post-image" alt="" src="' . get_template_directory_uri() . '/assets/images/placeholder.jpg" />';
+			$image = '<img class="wp-post-image" alt="" src="' . get_template_directory_uri() . '/assets/images/placeholder.jpg" />';
 			if ( has_post_thumbnail() ) {
 				$image = get_the_post_thumbnail( get_the_ID(), 'shapely-grid' );
 			}
@@ -63,13 +63,13 @@
 			the_content(
 				sprintf(
 					/* translators: %s: Name of current post. */
-							 wp_kses(
-								 __( 'Read more %s <span class="meta-nav">&rarr;</span>', 'shapely' ), array(
-									 'span' => array(
-										 'class' => array(),
-									 ),
-								 )
-							 ),
+							wp_kses(
+								__( 'Read more %s <span class="meta-nav">&rarr;</span>', 'shapely' ), array(
+									'span' => array(
+										'class' => array(),
+									),
+								)
+							),
 					the_title( '<span class="screen-reader-text">"', '"</span>', false )
 				)
 			);
diff --git a/template-parts/content-grid-wide.php b/template-parts/content-grid-wide.php
index 08125ca..d21e596 100644
--- a/template-parts/content-grid-wide.php
+++ b/template-parts/content-grid-wide.php
@@ -12,12 +12,12 @@
 		<article id="post-<?php the_ID(); ?>" <?php post_class( 'post-content post-grid-wide col-md-12' ); ?>>
 			<header class="entry-header nolist">
 				<?php
-				$category = get_the_category();
+				$category      = get_the_category();
 				$show_category = true;
 				if ( is_category() ) {
 					$show_category = get_theme_mod( 'show_category_on_category_page', 1 );
 				}
-				$image    = '<img class="wp-post-image" alt="" src="' . get_template_directory_uri() . '/assets/images/placeholder_wide.jpg" />';
+				$image = '<img class="wp-post-image" alt="" src="' . get_template_directory_uri() . '/assets/images/placeholder_wide.jpg" />';
 				if ( has_post_thumbnail() ) {
 					$layout = shapely_get_layout_class();
 					$size   = 'shapely-featured';
@@ -70,13 +70,13 @@
 				the_content(
 					sprintf(
 						/* translators: %s: Name of current post. */
-								 wp_kses(
-									 __( 'Read more %s <span class="meta-nav">&rarr;</span>', 'shapely' ), array(
-										 'span' => array(
-											 'class' => array(),
-										 ),
-									 )
-								 ),
+								wp_kses(
+									__( 'Read more %s <span class="meta-nav">&rarr;</span>', 'shapely' ), array(
+										'span' => array(
+											'class' => array(),
+										),
+									)
+								),
 						the_title( '<span class="screen-reader-text">"', '"</span>', false )
 					)
 				);
diff --git a/template-parts/content-portfolio.php b/template-parts/content-portfolio.php
index ce69d27..4db4dc2 100644
--- a/template-parts/content-portfolio.php
+++ b/template-parts/content-portfolio.php
@@ -7,12 +7,12 @@
  * @package Shapely
  */
 
-$dropcaps    = get_theme_mod( 'project_first_letter_caps', true );
-$enable_tags = get_theme_mod( 'project_tags_post_meta', true );
-$post_author = get_theme_mod( 'project_author_area', true );
-$left_side   = get_theme_mod( 'project_author_left_side', false );
-$post_title  = get_theme_mod( 'title_above_project', true );
-$post_category  = get_theme_mod( 'project_category', true );
+$dropcaps      = get_theme_mod( 'project_first_letter_caps', true );
+$enable_tags   = get_theme_mod( 'project_tags_post_meta', true );
+$post_author   = get_theme_mod( 'project_author_area', true );
+$left_side     = get_theme_mod( 'project_author_left_side', false );
+$post_title    = get_theme_mod( 'title_above_project', true );
+$post_category = get_theme_mod( 'project_category', true );
 
 ?>
 <article id="post-<?php the_ID(); ?>" <?php post_class( 'post-content post-grid-wide' ); ?>>
@@ -64,7 +64,6 @@
 				<a href="<?php echo esc_url( get_the_permalink() ); ?>"><?php echo wp_trim_words( get_the_title(), 9 ); ?></a>
 			</h2>
 		<?php endif ?>
-		
 
 		<div class="entry-meta">
 			<?php
diff --git a/template-parts/content-search.php b/template-parts/content-search.php
index 9456413..7173c06 100644
--- a/template-parts/content-search.php
+++ b/template-parts/content-search.php
@@ -13,7 +13,7 @@
 	<article id="post-<?php the_ID(); ?>" <?php post_class( 'post-content post-grid-wide col-md-12' ); ?>>
 		<header class="entry-header">
 			<?php
-			$image    = '<img class="wp-post-image" alt="" src="' . get_template_directory_uri() . '/assets/images/placeholder_wide.jpg" />';
+			$image = '<img class="wp-post-image" alt="" src="' . get_template_directory_uri() . '/assets/images/placeholder_wide.jpg" />';
 			if ( has_post_thumbnail() ) {
 				$layout = shapely_get_layout_class();
 				$size   = 'shapely-featured';
diff --git a/template-parts/content.php b/template-parts/content.php
index 0cd8640..4fa2b1d 100644
--- a/template-parts/content.php
+++ b/template-parts/content.php
@@ -7,12 +7,12 @@
  * @package Shapely
  */
 
-$dropcaps    = get_theme_mod( 'first_letter_caps', true );
-$enable_tags = get_theme_mod( 'tags_post_meta', true );
-$post_author = get_theme_mod( 'post_author_area', true );
-$left_side   = get_theme_mod( 'post_author_left_side', false );
-$post_title  = get_theme_mod( 'title_above_post', true );
-$post_category  = get_theme_mod( 'post_category', true );
+$dropcaps      = get_theme_mod( 'first_letter_caps', true );
+$enable_tags   = get_theme_mod( 'tags_post_meta', true );
+$post_author   = get_theme_mod( 'post_author_area', true );
+$left_side     = get_theme_mod( 'post_author_left_side', false );
+$post_title    = get_theme_mod( 'title_above_post', true );
+$post_category = get_theme_mod( 'post_category', true );
 
 ?>
 <article id="post-<?php the_ID(); ?>" <?php post_class( 'post-content post-grid-wide' ); ?>>
@@ -64,7 +64,6 @@
 				<a href="<?php echo esc_url( get_the_permalink() ); ?>"><?php echo wp_trim_words( get_the_title(), 9 ); ?></a>
 			</h2>
 		<?php endif ?>
-		
 
 		<div class="entry-meta">
 			<?php