diff --git a/header.php b/header.php
index 26b5441..c811296 100644
--- a/header.php
+++ b/header.php
@@ -6,7 +6,7 @@
 <head>
 	<meta charset="utf-8">
 
-	<title><?php wp_title('|', true, 'right'); ?><?php bloginfo('name'); ?></title>
+	<title><?php wp_title('|', true, 'right'); bloginfo('name'); ?></title>
 	
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -23,42 +23,37 @@
 	<?php roots_head(); ?>
 
 	<script src="<?php echo get_template_directory_uri(); ?>/js/scripts.js"></script>
-	<?php
-		global $roots_options;
-		$google_analytics_id = $roots_options['google_analytics_id'];
-		if ($google_analytics_id !== '') { ?>
-
-	<script>
-		var _gaq=[['_setAccount','<?php echo esc_attr($roots_options['google_analytics_id']); ?>'],['_trackPageview'],['_trackPageLoadTime']];
-		(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
-		g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
-		s.parentNode.insertBefore(g,s)}(document,'script'));
-	</script>
-<?php } ?>
 </head>
+
 <body <?php $page_slug = $post->post_name; body_class($page_slug); ?>>
+
 	<?php roots_wrap_before(); ?>
 	<div id="wrap" class="container" role="document">
 	<?php roots_header_before(); ?>
 		<header id="banner" class="<?php global $roots_options; echo $roots_options['container_class']; ?>" role="banner">
 			<?php roots_header_inside(); ?>
 			<div class="container">
-				<a id="logo" href="<?php echo home_url(); ?>/"><img src="<?php echo get_template_directory_uri(); ?>/img/logo.png" width="300" height="75" alt="<?php bloginfo('name'); ?>"></a>
-			<?php if ($roots_options['clean_menu']) { ?>
-				<nav id="nav-main" role="navigation">
-					<?php wp_nav_menu(array('theme_location' => 'primary_navigation', 'walker' => new roots_nav_walker())); ?>
-				</nav>
-				<nav id="nav-utility">
-					<?php wp_nav_menu(array('theme_location' => 'utility_navigation', 'walker' => new roots_nav_walker())); ?>
-				</nav>				
-			<?php } else { ?>
-				<nav id="nav-main" role="navigation">
-					<?php wp_nav_menu(array('theme_location' => 'primary_navigation')); ?>
-				</nav>
-				<nav id="nav-utility">
-					<?php wp_nav_menu(array('theme_location' => 'utility_navigation')); ?>
-				</nav>				
-			<?php } ?>
+	
+				<a id="logo" href="<?php echo home_url(); ?>/">
+					<img src="<?php echo get_template_directory_uri(); ?>/img/logo.png" width="300" height="75" alt="<?php bloginfo('name'); ?>">
+				</a>
+				
+				<?php if ($roots_options['clean_menu']) { ?>
+					<nav id="nav-main" role="navigation">
+						<?php wp_nav_menu(array('theme_location' => 'primary_navigation', 'walker' => new roots_nav_walker())); ?>
+					</nav>
+					<nav id="nav-utility">
+						<?php wp_nav_menu(array('theme_location' => 'utility_navigation', 'walker' => new roots_nav_walker())); ?>
+					</nav>				
+				<?php } else { ?>
+					<nav id="nav-main" role="navigation">
+						<?php wp_nav_menu(array('theme_location' => 'primary_navigation')); ?>
+					</nav>
+					<nav id="nav-utility">
+						<?php wp_nav_menu(array('theme_location' => 'utility_navigation')); ?>
+					</nav>				
+				<?php } ?>
+			
 			</div>
 		</header>
 	<?php roots_header_after(); ?>
diff --git a/inc/roots-actions.php b/inc/roots-actions.php
index a441971..ad8f479 100644
--- a/inc/roots-actions.php
+++ b/inc/roots-actions.php
@@ -1,5 +1,6 @@
 <?php 
 
+add_action('roots_head', 'roots_google_analytics');
 add_action('roots_head', 'roots_1140_head');
 add_action('roots_head', 'roots_adapt_head');
 add_action('roots_header_before', 'roots_1140_header_before');
@@ -8,12 +9,26 @@ add_action('roots_footer_before', 'roots_1140_footer_before');
 add_action('roots_footer_after', 'roots_1140_footer_after');
 add_action('roots_post_inside_before', 'roots_page_breadcrumb');
 
+function roots_google_analytics() {
+	global $roots_options;
+	$google_analytics_id = $roots_options['google_analytics_id'];
+	$get_google_analytics_id = esc_attr($roots_options['google_analytics_id']);
+	if ($google_analytics_id !== '') {
+		echo "\n\t<script>\n";
+		echo "\t\tvar _gaq=[['_setAccount','$get_google_analytics_id'],['_trackPageview'],['_trackPageLoadTime']];\n";
+		echo "\t\t(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;\n";
+		echo "\t\tg.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';\n";
+		echo "\t\ts.parentNode.insertBefore(g,s)}(document,'script'));\n";
+		echo "\t</script>\n";
+	}	
+}
+
 function roots_1140_head() {
 	global $roots_options;
 	$roots_css_framework = $roots_options['css_framework'];
 	$template_uri = get_template_directory_uri();
 	if ($roots_css_framework === '1140') {
-		echo "<script src=\"$template_uri/js/libs/css3-mediaqueries.js\"></script>";
+		echo "\t<script src=\"$template_uri/js/libs/css3-mediaqueries.js\"></script>";
 	}	
 }
 
@@ -22,21 +37,21 @@ function roots_adapt_head() {
 	$roots_css_framework = $roots_options['css_framework'];
 	$template_uri = get_template_directory_uri();
 	if ($roots_css_framework === 'adapt') {
-		echo "<script>\n";
-		echo "var ADAPT_CONFIG = {\n";
-		echo "	path: '/css/adapt/',\n";
-		echo "	dynamic: true,\n";
-		echo "	range: [\n";
-		echo "		'0px    to 760px  = mobile.css',\n";
-		echo "		'760px  to 980px  = 720.css',\n";
-		echo "		'980px  to 1280px = 960.css',\n";
-		echo "		'1280px to 1600px = 1200.css',\n";
-		echo "		'1600px to 1920px = 1560.css',\n";
-		echo "		'1920px           = fluid.css'\n";
-		echo "	]\n";
-		echo "};\n";	
-		echo "</script>\n";
-		echo "<script src=\"$template_uri/js/libs/adapt.min.js\"></script>";
+		echo "\n\t<script>\n";
+		echo "\t\tvar ADAPT_CONFIG = {\n";
+		echo "\t\t\tpath: '/css/adapt/',\n";
+		echo "\t\t\tdynamic: true,\n";
+		echo "\t\t\trange: [\n";
+		echo "\t\t\t\t'0px    to 760px  = mobile.css',\n";
+		echo "\t\t\t\t'760px  to 980px  = 720.css',\n";
+		echo "\t\t\t\t'980px  to 1280px = 960.css',\n";
+		echo "\t\t\t\t'1280px to 1600px = 1200.css',\n";
+		echo "\t\t\t\t'1600px to 1920px = 1560.css',\n";
+		echo "\t\t\t\t'1920px           = fluid.css'\n";
+		echo "\t\t\t]\n";
+		echo "\t\t};\n";	
+		echo "\t</script>\n";
+		echo "\t<script src=\"$template_uri/js/libs/adapt.min.js\"></script>";
 	}	
 }
 
@@ -44,7 +59,7 @@ function roots_1140_header_before() {
 	global $roots_options;
 	$roots_css_framework = $roots_options['css_framework'];
 	if ($roots_css_framework === '1140') {
-		echo "<div class=\"row\">";
+		echo "<div class=\"row\">\n";
 	}	
 }
 
@@ -52,8 +67,8 @@ function roots_1140_header_after() {
 	global $roots_options;
 	$roots_css_framework = $roots_options['css_framework'];
 	if ($roots_css_framework === '1140') {
-		echo "</div><!-- /.row -->";
-		echo "<div class=\"row\">";
+		echo "</div><!-- /.row -->\n";
+		echo "<div class=\"row\">\n";
 	}	
 }
 
@@ -61,8 +76,8 @@ function roots_1140_footer_before() {
 	global $roots_options;
 	$roots_css_framework = $roots_options['css_framework'];
 	if ($roots_css_framework === '1140') {
-		echo "</div><!-- /.row -->";
-		echo "<div class=\"row\">";
+		echo "</div><!-- /.row -->\n";
+		echo "<div class=\"row\">\n";
 	}	
 }
 
@@ -70,7 +85,7 @@ function roots_1140_footer_after() {
 	global $roots_options;
 	$roots_css_framework = $roots_options['css_framework'];
 	if ($roots_css_framework === '1140') {
-		echo "</div><!-- /.row -->";
+		echo "</div><!-- /.row -->\n";
 	}	
 }
 
