diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb
index 9b346c4d54..1e2f4d44c8 100644
--- a/website/source/layouts/_header.erb
+++ b/website/source/layouts/_header.erb
@@ -1,71 +1,58 @@
 <!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="description" content="Service discovery and configuration made easy. Distributed, highly available, and datacenter-aware.">
-
-<link rel="shortcut icon" href="<%= image_path('favicon.png') %>">
-
-<title><%= current_page.data.page_title ? "#{current_page.data.page_title} - " : "" %>Consul</title>
-
-<!-- Bootstrap core CSS -->
-<%= stylesheet_link_tag "application" %>
-
-<!-- google fonts -->
-<!-- <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700' rel='stylesheet' type='text/css'>
- -->
-
- <!-- typekit -->
- <script type="text/javascript" src="//use.typekit.net/kgv0shi.js"></script>
- <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-
-<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-<!--[if lt IE 9]>
-	<%= javascript_include_tag "html5shiv", "respond.min" %>
-<![endif]-->
 
-<%= yield_content :head %>
-
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-50021714-1', 'consul.io');
-  ga('send', 'pageview');
-
-</script>
-</head>
-<body class="page-<%= current_page.data.page_title ? "#{current_page.data.page_title} layout-#{current_page.data.layout} page-sub" : "home layout-#{current_page.data.layout}" %>">
-<div id="header" class="<%= current_page.data.page_title == "home" ? "" : "navbar-static-top" %>">
-	<div class="container">
-		<div class="navbar-header">
-		    <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
-	          <span class="sr-only">Toggle navigation</span>
-	          <span class="icon-bar"></span>
-	          <span class="icon-bar"></span>
-	          <span class="icon-bar"></span>
-	        </button>
-			<a class="navbar-brand logo" href="/">
-				<span></span>
-			</a>
-		</div>
-
-		<nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
-			<ul class="buttons nav navbar-nav navbar-right rls-sb">
-				<li class="first download outline-btn"><a href="/downloads.html">Download</a></li>
-				<li class="github outline-btn"><a href="https://github.com/hashicorp/consul">Github</a></li>
-			</ul>
-
-			<ul class="main-links nav navbar-nav navbar-right rls-sb">
-				<li class="first li-under"><a href="/intro/index.html">Intro</a></li>
-				<li class="li-under"><a href="/docs/index.html">Docs</a></li>
-                <li class="li-under"><a href="/community.html">Community</a></li>
-				<li class="li-under"><a href="http://demo.consul.io/">Demo</a></li>
-			</ul>
-		</nav>
-
-	</div>
-</div>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+
+    <title><%= current_page.data.page_title ? "#{current_page.data.page_title} - " : "" %>Consul</title>
+    <meta name="description" content="Service discovery and configuration made easy. Distributed, highly available, and datacenter-aware.">
+    <meta name="description" content="<%#= page_description %>" />
+    <meta name="keywords" content="<%#= (current_page.data.tags || ['Seth', 'Vargo', 'Chef', 'Ruby']).join(', ') %>" />
+
+    <%= stylesheet_link_tag "application" %>
+
+    <meta name="HandheldFriendly" content="True" />
+    <meta name="MobileOptimized" content="320" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="white">
+
+    <link rel="shortcut icon" href="<%= image_path('favicon.png') %>">
+
+    <script type="text/javascript" src="//use.typekit.net/kgv0shi.js"></script>
+    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+
+    <%= yield_content :head %>
+  </head>
+
+  <body class="page-<%= current_page.data.page_title ? "#{current_page.data.page_title} layout-#{current_page.data.layout} page-sub" : "home layout-#{current_page.data.layout}" %>">
+    <div id="header" class="<%= current_page.data.page_title == "home" ? "" : "navbar-static-top" %>">
+    	<div class="container">
+    		<div class="navbar-header">
+    		  <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+    			<a class="navbar-brand logo" href="/">
+    				<span></span>
+    			</a>
+    		</div>
+
+    		<nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
+    			<ul class="buttons nav navbar-nav navbar-right rls-sb">
+    				<li class="first download outline-btn"><a href="/downloads.html">Download</a></li>
+    				<li class="github outline-btn"><a href="https://github.com/hashicorp/consul">Github</a></li>
+    			</ul>
+
+    			<ul class="main-links nav navbar-nav navbar-right rls-sb">
+    				<li class="first li-under"><a href="/intro/index.html">Intro</a></li>
+    				<li class="li-under"><a href="/docs/index.html">Docs</a></li>
+            <li class="li-under"><a href="/community.html">Community</a></li>
+    				<li class="li-under"><a href="http://demo.consul.io/">Demo</a></li>
+    			</ul>
+    		</nav>
+    	</div>
+    </div>
