diff --git a/static/css/quay.css b/static/css/quay.css
index bf3f1124a..871a82f26 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -673,8 +673,8 @@ form input.ng-valid.ng-dirty,
   text-align: center;
 }
 
-#repoSearch {
-  width: 300px;
+.repo-search-box {
+  width: 240px;
 }
 
 .repo-mini-listing {
diff --git a/static/partials/header.html b/static/directives/header-bar.html
similarity index 95%
rename from static/partials/header.html
rename to static/directives/header-bar.html
index 1bb22afbf..169c9bf06 100644
--- a/static/partials/header.html
+++ b/static/directives/header-bar.html
@@ -22,10 +22,10 @@
 
   
   <ul class="nav navbar-nav navbar-right" ng-switch on="user.anonymous">
-    <li>
+    <li>  
       <form class="navbar-form navbar-left" role="search">
         <div class="form-group">
-          <input id="repoSearch" type="text" class="form-control" placeholder="Find Repo">
+          <span class="repo-search"></span>
         </div>
       </form>
       
diff --git a/static/directives/markdown-view.html b/static/directives/markdown-view.html
index fe915b857..c47184387 100644
--- a/static/directives/markdown-view.html
+++ b/static/directives/markdown-view.html
@@ -1 +1 @@
-<span class="markdown-view-content" ng-bind-html-unsafe="getMarkedDown(content, firstLineOnly)"></span>
+<span class="markdown-view-content" ng-bind-html="getMarkedDown(content, firstLineOnly)"></span>
diff --git a/static/directives/repo-search.html b/static/directives/repo-search.html
new file mode 100644
index 000000000..2f313db34
--- /dev/null
+++ b/static/directives/repo-search.html
@@ -0,0 +1 @@
+<input type="text" class="form-control repo-search-box" placeholder="Find Repo">
diff --git a/static/js/app.js b/static/js/app.js
index 13b63a5b6..4a784f92c 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -47,7 +47,7 @@ function getMarkedDown(string) {
 }
 
 // Start the application code itself.
-quayApp = angular.module('quay', ['restangular', 'angularMoment', 'angulartics', 'angulartics.mixpanel', '$strap.directives', 'ngCookies'], function($provide) {
+quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'angulartics', 'angulartics.mixpanel', '$strap.directives', 'ngCookies'], function($provide) {
     $provide.factory('UserService', ['Restangular', function(Restangular) {
       var userResponse = {
         verified: false,
@@ -399,22 +399,23 @@ quayApp = angular.module('quay', ['restangular', 'angularMoment', 'angulartics',
       when('/repository/:namespace/:name/tag/:tag', {templateUrl: '/static/partials/view-repo.html', controller: RepoCtrl}).
       when('/repository/:namespace/:name/image/:image', {templateUrl: '/static/partials/image-view.html', controller: ImageViewCtrl}).
       when('/repository/:namespace/:name/admin', {templateUrl: '/static/partials/repo-admin.html', controller:RepoAdminCtrl}).
-      when('/repository/', {title: 'Repositories', templateUrl: '/static/partials/repo-list.html', controller: RepoListCtrl}).
-      when('/user/', {title: 'Account Settings', templateUrl: '/static/partials/user-admin.html', controller: UserAdminCtrl}).
-      when('/guide/', {title: 'Guide', templateUrl: '/static/partials/guide.html', controller: GuideCtrl}).
-      when('/plans/', {title: 'Plans and Pricing', templateUrl: '/static/partials/plans.html', controller: PlansCtrl}).
-      when('/signin/', {title: 'Sign In', templateUrl: '/static/partials/signin.html', controller: SigninCtrl}).
-      when('/new/', {title: 'Create new repository', templateUrl: '/static/partials/new-repo.html', controller: NewRepoCtrl}).
-
-      when('/organizations/', {title: 'Organizations', templateUrl: '/static/partials/organizations.html', controller: OrgsCtrl}).
-      when('/organizations/new/', {title: 'New Organization', templateUrl: '/static/partials/new-organization.html', controller: NewOrgCtrl}).
-
+      when('/repository/', {title: 'Repositories', description: 'Public and private docker repositories list',
+                            templateUrl: '/static/partials/repo-list.html', controller: RepoListCtrl}).
+      when('/user/', {title: 'Account Settings', description:'Account settings for Quay', templateUrl: '/static/partials/user-admin.html', controller: UserAdminCtrl}).
+      when('/guide/', {title: 'Guide', description:'Guide to using private docker repositories on Quay', templateUrl: '/static/partials/guide.html', controller: GuideCtrl}).
+      when('/plans/', {title: 'Plans and Pricing', description: 'Plans and pricing for private docker repositories on Quay',
+                       templateUrl: '/static/partials/plans.html', controller: PlansCtrl}).
+      when('/signin/', {title: 'Sign In', description: 'Sign into Quay', templateUrl: '/static/partials/signin.html', controller: SigninCtrl}).
+      when('/new/', {title: 'Create new repository', description: 'Create a new public or private docker repository, optionally constructing from a dockerfile',
+                     templateUrl: '/static/partials/new-repo.html', controller: NewRepoCtrl}).
+      when('/organizations/', {title: 'Organizations', description: 'Private docker repository hosting for businesses and organizations',
+                                 templateUrl: '/static/partials/organizations.html', controller: OrgsCtrl}).
+      when('/organizations/new/', {title: 'New Organization', description: 'Create a new organization on Quay',
+                                   templateUrl: '/static/partials/new-organization.html', controller: NewOrgCtrl}).
       when('/organization/:orgname', {templateUrl: '/static/partials/org-view.html', controller: OrgViewCtrl}).
       when('/organization/:orgname/admin', {templateUrl: '/static/partials/org-admin.html', controller: OrgAdminCtrl}).
       when('/organization/:orgname/teams/:teamname', {templateUrl: '/static/partials/team-view.html', controller: TeamViewCtrl}).
-
       when('/v1/', {title: 'Activation information', templateUrl: '/static/partials/v1-page.html', controller: V1Ctrl}).
-
       when('/', {title: 'Hosted Private Docker Registry', templateUrl: '/static/partials/landing.html', controller: LandingCtrl}).
       otherwise({redirectTo: '/'});
   }]).
@@ -434,12 +435,12 @@ quayApp.directive('markdownView', function () {
       'content': '=content',
       'firstLineOnly': '=firstLineOnly'
     },
-    controller: function($scope, $element) {
+    controller: function($scope, $element, $sce) {
       $scope.getMarkedDown = function(content, firstLineOnly) {
         if (firstLineOnly) {
           content = getFirstTextLine(content);
         }
-        return getMarkedDown(content);
+        return $sce.trustAsHtml(getMarkedDown(content));
       };
     }
   };
@@ -595,6 +596,103 @@ quayApp.directive('markdownInput', function () {
 });
 
 
+quayApp.directive('repoSearch', function () {
+  var number = 0;
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/repo-search.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+    },
+    controller: function($scope, $element, $location, UserService, Restangular) {
+      var searchToken = 0;
+      $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
+        ++searchToken;
+      }, true);
+        
+      var element = $($element[0].childNodes[0]);
+      element.typeahead({
+        name: 'repositories',
+        remote: {
+          url: '/api/find/repository?query=%QUERY',
+          replace: function (url, uriEncodedQuery) {
+            url = url.replace('%QUERY', uriEncodedQuery);              
+            url += '&cb=' + searchToken;
+            return url;
+          },
+          filter: function(data) {
+            var datums = [];
+            for (var i = 0; i < data.repositories.length; ++i) {
+              var repo = data.repositories[i];
+              datums.push({
+                'value': repo.name,
+                'tokens': [repo.name, repo.namespace],
+                'repo': repo
+              });
+            }
+            return datums;
+          }
+        },
+        template: function (datum) {
+          template = '<div class="repo-mini-listing">';
+          template += '<i class="fa fa-hdd fa-lg"></i>'
+          template += '<span class="name">' + datum.repo.namespace +'/' + datum.repo.name + '</span>'
+          if (datum.repo.description) {
+            template += '<span class="description">' + getFirstTextLine(datum.repo.description) + '</span>'
+          }
+
+          template += '</div>'
+          return template;
+        }
+      });
+
+      element.on('typeahead:selected', function (e, datum) {
+        element.typeahead('setQuery', '');
+        document.location = '/repository/' + datum.repo.namespace + '/' + datum.repo.name;
+      });
+    }
+  };
+  return directiveDefinitionObject;
+});
+
+
+quayApp.directive('headerBar', function () {
+  var number = 0;
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/header-bar.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+    },
+    controller: function($scope, $element, $location, UserService, Restangular) {
+      $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
+        $scope.user = currentUser;
+      }, true);
+        
+      $scope.signout = function() {
+        var signoutPost = Restangular.one('signout');
+        signoutPost.customPOST().then(function() {
+            UserService.load();
+            $location.path('/');
+        });
+      };
+        
+      $scope.appLinkTarget = function() {
+        if ($("div[ng-view]").length === 0) {
+            return "_self";
+        }
+        return "";
+      };
+    }
+  };
+  return directiveDefinitionObject;
+});
+
+
 quayApp.directive('entitySearch', function () {
   var number = 0;
   var directiveDefinitionObject = {
@@ -1068,6 +1166,12 @@ quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', '$http',
     if (current.$$route.title) {
       $rootScope.title = current.$$route.title;
     }
+
+    if (current.$$route.description) {
+      $rootScope.description = current.$$route.description;
+    } else {
+      $rootScope.description = 'Hosted private docker repositories. Includes full user management and history. Free for public repositories.';
+    }
   });
 
   var initallyChecked = false;
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 8bba4f712..5e39f7fb7 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -1,5 +1,6 @@
 $.fn.clipboardCopy = function() { 
-  var clip = new ZeroClipboard($(this),  { 'moviePath': 'static/lib/ZeroClipboard.swf' });
+  var clip = new ZeroClipboard($(this),  { 'moviePath': 'static/lib/ZeroClipboard.swf' });  
+
   clip.on('complete', function() {
     // Resets the animation.
     var elem = $('#clipboardCopied')[0];
@@ -14,74 +15,6 @@ $.fn.clipboardCopy = function() {
   });
 };
 
-function HeaderCtrl($scope, $location, UserService, Restangular) {
-  var searchToken = 0;
-
-  $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {    
-    $scope.user = currentUser;
-    ++searchToken;
-  }, true);
-
-  $scope.signout = function() {
-    var signoutPost = Restangular.one('signout');
-    signoutPost.customPOST().then(function() {
-      UserService.load();
-      $location.path('/');
-    });
-  };
-
-  $scope.appLinkTarget = function() {
-    if ($("div[ng-view]").length === 0) {
-      return "_self";
-    }
-    return "";
-  };
-
-  $scope.$on('$includeContentLoaded', function() {
-    // THIS IS BAD, MOVE THIS TO A DIRECTIVE
-    $('#repoSearch').typeahead({
-        name: 'repositories',
-        remote: {
-          url: '/api/find/repository?query=%QUERY',
-          replace: function (url, uriEncodedQuery) {
-            url = url.replace('%QUERY', uriEncodedQuery);              
-            url += '&cb=' + searchToken;
-            return url;
-          },
-          filter: function(data) {
-            var datums = [];
-            for (var i = 0; i < data.repositories.length; ++i) {
-              var repo = data.repositories[i];
-              datums.push({
-                'value': repo.name,
-                'tokens': [repo.name, repo.namespace],
-                'repo': repo
-              });
-            }
-            return datums;
-          }
-        },
-        template: function (datum) {
-          template = '<div class="repo-mini-listing">';
-          template += '<i class="fa fa-hdd fa-lg"></i>'
-          template += '<span class="name">' + datum.repo.namespace +'/' + datum.repo.name + '</span>'
-          if (datum.repo.description) {
-            template += '<span class="description">' + getFirstTextLine(datum.repo.description) + '</span>'
-          }
-
-          template += '</div>'
-          return template;
-        },
-
-    });
-
-    $('#repoSearch').on('typeahead:selected', function (e, datum) {
-        $('#repoSearch').typeahead('setQuery', '');
-        document.location = '/repository/' + datum.repo.namespace + '/' + datum.repo.name
-    });
-  });
-}
-
 function SigninCtrl($scope, $location, $timeout, Restangular, KeyService, UserService) {
   $scope.sendRecovery = function() {
     var signinPost = Restangular.one('recovery');
@@ -307,6 +240,11 @@ function RepoCtrl($scope, Restangular, $routeParams, $rootScope, $location, $tim
     var repositoryFetch = Restangular.one('repository/' + namespace + '/' + name);
     repositoryFetch.get().then(function(repo) {
       $rootScope.title = namespace + '/' + name;
+      
+      var kind = repo.is_public ? 'public' : 'private';
+      $rootScope.description = jQuery(getFirstTextLine(repo.description)).text() ||
+        'View of a ' + kind + ' docker repository on Quay';
+
       $scope.repo = repo;
 
       $scope.setTag($routeParams.tag);
@@ -666,6 +604,8 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
     var permissionsFetch = Restangular.one('repository/' + namespace + '/' + name + '/permissions/' + kind + '/');
     permissionsFetch.get().then(function(resp) {
       $rootScope.title = 'Settings - ' + namespace + '/' + name;
+      $rootScope.description = 'Administrator settings for ' + namespace + '/' + name +
+          ': Permissions, web hooks and other settings';
       $scope.permissions[kind] = resp.permissions;
       checkLoading();
     }, function() {
@@ -890,6 +830,8 @@ function ImageViewCtrl($scope, $routeParams, $rootScope, Restangular) {
     };
     $scope.image = image;
     $rootScope.title = 'View Image - ' + image.id;
+    $rootScope.description = 'Viewing docker image ' + image.id + ' under repository ' + namespace + '/' + name +
+        ': Image changes tree and list view';
   }, function() {
     $rootScope.title = 'Unknown Image';
     $scope.loading = false;
@@ -1068,13 +1010,14 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, Restangula
 
   $scope.upgradePlan = function() {
     var callbacks = {
+      'started': function() { $scope.planChanging = true; },
       'opened': function() { $scope.planChanging = true; },
       'closed': function() { $scope.planChanging = false; },
       'success': subscribedToPlan,
       'failure': function() { $('#couldnotsubscribeModal').modal(); $scope.planChanging = false; }
     };
 
-    PlanService.changePlan($scope, null, $scope.planRequired.stripeId, null, callbacks);
+    PlanService.changePlan($scope, null, $scope.planRequired.stripeId, callbacks);
   };
  
   // Watch the namespace on the repo. If it changes, we update the plan and the public/private
@@ -1128,6 +1071,7 @@ function OrgViewCtrl($rootScope, $scope, Restangular, $routeParams) {
       $scope.loading = false;
 
       $rootScope.title = orgname;
+      $rootScope.description = 'Viewing organization ' + orgname;
     }, function() {
       $scope.loading = false;
     });
@@ -1279,6 +1223,7 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
       if (resp && resp.is_admin) {
         $scope.organization = resp;
         $rootScope.title = orgname + ' (Admin)';
+        $rootScope.description = 'Administration page for organization ' + orgname;
       }
 
       $scope.loading = false;
@@ -1356,6 +1301,7 @@ function TeamViewCtrl($rootScope, $scope, Restangular, $routeParams) {
       $scope.canEditMembers = resp.can_edit;
       $scope.loading = !$scope.organization || !$scope.members;
       $rootScope.title = teamname + ' (' + orgname + ')';
+      $rootScope.description = 'Team management page for team ' + teamname + ' under organization ' + orgname;
     }, function() {
       $scope.organization = null;
       $scope.members = null;
diff --git a/static/lib/ZeroClipboard.min.js b/static/lib/ZeroClipboard.min.js
index 32535fddf..bfea72566 100755
--- a/static/lib/ZeroClipboard.min.js
+++ b/static/lib/ZeroClipboard.min.js
@@ -1,8 +1,9 @@
 /*!
- * zeroclipboard
- * The Zero Clipboard library provides an easy way to copy text to the clipboard using an invisible Adobe Flash movie, and a JavaScript interface.
- * Copyright 2012 Jon Rohan, James M. Greene, .
- * Released under the MIT license
- * http://jonrohan.github.com/ZeroClipboard/
- * v1.1.7
- */(function(){"use strict";var a=function(a,b){var c=a.style[b];a.currentStyle?c=a.currentStyle[b]:window.getComputedStyle&&(c=document.defaultView.getComputedStyle(a,null).getPropertyValue(b));if(c=="auto"&&b=="cursor"){var d=["a"];for(var e=0;e<d.length;e++)if(a.tagName.toLowerCase()==d[e])return"pointer"}return c},b=function(a){if(!l.prototype._singleton)return;a||(a=window.event);var b;this!==window?b=this:a.target?b=a.target:a.srcElement&&(b=a.srcElement),l.prototype._singleton.setCurrent(b)},c=function(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent&&a.attachEvent("on"+b,c)},d=function(a,b,c){a.removeEventListener?a.removeEventListener(b,c,!1):a.detachEvent&&a.detachEvent("on"+b,c)},e=function(a,b){if(a.addClass)return a.addClass(b),a;if(b&&typeof b=="string"){var c=(b||"").split(/\s+/);if(a.nodeType===1)if(!a.className)a.className=b;else{var d=" "+a.className+" ",e=a.className;for(var f=0,g=c.length;f<g;f++)d.indexOf(" "+c[f]+" ")<0&&(e+=" "+c[f]);a.className=e.replace(/^\s+|\s+$/g,"")}}return a},f=function(a,b){if(a.removeClass)return a.removeClass(b),a;if(b&&typeof b=="string"||b===undefined){var c=(b||"").split(/\s+/);if(a.nodeType===1&&a.className)if(b){var d=(" "+a.className+" ").replace(/[\n\t]/g," ");for(var e=0,f=c.length;e<f;e++)d=d.replace(" "+c[e]+" "," ");a.className=d.replace(/^\s+|\s+$/g,"")}else a.className=""}return a},g=function(b){var c={left:0,top:0,width:b.width||b.offsetWidth||0,height:b.height||b.offsetHeight||0,zIndex:9999},d=a(b,"zIndex");d&&d!="auto"&&(c.zIndex=parseInt(d,10));while(b){var e=parseInt(a(b,"borderLeftWidth"),10),f=parseInt(a(b,"borderTopWidth"),10);c.left+=isNaN(b.offsetLeft)?0:b.offsetLeft,c.left+=isNaN(e)?0:e,c.top+=isNaN(b.offsetTop)?0:b.offsetTop,c.top+=isNaN(f)?0:f,b=b.offsetParent}return c},h=function(a){return(a.indexOf("?")>=0?"&":"?")+"nocache="+(new Date).getTime()},i=function(a){var b=[];return a.trustedDomains&&(typeof a.trustedDomains=="string"?b.push("trustedDomain="+a.trustedDomains):b.push("trustedDomain="+a.trustedDomains.join(","))),b.join("&")},j=function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},k=function(a){if(typeof a=="string")throw new TypeError("ZeroClipboard doesn't accept query strings.");return a.length?a:[a]},l=function(a,b){a&&(l.prototype._singleton||this).glue(a);if(l.prototype._singleton)return l.prototype._singleton;l.prototype._singleton=this,this.options={};for(var c in o)this.options[c]=o[c];for(var d in b)this.options[d]=b[d];this.handlers={},l.detectFlashSupport()&&p()},m,n=[];l.prototype.setCurrent=function(b){m=b,this.reposition(),b.getAttribute("title")&&this.setTitle(b.getAttribute("title")),this.setHandCursor(a(b,"cursor")=="pointer")},l.prototype.setText=function(a){a&&a!==""&&(this.options.text=a,this.ready()&&this.flashBridge.setText(a))},l.prototype.setTitle=function(a){a&&a!==""&&this.htmlBridge.setAttribute("title",a)},l.prototype.setSize=function(a,b){this.ready()&&this.flashBridge.setSize(a,b)},l.prototype.setHandCursor=function(a){this.ready()&&this.flashBridge.setHandCursor(a)},l.version="1.1.7";var o={moviePath:"ZeroClipboard.swf",trustedDomains:null,text:null,hoverClass:"zeroclipboard-is-hover",activeClass:"zeroclipboard-is-active",allowScriptAccess:"sameDomain"};l.setDefaults=function(a){for(var b in a)o[b]=a[b]},l.destroy=function(){l.prototype._singleton.unglue(n);var a=l.prototype._singleton.htmlBridge;a.parentNode.removeChild(a),delete l.prototype._singleton},l.detectFlashSupport=function(){var a=!1;try{new ActiveXObject("ShockwaveFlash.ShockwaveFlash")&&(a=!0)}catch(b){navigator.mimeTypes["application/x-shockwave-flash"]&&(a=!0)}return a};var p=function(){var a=l.prototype._singleton,b=document.getElementById("global-zeroclipboard-html-bridge");if(!b){var c='      <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="global-zeroclipboard-flash-bridge" width="100%" height="100%">         <param name="movie" value="'+a.options.moviePath+h(a.options.moviePath)+'"/>         <param name="allowScriptAccess" value="'+a.options.allowScriptAccess+'"/>         <param name="scale" value="exactfit"/>         <param name="loop" value="false"/>         <param name="menu" value="false"/>         <param name="quality" value="best" />         <param name="bgcolor" value="#ffffff"/>         <param name="wmode" value="transparent"/>         <param name="flashvars" value="'+i(a.options)+'"/>         <embed src="'+a.options.moviePath+h(a.options.moviePath)+'"           loop="false" menu="false"           quality="best" bgcolor="#ffffff"           width="100%" height="100%"           name="global-zeroclipboard-flash-bridge"           allowScriptAccess="always"           allowFullScreen="false"           type="application/x-shockwave-flash"           wmode="transparent"           pluginspage="http://www.macromedia.com/go/getflashplayer"           flashvars="'+i(a.options)+'"           scale="exactfit">         </embed>       </object>';b=document.createElement("div"),b.id="global-zeroclipboard-html-bridge",b.setAttribute("class","global-zeroclipboard-container"),b.setAttribute("data-clipboard-ready",!1),b.style.position="absolute",b.style.left="-9999px",b.style.top="-9999px",b.style.width="15px",b.style.height="15px",b.style.zIndex="9999",b.innerHTML=c,document.body.appendChild(b)}a.htmlBridge=b,a.flashBridge=document["global-zeroclipboard-flash-bridge"]||b.children[0].lastElementChild};l.prototype.resetBridge=function(){this.htmlBridge.style.left="-9999px",this.htmlBridge.style.top="-9999px",this.htmlBridge.removeAttribute("title"),this.htmlBridge.removeAttribute("data-clipboard-text"),f(m,this.options.activeClass),m=null,this.options.text=null},l.prototype.ready=function(){var a=this.htmlBridge.getAttribute("data-clipboard-ready");return a==="true"||a===!0},l.prototype.reposition=function(){if(!m)return!1;var a=g(m);this.htmlBridge.style.top=a.top+"px",this.htmlBridge.style.left=a.left+"px",this.htmlBridge.style.width=a.width+"px",this.htmlBridge.style.height=a.height+"px",this.htmlBridge.style.zIndex=a.zIndex+1,this.setSize(a.width,a.height)},l.dispatch=function(a,b){l.prototype._singleton.receiveEvent(a,b)},l.prototype.on=function(a,b){var c=a.toString().split(/\s/g);for(var d=0;d<c.length;d++)a=c[d].toLowerCase().replace(/^on/,""),this.handlers[a]||(this.handlers[a]=b);this.handlers.noflash&&!l.detectFlashSupport()&&this.receiveEvent("onNoFlash",null)},l.prototype.addEventListener=l.prototype.on,l.prototype.off=function(a,b){var c=a.toString().split(/\s/g);for(var d=0;d<c.length;d++){a=c[d].toLowerCase().replace(/^on/,"");for(var e in this.handlers)e===a&&this.handlers[e]===b&&delete this.handlers[e]}},l.prototype.removeEventListener=l.prototype.off,l.prototype.receiveEvent=function(a,b){a=a.toString().toLowerCase().replace(/^on/,"");var c=m;switch(a){case"load":if(b&&parseFloat(b.flashVersion.replace(",",".").replace(/[^0-9\.]/gi,""))<10){this.receiveEvent("onWrongFlash",{flashVersion:b.flashVersion});return}this.htmlBridge.setAttribute("data-clipboard-ready",!0);break;case"mouseover":e(c,this.options.hoverClass);break;case"mouseout":f(c,this.options.hoverClass),this.resetBridge();break;case"mousedown":e(c,this.options.activeClass);break;case"mouseup":f(c,this.options.activeClass);break;case"datarequested":var d=c.getAttribute("data-clipboard-target"),g=d?document.getElementById(d):null;if(g){var h=g.value||g.textContent||g.innerText;h&&this.setText(h)}else{var i=c.getAttribute("data-clipboard-text");i&&this.setText(i)}break;case"complete":this.options.text=null}if(this.handlers[a]){var j=this.handlers[a];typeof j=="function"?j.call(c,this,b):typeof j=="string"&&window[j].call(c,this,b)}},l.prototype.glue=function(a){a=k(a);for(var d=0;d<a.length;d++)j(a[d],n)==-1&&(n.push(a[d]),c(a[d],"mouseover",b))},l.prototype.unglue=function(a){a=k(a);for(var c=0;c<a.length;c++){d(a[c],"mouseover",b);var e=j(a[c],n);e!=-1&&n.splice(e,1)}},typeof module!="undefined"?module.exports=l:typeof define=="function"&&define.amd?define(function(){return l}):window.ZeroClipboard=l})();
\ No newline at end of file
+* ZeroClipboard
+* The ZeroClipboard library provides an easy way to copy text to the clipboard using an invisible Adobe Flash movie and a JavaScript interface.
+* Copyright (c) 2013 Jon Rohan, James M. Greene
+* Licensed MIT
+* http://zeroclipboard.org/
+* v1.2.3
+*/
+!function(){"use strict";var a,b=function(){var a=/\-([a-z])/g,b=function(a,b){return b.toUpperCase()};return function(c){return c.replace(a,b)}}(),c=function(a,c){var d,e,f,g,h,i;if(window.getComputedStyle?d=window.getComputedStyle(a,null).getPropertyValue(c):(e=b(c),d=a.currentStyle?a.currentStyle[e]:a.style[e]),"cursor"===c&&(!d||"auto"===d))for(f=a.tagName.toLowerCase(),g=["a"],h=0,i=g.length;i>h;h++)if(f===g[h])return"pointer";return d},d=function(a){if(p.prototype._singleton){a||(a=window.event);var b;this!==window?b=this:a.target?b=a.target:a.srcElement&&(b=a.srcElement),p.prototype._singleton.setCurrent(b)}},e=function(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent&&a.attachEvent("on"+b,c)},f=function(a,b,c){a.removeEventListener?a.removeEventListener(b,c,!1):a.detachEvent&&a.detachEvent("on"+b,c)},g=function(a,b){if(a.addClass)return a.addClass(b),a;if(b&&"string"==typeof b){var c=(b||"").split(/\s+/);if(1===a.nodeType)if(a.className){for(var d=" "+a.className+" ",e=a.className,f=0,g=c.length;g>f;f++)d.indexOf(" "+c[f]+" ")<0&&(e+=" "+c[f]);a.className=e.replace(/^\s+|\s+$/g,"")}else a.className=b}return a},h=function(a,b){if(a.removeClass)return a.removeClass(b),a;if(b&&"string"==typeof b||void 0===b){var c=(b||"").split(/\s+/);if(1===a.nodeType&&a.className)if(b){for(var d=(" "+a.className+" ").replace(/[\n\t]/g," "),e=0,f=c.length;f>e;e++)d=d.replace(" "+c[e]+" "," ");a.className=d.replace(/^\s+|\s+$/g,"")}else a.className=""}return a},i=function(){var a,b,c,d=1;return"function"==typeof document.body.getBoundingClientRect&&(a=document.body.getBoundingClientRect(),b=a.right-a.left,c=document.body.offsetWidth,d=Math.round(100*(b/c))/100),d},j=function(a){var b={left:0,top:0,width:0,height:0,zIndex:999999999},d=c(a,"z-index");if(d&&"auto"!==d&&(b.zIndex=parseInt(d,10)),a.getBoundingClientRect){var e,f,g,h=a.getBoundingClientRect();"pageXOffset"in window&&"pageYOffset"in window?(e=window.pageXOffset,f=window.pageYOffset):(g=i(),e=Math.round(document.documentElement.scrollLeft/g),f=Math.round(document.documentElement.scrollTop/g));var j=document.documentElement.clientLeft||0,k=document.documentElement.clientTop||0;b.left=h.left+e-j,b.top=h.top+f-k,b.width="width"in h?h.width:h.right-h.left,b.height="height"in h?h.height:h.bottom-h.top}return b},k=function(a,b){var c=!(b&&b.useNoCache===!1);return c?(-1===a.indexOf("?")?"?":"&")+"nocache="+(new Date).getTime():""},l=function(a){var b=[],c=[];return a.trustedOrigins&&("string"==typeof a.trustedOrigins?c.push(a.trustedOrigins):"object"==typeof a.trustedOrigins&&"length"in a.trustedOrigins&&(c=c.concat(a.trustedOrigins))),a.trustedDomains&&("string"==typeof a.trustedDomains?c.push(a.trustedDomains):"object"==typeof a.trustedDomains&&"length"in a.trustedDomains&&(c=c.concat(a.trustedDomains))),c.length&&b.push("trustedOrigins="+encodeURIComponent(c.join(","))),"string"==typeof a.amdModuleId&&a.amdModuleId&&b.push("amdModuleId="+encodeURIComponent(a.amdModuleId)),"string"==typeof a.cjsModuleId&&a.cjsModuleId&&b.push("cjsModuleId="+encodeURIComponent(a.cjsModuleId)),b.join("&")},m=function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;d>c;c++)if(b[c]===a)return c;return-1},n=function(a){if("string"==typeof a)throw new TypeError("ZeroClipboard doesn't accept query strings.");return a.length?a:[a]},o=function(a,b,c,d,e){e?window.setTimeout(function(){a.call(b,c,d)},0):a.call(b,c,d)},p=function(a,b){if(a&&(p.prototype._singleton||this).glue(a),p.prototype._singleton)return p.prototype._singleton;p.prototype._singleton=this,this.options={};for(var c in s)this.options[c]=s[c];for(var d in b)this.options[d]=b[d];this.handlers={},p.detectFlashSupport()&&v()},q=[];p.prototype.setCurrent=function(b){a=b,this.reposition();var d=b.getAttribute("title");d&&this.setTitle(d);var e=this.options.forceHandCursor===!0||"pointer"===c(b,"cursor");return r.call(this,e),this},p.prototype.setText=function(a){return a&&""!==a&&(this.options.text=a,this.ready()&&this.flashBridge.setText(a)),this},p.prototype.setTitle=function(a){return a&&""!==a&&this.htmlBridge.setAttribute("title",a),this},p.prototype.setSize=function(a,b){return this.ready()&&this.flashBridge.setSize(a,b),this},p.prototype.setHandCursor=function(a){return a="boolean"==typeof a?a:!!a,r.call(this,a),this.options.forceHandCursor=a,this};var r=function(a){this.ready()&&this.flashBridge.setHandCursor(a)};p.version="1.2.3";var s={moviePath:"ZeroClipboard.swf",trustedOrigins:null,text:null,hoverClass:"zeroclipboard-is-hover",activeClass:"zeroclipboard-is-active",allowScriptAccess:"sameDomain",useNoCache:!0,forceHandCursor:!1};p.setDefaults=function(a){for(var b in a)s[b]=a[b]},p.destroy=function(){p.prototype._singleton.unglue(q);var a=p.prototype._singleton.htmlBridge;a.parentNode.removeChild(a),delete p.prototype._singleton},p.detectFlashSupport=function(){var a=!1;if("function"==typeof ActiveXObject)try{new ActiveXObject("ShockwaveFlash.ShockwaveFlash")&&(a=!0)}catch(b){}return!a&&navigator.mimeTypes["application/x-shockwave-flash"]&&(a=!0),a};var t=null,u=null,v=function(){var a,b,c=p.prototype._singleton,d=document.getElementById("global-zeroclipboard-html-bridge");if(!d){var e={};for(var f in c.options)e[f]=c.options[f];e.amdModuleId=t,e.cjsModuleId=u;var g=l(e),h='      <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="global-zeroclipboard-flash-bridge" width="100%" height="100%">         <param name="movie" value="'+c.options.moviePath+k(c.options.moviePath,c.options)+'"/>         <param name="allowScriptAccess" value="'+c.options.allowScriptAccess+'"/>         <param name="scale" value="exactfit"/>         <param name="loop" value="false"/>         <param name="menu" value="false"/>         <param name="quality" value="best" />         <param name="bgcolor" value="#ffffff"/>         <param name="wmode" value="transparent"/>         <param name="flashvars" value="'+g+'"/>         <embed src="'+c.options.moviePath+k(c.options.moviePath,c.options)+'"           loop="false" menu="false"           quality="best" bgcolor="#ffffff"           width="100%" height="100%"           name="global-zeroclipboard-flash-bridge"           allowScriptAccess="always"           allowFullScreen="false"           type="application/x-shockwave-flash"           wmode="transparent"           pluginspage="http://www.macromedia.com/go/getflashplayer"           flashvars="'+g+'"           scale="exactfit">         </embed>       </object>';d=document.createElement("div"),d.id="global-zeroclipboard-html-bridge",d.setAttribute("class","global-zeroclipboard-container"),d.setAttribute("data-clipboard-ready",!1),d.style.position="absolute",d.style.left="-9999px",d.style.top="-9999px",d.style.width="15px",d.style.height="15px",d.style.zIndex="9999",d.innerHTML=h,document.body.appendChild(d)}c.htmlBridge=d,a=document["global-zeroclipboard-flash-bridge"],a&&(b=a.length)&&(a=a[b-1]),c.flashBridge=a||d.children[0].lastElementChild};p.prototype.resetBridge=function(){return this.htmlBridge.style.left="-9999px",this.htmlBridge.style.top="-9999px",this.htmlBridge.removeAttribute("title"),this.htmlBridge.removeAttribute("data-clipboard-text"),h(a,this.options.activeClass),a=null,this.options.text=null,this},p.prototype.ready=function(){var a=this.htmlBridge.getAttribute("data-clipboard-ready");return"true"===a||a===!0},p.prototype.reposition=function(){if(!a)return!1;var b=j(a);return this.htmlBridge.style.top=b.top+"px",this.htmlBridge.style.left=b.left+"px",this.htmlBridge.style.width=b.width+"px",this.htmlBridge.style.height=b.height+"px",this.htmlBridge.style.zIndex=b.zIndex+1,this.setSize(b.width,b.height),this},p.dispatch=function(a,b){p.prototype._singleton.receiveEvent(a,b)},p.prototype.on=function(a,b){for(var c=a.toString().split(/\s/g),d=0;d<c.length;d++)a=c[d].toLowerCase().replace(/^on/,""),this.handlers[a]||(this.handlers[a]=b);return this.handlers.noflash&&!p.detectFlashSupport()&&this.receiveEvent("onNoFlash",null),this},p.prototype.addEventListener=p.prototype.on,p.prototype.off=function(a,b){for(var c=a.toString().split(/\s/g),d=0;d<c.length;d++){a=c[d].toLowerCase().replace(/^on/,"");for(var e in this.handlers)e===a&&this.handlers[e]===b&&delete this.handlers[e]}return this},p.prototype.removeEventListener=p.prototype.off,p.prototype.receiveEvent=function(b,c){b=b.toString().toLowerCase().replace(/^on/,"");var d=a,e=!0;switch(b){case"load":if(c&&parseFloat(c.flashVersion.replace(",",".").replace(/[^0-9\.]/gi,""))<10)return this.receiveEvent("onWrongFlash",{flashVersion:c.flashVersion}),void 0;this.htmlBridge.setAttribute("data-clipboard-ready",!0);break;case"mouseover":g(d,this.options.hoverClass);break;case"mouseout":h(d,this.options.hoverClass),this.resetBridge();break;case"mousedown":g(d,this.options.activeClass);break;case"mouseup":h(d,this.options.activeClass);break;case"datarequested":var f=d.getAttribute("data-clipboard-target"),i=f?document.getElementById(f):null;if(i){var j=i.value||i.textContent||i.innerText;j&&this.setText(j)}else{var k=d.getAttribute("data-clipboard-text");k&&this.setText(k)}e=!1;break;case"complete":this.options.text=null}if(this.handlers[b]){var l=this.handlers[b];"string"==typeof l&&"function"==typeof window[l]&&(l=window[l]),"function"==typeof l&&o(l,d,this,c,e)}},p.prototype.glue=function(a){a=n(a);for(var b=0;b<a.length;b++)-1==m(a[b],q)&&(q.push(a[b]),e(a[b],"mouseover",d));return this},p.prototype.unglue=function(a){a=n(a);for(var b=0;b<a.length;b++){f(a[b],"mouseover",d);var c=m(a[b],q);-1!=c&&q.splice(c,1)}return this},"function"==typeof define&&define.amd?define(["require","exports","module"],function(a,b,c){return t=c&&c.id||null,p}):"object"==typeof module&&module&&"object"==typeof module.exports&&module.exports?(u=module.id||null,module.exports=p):window.ZeroClipboard=p}();
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 9e654bb91..5fd420571 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -10,7 +10,6 @@
     {% endblock %}
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="Hosted private docker repositories. Includes full user management and history. Free for public repositories.">
 
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.0/css/font-awesome.css">
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.no-icons.min.css">
@@ -38,7 +37,8 @@
     <script src="//code.jquery.com/jquery.js"></script>
     <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
 
-    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.min.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.min.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-route.min.js"></script>
     <script src="//cdn.jsdelivr.net/underscorejs/1.5.2/underscore-min.js"></script>
     <script src="//cdn.jsdelivr.net/restangular/1.1.3/restangular.js"></script>
 
@@ -74,8 +74,7 @@ mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8
   </head>
   <body>
     <!-- Nav bar -->
-    <nav class="navbar navbar-default" role="navigation" ng-include="'/static/partials/header.html'" ng-controller='HeaderCtrl' >
-    </nav>
+    <nav class="navbar navbar-default header-bar" role="navigation"></nav>
 
     {% block body_content %}
 
diff --git a/templates/index.html b/templates/index.html
index 664570e5d..3d09f1b6a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,6 +7,7 @@
 {% block added_meta %}
   <base href="/">
 
+  <meta name="description" content="{% raw %}{{ description }}{% endraw %}"></meta>
   <meta name="google-site-verification" content="GalDznToijTsHYmLjJvE4QaB9uk_IP16aaGDz5D75T4" />
   <meta name="fragment" content="!" />
 {% endblock %}
@@ -20,8 +21,7 @@
 
   <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.2.1/moment.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.3.3/d3.min.js"></script>
-  <script src="//cdnjs.cloudflare.com/ajax/libs/zeroclipboard/1.1.7/ZeroClipboard.min.js"></script>
-
+  <script src="static/lib/ZeroClipboard.min.js"></script>
   <script src="static/lib/jquery.overscroll.min.js"></script>
 
   <script src="static/lib/d3-tip.js" charset="utf-8"></script>
diff --git a/templates/privacy.html b/templates/privacy.html
index 24bfab27d..b2d575e17 100644
--- a/templates/privacy.html
+++ b/templates/privacy.html
@@ -4,6 +4,10 @@
   <title>Privacy Policy · Quay.io</title>
 {% endblock %}
 
+{% block added_meta %}
+  <meta name="description" content="Privacy policy for Quay - Hosted private docker repository">
+{% endblock %}
+
 {% block body_content %}
   <div class="container privacy-policy">
 
diff --git a/templates/tos.html b/templates/tos.html
index 6796e991c..34ec9bbf9 100644
--- a/templates/tos.html
+++ b/templates/tos.html
@@ -4,6 +4,10 @@
   <title>Terms of Service · Quay.io</title>
 {% endblock %}
 
+{% block added_meta %}
+  <meta name="description" content="Terms of service for Quay - Hosted private docker repository">
+{% endblock %}
+
 {% block body_content %}
   <div class="tos container">
     <h2>Terms of Service</h2>
@@ -95,4 +99,4 @@
       </li>
     </ol>
   </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}