diff --git a/archive.php b/archive.php
index ca9aa3b..9278675 100755
--- a/archive.php
+++ b/archive.php
@@ -8,98 +8,101 @@
  */
 
 get_header(); ?>
-<h1>archive.php</h1>
-	<section id="primary" class="content-area">
-		<main id="main" class="site-main" role="main">
+	<div class="row">
+		<div class="col-sm-9">
+			<section id="primary" class="content-area">
+				<main id="main" class="site-main" role="main">
+		
+				<?php if ( have_posts() ) : ?>
+		
+					<header class="page-header">
+						<h1 class="page-title">
+							<?php
+								if ( is_category() ) :
+									single_cat_title();
+		
+								elseif ( is_tag() ) :
+									single_tag_title();
+		
+								elseif ( is_author() ) :
+									printf( __( 'Author: %s', 'cs' ), '<span class="vcard">' . get_the_author() . '</span>' );
+		
+								elseif ( is_day() ) :
+									printf( __( 'Day: %s', 'cs' ), '<span>' . get_the_date() . '</span>' );
+		
+								elseif ( is_month() ) :
+									printf( __( 'Month: %s', 'cs' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'cs' ) ) . '</span>' );
+		
+								elseif ( is_year() ) :
+									printf( __( 'Year: %s', 'cs' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'cs' ) ) . '</span>' );
+		
+								elseif ( is_tax( 'post_format', 'post-format-aside' ) ) :
+									_e( 'Asides', 'cs' );
+		
+								elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) :
+									_e( 'Galleries', 'cs');
+		
+								elseif ( is_tax( 'post_format', 'post-format-image' ) ) :
+									_e( 'Images', 'cs');
+		
+								elseif ( is_tax( 'post_format', 'post-format-video' ) ) :
+									_e( 'Videos', 'cs' );
+		
+								elseif ( is_tax( 'post_format', 'post-format-quote' ) ) :
+									_e( 'Quotes', 'cs' );
+		
+								elseif ( is_tax( 'post_format', 'post-format-link' ) ) :
+									_e( 'Links', 'cs' );
+		
+								elseif ( is_tax( 'post_format', 'post-format-status' ) ) :
+									_e( 'Statuses', 'cs' );
+		
+								elseif ( is_tax( 'post_format', 'post-format-audio' ) ) :
+									_e( 'Audios', 'cs' );
+		
+								elseif ( is_tax( 'post_format', 'post-format-chat' ) ) :
+									_e( 'Chats', 'cs' );
+		
+								else :
+									_e( 'Archives', 'cs' );
+		
+								endif;
+							?>
+						</h1>
+						<?php
+							// Show an optional term description.
+							$term_description = term_description();
+							if ( ! empty( $term_description ) ) :
+								printf( '<div class="taxonomy-description">%s</div>', $term_description );
+							endif;
+						?>
+					</header><!-- .page-header -->
+		
+					<?php /* Start the Loop */ ?>
+					<?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( 'content', get_post_format() );
+						?>
+		
+					<?php endwhile; ?>
+		
+					<?php cs_paging_nav(); ?>
+		
+				<?php else : ?>
+		
+					<?php get_template_part( 'content', 'none' ); ?>
+		
+				<?php endif; ?>
+		
+				</main><!-- #main -->
+			</section><!-- #primary -->
+		</div>
+		<?php get_sidebar(); ?>
+	</div>
 
-		<?php if ( have_posts() ) : ?>
-
-			<header class="page-header">
-				<h1 class="page-title">
-					<?php
-						if ( is_category() ) :
-							single_cat_title();
-
-						elseif ( is_tag() ) :
-							single_tag_title();
-
-						elseif ( is_author() ) :
-							printf( __( 'Author: %s', 'cs' ), '<span class="vcard">' . get_the_author() . '</span>' );
-
-						elseif ( is_day() ) :
-							printf( __( 'Day: %s', 'cs' ), '<span>' . get_the_date() . '</span>' );
-
-						elseif ( is_month() ) :
-							printf( __( 'Month: %s', 'cs' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'cs' ) ) . '</span>' );
-
-						elseif ( is_year() ) :
-							printf( __( 'Year: %s', 'cs' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'cs' ) ) . '</span>' );
-
-						elseif ( is_tax( 'post_format', 'post-format-aside' ) ) :
-							_e( 'Asides', 'cs' );
-
-						elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) :
-							_e( 'Galleries', 'cs');
-
-						elseif ( is_tax( 'post_format', 'post-format-image' ) ) :
-							_e( 'Images', 'cs');
-
-						elseif ( is_tax( 'post_format', 'post-format-video' ) ) :
-							_e( 'Videos', 'cs' );
-
-						elseif ( is_tax( 'post_format', 'post-format-quote' ) ) :
-							_e( 'Quotes', 'cs' );
-
-						elseif ( is_tax( 'post_format', 'post-format-link' ) ) :
-							_e( 'Links', 'cs' );
-
-						elseif ( is_tax( 'post_format', 'post-format-status' ) ) :
-							_e( 'Statuses', 'cs' );
-
-						elseif ( is_tax( 'post_format', 'post-format-audio' ) ) :
-							_e( 'Audios', 'cs' );
-
-						elseif ( is_tax( 'post_format', 'post-format-chat' ) ) :
-							_e( 'Chats', 'cs' );
-
-						else :
-							_e( 'Archives', 'cs' );
-
-						endif;
-					?>
-				</h1>
-				<?php
-					// Show an optional term description.
-					$term_description = term_description();
-					if ( ! empty( $term_description ) ) :
-						printf( '<div class="taxonomy-description">%s</div>', $term_description );
-					endif;
-				?>
-			</header><!-- .page-header -->
-
-			<?php /* Start the Loop */ ?>
-			<?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( 'content', get_post_format() );
-				?>
-
-			<?php endwhile; ?>
-
-			<?php cs_paging_nav(); ?>
-
-		<?php else : ?>
-
-			<?php get_template_part( 'content', 'none' ); ?>
-
-		<?php endif; ?>
-
-		</main><!-- #main -->
-	</section><!-- #primary -->
-
-<?php get_sidebar(); ?>
 <?php get_footer(); ?>
diff --git a/content.php b/content.php
index f7d45a5..97c8737 100755
--- a/content.php
+++ b/content.php
@@ -5,7 +5,6 @@
 
  */
 ?>
-<h1>Content.php</h1>
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
 		<?php the_title( sprintf( '<h1 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h1>' ); ?>
diff --git a/inc/extras.php b/inc/extras.php
index b0478bc..6b556f8 100755
--- a/inc/extras.php
+++ b/inc/extras.php
@@ -86,4 +86,4 @@ function cs_setup_author() {
 		$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
 	}
 }
-add_action( 'wp', 'cs_setup_author' );
+add_action( 'wp', 'cs_setup_author' );
\ No newline at end of file
diff --git a/inc/reg-sidebars.php b/inc/reg-sidebars.php
index 7535e5c..4257f99 100644
--- a/inc/reg-sidebars.php
+++ b/inc/reg-sidebars.php
@@ -8,10 +8,14 @@
 
 if ( function_exists('register_sidebar') ) {
 	register_sidebar(array(
-		'name' => 'Sidebar',
-		'id' => 'sidebar',
-		'before_title' => '<h1 class="widget-title">',
-		'after_title' => '</h1>',
+		'name'          	=> __( 'Sidebar', 'theme_text_domain' ),
+		'id'            	=> 'sidebar',
+		'description'   	=> 'Appears with Archives, Search Results, the Blog page template, and when viewing single posts.',
+		'class'        	=> 'sidebar',
+		'before_widget' 	=> '<aside id="%1$s" class="widget %2$s">',
+		'after_widget'  	=> '</div></aside>',
+		'before_title'  	=> '<div class="widget-head"><h2 class="widget-title">',
+		'after_title'   	=> '</h2></div><div class="widget-content">'
 	));
 	register_sidebar(array(
 		'name' => 'Home1',
@@ -69,6 +73,29 @@
 	));
 	
 }
+register_sidebar( array(
+	'name'          => __( 'Header Widget Area', 'theme' ),
+	'id'            => 'header-widget-area',
+	'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+	'after_widget'  => '</aside>',
+	'before_title'  => '<h1 class="widget-title">',
+	'after_title'   => '</h1>',
+) );
+
+// if no title then add widget content wrapper to before widget
+add_filter( 'dynamic_sidebar_params', 'check_sidebar_params' );
+function check_sidebar_params( $params ) {
+    global $wp_registered_widgets;
+
+    $settings_getter = $wp_registered_widgets[ $params[0]['widget_id'] ]['callback'][0];
+    $settings = $settings_getter->get_settings();
+    $settings = $settings[ $params[1]['number'] ];
+
+    if ( $params[0][ 'after_widget' ] == '</div></aside>' && isset( $settings[ 'title' ] ) && empty( $settings[ 'title' ] ) )
+        $params[0][ 'before_widget' ] .= '<div class="widget-content">';
+
+    return $params;
+}
 
 
 ?>
\ No newline at end of file
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 02c4e80..f11c464 100755
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -18,7 +18,6 @@ function cs_paging_nav() {
 	}
 	?>
 	<nav class="navigation paging-navigation" role="navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'cs' ); ?></h1>
 		<div class="nav-links">
 
 			<?php if ( get_next_posts_link() ) : ?>
@@ -49,11 +48,10 @@ function cs_post_nav() {
 	}
 	?>
 	<nav class="navigation post-navigation" role="navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Post navigation', 'cs' ); ?></h1>
-		<div class="nav-links">
+		<div class="nav-links row">
 			<?php
-				previous_post_link( '<div class="nav-previous">%link</div>', _x( '<span class="meta-nav">&larr;</span> %title', 'Previous post link', 'cs' ) );
-				next_post_link(     '<div class="nav-next">%link</div>',     _x( '%title <span class="meta-nav">&rarr;</span>', 'Next post link',     'cs' ) );
+				previous_post_link( '<div class="col-sm-6 nav-previous">%link</div>', _x( '<span class="meta-nav">&larr;</span> Previous', 'Previous post link', 'cs' ) );
+				next_post_link(     '<div class="col-sm-6 nav-next">%link</div>',     _x( 'Next <span class="meta-nav">&rarr;</span>', 'Next post link',     'cs' ) );
 			?>
 		</div><!-- .nav-links -->
 	</nav><!-- .navigation -->
diff --git a/index.php b/index.php
index bddf30c..1dbf7f2 100755
--- a/index.php
+++ b/index.php
@@ -12,20 +12,8 @@
  */
 
 get_header(); ?>
+	
 	<div class="row">
-		<!-- 
-
-			#phpneeded
-
-			If dynamic_sidebar() =! false/null...
-
-				<div class="col-sm-9">
-
-			else
-
-				<div class="col-sm-12">
-
-		-->
 		<div class="col-sm-9">
 			<div id="primary" class="content-area">
 				
@@ -58,22 +46,6 @@
 			
 			</div><!-- #primary -->
 		</div>
-		<!-- 
-
-			#phpneeded
-
-			If dynamic_sidebar() =! false/null...
-
-				<div class="col-sm-3">
-					<?php //dynamic_sidebar( apply_filters( 'ups_sidebar', 'default-sidebar-id' ) ); ?>
-					<?php //get_sidebar(); ?>
-				</div>
-
-
-		-->
-
-		<div class="col-sm-3">
-			<?php dynamic_sidebar( apply_filters( 'ups_sidebar', 'default-sidebar-id' ) ); ?>
-		</div>
+		<?php get_sidebar(); ?>
 	</div>
 <?php get_footer(); ?>
diff --git a/page.php b/page.php
index 5d32dcb..af2921b 100755
--- a/page.php
+++ b/page.php
@@ -47,10 +47,11 @@
 			</div><!-- #primary -->
 		</div>
 		<?php
-		if ( is_active_sidebar( $sidebar ) ) { 
-			echo '<div class="col-sm-3">';
-			dynamic_sidebar( $sidebar );
-			echo '</div>';
-        } ?>
+			if ( is_active_sidebar( $sidebar ) ) { 
+				echo '<div class="col-sm-3">';
+				dynamic_sidebar( $sidebar );
+				echo '</div>';
+			} 
+		?>
 	</div><!-- /row -->
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/search.php b/search.php
index 27c0822..32d7eea 100755
--- a/search.php
+++ b/search.php
@@ -6,26 +6,9 @@
  */
 
 get_header(); ?>
-<h1>search.php</h1>
 <div class="container">
 	<div class="row">
-		
-		<!-- 
-
-			#phpneeded
-
-			If dynamic_sidebar() =! false/null...
-
-				<div class="col-sm-9">
-
-			else
-
-				<div class="col-sm-12">
-
-		-->
 		<div class="col-sm-9">
-
-
 			<section id="primary" class="content-area">
 				<main id="main" class="site-main" role="main">
 
@@ -53,25 +36,7 @@
 				</main><!-- #main -->
 			</section><!-- #primary -->
 		</div>
-
-		<!-- 
-
-			#phpneeded
-
-			If dynamic_sidebar() =! false/null...
-
-				<div class="col-sm-3">
-					<?php //dynamic_sidebar( apply_filters( 'ups_sidebar', 'default-sidebar-id' ) ); ?>
-					<?php //get_sidebar(); ?>
-				</div>
-
-
-		-->
-
-		<div class="col-sm-3">
-			<?php dynamic_sidebar( apply_filters( 'ups_sidebar', 'default-sidebar-id' ) ); ?>
-		</div>
-
+		<?php get_sidebar(); ?>
 	</div>
 </div>
 <?php get_footer(); ?>
diff --git a/sidebar.php b/sidebar.php
index 09698c8..507b357 100755
--- a/sidebar.php
+++ b/sidebar.php
@@ -5,8 +5,8 @@
  * @package cornerstone
  */
 ?>
-	<div id="secondary" class="widget-area" role="complementary">
-		<?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
+	<div id="secondary" class="col-sm-3 widget-area" role="complementary">
+		<?php if ( ! dynamic_sidebar( 'sidebar' ) ) : ?>
 
 			<aside id="search" class="widget widget_search">
 				<?php get_search_form(); ?>
diff --git a/single.php b/single.php
index b8e429e..b39cb32 100755
--- a/single.php
+++ b/single.php
@@ -6,27 +6,31 @@
  */
 
 get_header(); ?>
-<h1>single.php</h1>
-	<div id="primary" class="content-area">
-		<main id="main" class="site-main" role="main">
 
-		<?php while ( have_posts() ) : the_post(); ?>
-
-			<?php get_template_part( 'content', 'single' ); ?>
-
-			<?php cs_post_nav(); ?>
-
-			<?php
-				// If comments are open or we have at least one comment, load up the comment template
-				if ( comments_open() || '0' != get_comments_number() ) :
-					comments_template();
-				endif;
-			?>
-
-		<?php endwhile; // end of the loop. ?>
-
-		</main><!-- #main -->
-	</div><!-- #primary -->
-
-<?php get_sidebar(); ?>
+	<div class="row">
+		<div class="col-sm-9">
+
+			<div id="primary" class="content-area">
+				<main id="main" class="site-main" role="main">
+		
+				<?php while ( have_posts() ) : the_post(); ?>
+		
+					<?php get_template_part( 'content', 'single' ); ?>
+		
+					<?php cs_post_nav(); ?>
+		
+					<?php
+						// If comments are open or we have at least one comment, load up the comment template
+						if ( comments_open() || '0' != get_comments_number() ) :
+							comments_template();
+						endif;
+					?>
+		
+				<?php endwhile; // end of the loop. ?>
+		
+				</main><!-- #main -->
+			</div><!-- #primary -->
+		</div>
+		<?php get_sidebar(); ?>
+	</div>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/style.css b/style.css
index b32dc16..6049df8 100755
--- a/style.css
+++ b/style.css
@@ -1,12 +1,8 @@
 /*
-Theme Name: cornerstone
-Theme URI: http://github.com/uconnwebdev/cornerstone
-Author: Andrew Bacon of the UConn Web Development Lab
-Author URI: http://andrewbacon.net
+Theme Name: Cornerstone
+Author: UConn Web Development Lab
 Description: Parent theme for University of Connecticut
-Version: 0.1
-License: GNU General Public License v2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+Version: 1
 Text Domain: cs
 */
 /* 
@@ -211,7 +207,7 @@ img {
 
 /*	PAGE
 --------------------------------------------------------------*/
-.page {
+#main {
   background-color: white;
   padding: 1em;
 }
@@ -225,11 +221,34 @@ img {
 
 /*	SINGLE
 --------------------------------------------------------------*/
+.widget-head,
+.widget-content {
+  background-color: white;
+  padding: 1em;
+}
+
 .comments-area {
   background-color: white;
   padding: 1em;
 }
 
+#footer {
+  margin: 1.5em 0;
+}
+
+#footer ul {
+  padding: 0;
+}
+
+#footer li {
+  display: inline;
+  margin-right: 1em;
+}
+
+#footer li:last-child {
+  margin-right: 0;
+}
+
 code {
   white-space: normal;
 }
@@ -318,6 +337,10 @@ code {
   word-wrap: break-word;
 }
 
+.nav-next {
+  text-align: right;
+}
+
 /*--------------------------------------------------------------
 11.0 Infinite scroll
 --------------------------------------------------------------*/
@@ -471,7 +494,6 @@ time, table mark, table audio, table video {
   padding: 0 !important;
   border: 0 !important;
   font-size: 100% !important;
-  font: inherit !important;
   vertical-align: baseline !important;
 }
 
diff --git a/style.scss b/style.scss
index 34a3905..25e9e1e 100644
--- a/style.scss
+++ b/style.scss
@@ -1,12 +1,8 @@
 /*
-Theme Name: cornerstone
-Theme URI: http://github.com/uconnwebdev/cornerstone
-Author: Andrew Bacon of the UConn Web Development Lab
-Author URI: http://andrewbacon.net
+Theme Name: Cornerstone
+Author: UConn Web Development Lab
 Description: Parent theme for University of Connecticut
-Version: 0.1
-License: GNU General Public License v2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+Version: 1
 Text Domain: cs
 */
 /* 
@@ -255,7 +251,7 @@ img {
 
 /*	PAGE
 --------------------------------------------------------------*/	
-.page {
+#main {
 	background-color: $contentBg;
 	padding: $contentPadding;
 }
@@ -273,7 +269,11 @@ img {
 
 
 
-
+.widget-head,
+.widget-content {
+	background-color: $contentBg;
+	padding: $contentPadding;
+}
 
 
 
@@ -283,6 +283,19 @@ img {
 	padding: $contentPadding;
 }
 
+#footer {
+	margin:1.5em 0;
+	}
+	#footer ul {
+		padding:0;
+		}
+		#footer li {
+			display:inline;
+			margin-right:1em;
+			}
+			#footer li:last-child {
+				margin-right:0;
+				}
 
 
 
@@ -299,6 +312,19 @@ code {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -387,6 +413,13 @@ code {
 .bypostauthor {
 }
 
+
+
+.nav-next {
+	text-align:right;
+	}
+
+
 /*--------------------------------------------------------------
 11.0 Infinite scroll
 --------------------------------------------------------------*/
@@ -529,7 +562,6 @@ time, table mark, table audio, table video {
 	padding: 0!important;
 	border: 0!important;
 	font-size: 100%!important;
-	font: inherit!important;
 	vertical-align: baseline!important;
 }
 /* HTML5 display-role reset for older browsers */