diff --git a/app.js b/app.js
index f3a97d7..43f6b5d 100644
--- a/app.js
+++ b/app.js
@@ -54,12 +54,13 @@ function initApp (config, callback) {
 	app.express.locals({
 		lang: 'en',
 		year: (new Date()).getFullYear(),
-		version : pkg.version,
-		repo : pkg.homepage,
-		bugtracker : pkg.bugs,
-		rules : pkg.snifferules
+		version: pkg.version,
+		repo: pkg.homepage,
+		bugtracker: pkg.bugs,
+		rules: pkg.snifferules
 	});
 	app.express.use(function (req, res, next) {
+		res.locals.isHomePage = (req.path === '/');
 		res.locals.host = req.host;
 		next();
 	});
diff --git a/public/less/site.less b/public/less/site.less
index 8e596f5..8debd26 100644
--- a/public/less/site.less
+++ b/public/less/site.less
@@ -97,6 +97,13 @@
 	color:lighten(@brand-danger, 8%);
 }
 
+/* Type */
+.h1, .h2, .h3 {
+  margin-top: @line-height-computed;
+  margin-bottom: (@line-height-computed / 2);
+}
+
+
 /* Task stats boxes */
 .task-stats {
 	margin-bottom:10px;
diff --git a/view/new.html b/view/new.html
index a9f286b..30c908c 100644
--- a/view/new.html
+++ b/view/new.html
@@ -6,7 +6,7 @@
 <form role="form" class="col-md-12" action="/new" method="post">
 
 	<div class="legend">
-		<legend>Add a new URL</legend>
+		<h1 class="h2 crunch-top">Add a new URL</h1>
 	</div>
 
 	{{#error}}
diff --git a/view/partial/page-header.html b/view/partial/page-header.html
index 8440bfd..a1cadd5 100644
--- a/view/partial/page-header.html
+++ b/view/partial/page-header.html
@@ -1,7 +1,10 @@
 <header>
 	<div role="banner" class="header">
 		<div class="container">
-			<h1><a href="/">pa11y dashboard</a> - <span class="h3">your automated accessibility testing pal</span></h1>
+			{{#if isHomePage}}<h1>{{else}}<div class="h1">{{/if}}
+				<a href="/">pa11y dashboard</a> -
+				<span class="h3">your automated accessibility testing pal</span>
+			{{#if isHomePage}}</h1>{{else}}</div>{{/if}}
 		</div>
 	</div>
 </header>
\ No newline at end of file
diff --git a/view/partial/result-header.html b/view/partial/result-header.html
index bca59aa..4792289 100644
--- a/view/partial/result-header.html
+++ b/view/partial/result-header.html
@@ -3,7 +3,7 @@
 		<div class="row clearfix">
 			<div class="col-md-12">
 				<div class="h3 crunch well-med well pull-right"><span class="glyphicon glyphicon-calendar"></span>&nbsp;{{date-format mainResult.date format="DD MMM YYYY"}}</div>
-				<h2 class="crunch-top">{{simplify-url task.url}}</h2>
+				<h1 class="h2 crunch-top">{{simplify-url task.url}}</h1>
 				<p class="h4">({{task.standard}})</p>
 			</div>
 		</div>
diff --git a/view/partial/task-header.html b/view/partial/task-header.html
index c7fe978..0649955 100644
--- a/view/partial/task-header.html
+++ b/view/partial/task-header.html
@@ -2,7 +2,7 @@
 	<div class="ruled task-header">
 		<div class="row clearfix">
 			<div class="col-md-10">
-				<h2 class="crunch-top">{{simplify-url task.url}}</h2>
+				<h1 class="h2 crunch-top">{{simplify-url task.url}}</h1>
 				<p class="h4">({{task.standard}})</p>
 			</div>
 			<div class="col-md-2 text-right run-details">