diff --git a/view/index.html b/view/index.html
index 336b53e..5591b16 100644
--- a/view/index.html
+++ b/view/index.html
@@ -1,22 +1,36 @@
 {{#content "title"}}pa11y-dashboard{{/content}}
 
-{{#if siteMessage}}
-    <div class="col-md-12 clearfix" data-test="alert">
-        <div class="alert alert-info site-message">
-            <h3 class="crunch-top"><span class="pull-left glyphicon glyphicon-exclamation-sign"></span> Important</h3>
-            <p class="h5">{{siteMessage}}</p>
-        </div>
-    </div>
-{{/if}}
+<div data-control="task-list">
 
-{{#deleted}}
-    <div class="col-md-12 clearfix" data-test="alert">
-        <div class="alert alert-info">
-            <button aria-hidden="true" data-dismiss="alert" class="close" type="button">×</button>
-            <strong>Bye Bye URL</strong>
-            <p>The URL you selected and its associated results have been deleted.</p>
-        </div>
+  <div class="clearfix">
+    <div class="col-md-6 col-md-offset-3 filter-toggle no-js-hide text-center">
+      <label for="filter-input" class="filter-trigger" data-toggle="collapse" data-target="#filter-input">Filter<span class="glyphicon glyphicon-filter"></span>
+      </label>
+      <div id="filter-input" class="collapse">
+        <input class="form-control" id="task-filter" type="text" data-role="input" placeholder="Type filter term (name or standard)"/>
+      </div>
     </div>
-{{/deleted}}
+  </div>
 
-{{> tasks}}
+  {{#if siteMessage}}
+      <div class="col-md-12 clearfix" data-test="alert">
+          <div class="alert alert-info site-message">
+              <h3 class="crunch-top"><span class="pull-left glyphicon glyphicon-exclamation-sign"></span> Important</h3>
+              <p class="h5">{{siteMessage}}</p>
+          </div>
+      </div>
+  {{/if}}
+
+  {{#deleted}}
+      <div class="col-md-12 clearfix" data-test="alert">
+          <div class="alert alert-info">
+              <button aria-hidden="true" data-dismiss="alert" class="close" type="button">×</button>
+              <strong>Bye Bye URL</strong>
+              <p>The URL you selected and its associated results have been deleted.</p>
+          </div>
+      </div>
+  {{/deleted}}
+
+  {{> tasks}}
+
+</div>
diff --git a/view/partial/tasks.html b/view/partial/tasks.html
index cfa45ba..7269947 100644
--- a/view/partial/tasks.html
+++ b/view/partial/tasks.html
@@ -1,59 +1,46 @@
-
-<div data-control="task-list">
-
-	<div class="col-md-6 col-md-offset-3 filter-toggle no-js-hide text-center">
-		<label for="filter-input" class="filter-trigger" data-toggle="collapse" data-target="#filter-input">Filter<span class="glyphicon glyphicon-filter"></span>
-		</label>
-		<div id="filter-input" class="collapse">
-			<input class="form-control" id="task-filter" type="text" data-role="input" placeholder="Type filter term (name or standard)"/>
-		</div>
-	</div>
-
-	<ul class="list-unstyled clearfix crunch-bottom">
-		<li class="col-md-4 col-sm-6 task-card add-task">
-			{{#if readonly}}
-				<span class="well task-card-link crunch-bottom">
-					<p class="h3 crunch">Add new URL</p>
-					<p class="supersize-me crunch">+</p>
-				</span>
-			{{else}}
-				<a class="well task-card-link crunch-bottom" data-role="add-task" href="/new" data-test="add-task">
-					<p class="h3 crunch">Add new URL</p>
-					<p class="supersize-me crunch">+</p>
-				</a>
-			{{/if}}
+<ul class="list-unstyled clearfix crunch-bottom">
+	<li class="col-md-4 col-sm-6 task-card add-task">
+		{{#if readonly}}
+			<span class="well task-card-link crunch-bottom">
+				<p class="h3 crunch">Add new URL</p>
+				<p class="supersize-me crunch">+</p>
+			</span>
+		{{else}}
+			<a class="well task-card-link crunch-bottom" data-role="add-task" href="/new" data-test="add-task">
+				<p class="h3 crunch">Add new URL</p>
+				<p class="supersize-me crunch">+</p>
+			</a>
+		{{/if}}
+	</li>
+	{{#each tasks}}
+		<li class="col-md-4 col-sm-6 task-card" data-test="task" data-role="task" data-keywords="{{lowercase name}} {{lowercase standard}} {{simplify-url url}}">
+			<a class="well task-card-link crunch-bottom" title="Details for URL {{simplify-url url}}" href="{{href}}">
+				<p class="h3">{{name}}</p>
+				<p class="h5">({{standard}})</p>
+				{{#if lastResult}}
+				<ul class="clearfix list-unstyled floated-list task-stats">
+					{{#lastResult}}
+						<li class="danger" title="Number of errors ({{count.error}})">{{count.error}}<span class="stat-type">Errors</span></li>
+						<li class="warning" title="Number of warnings ({{count.warning}})">{{count.warning}}<span class="stat-type">Warnings</span></li>
+						<li class="info last" title="Number of notices ({{count.notice}})">{{count.notice}}<span class="stat-type">Notices</span></li>
+					{{/lastResult}}
+				</ul>
+				Last run {{date-format lastResult.date format="DD MMM YYYY"}}
+				{{else}}
+					<p class="no-results">No results</p>
+				{{/if}}
+			</a>
+			{{#unless ../readonly}}
+				<div class="btn-group options-button text-right">
+						<button type="button" class="btn btn-info btn-xs dropdown-toggle" data-toggle="dropdown"><span class="sr-only">Options</span><span class="glyphicon glyphicon-cog"></span></button>
+						<ul class="dropdown-menu pull-right" role="menu">
+							<li><a href="{{href}}/edit">Edit this task</a></li>
+							<li><a href="{{href}}/delete">Delete this task</a></li>
+							<li class="divider"></li>
+							<li><a href="{{href}}/run" data-test="run-task">Run pa11y</a></li>
+						</ul>
+					</div>
+			{{/unless}}
 		</li>
-		{{#each tasks}}
-			<li class="col-md-4 col-sm-6 task-card" data-test="task" data-role="task" data-keywords="{{lowercase name}} {{lowercase standard}} {{simplify-url url}}">
-				<a class="well task-card-link crunch-bottom" title="Details for URL {{simplify-url url}}" href="{{href}}">
-					<p class="h3">{{name}}</p>
-					<p class="h5">({{standard}})</p>
-					{{#if lastResult}}
-					<ul class="clearfix list-unstyled floated-list task-stats">
-						{{#lastResult}}
-							<li class="danger" title="Number of errors ({{count.error}})">{{count.error}}<span class="stat-type">Errors</span></li>
-							<li class="warning" title="Number of warnings ({{count.warning}})">{{count.warning}}<span class="stat-type">Warnings</span></li>
-							<li class="info last" title="Number of notices ({{count.notice}})">{{count.notice}}<span class="stat-type">Notices</span></li>
-						{{/lastResult}}
-					</ul>
-					Last run {{date-format lastResult.date format="DD MMM YYYY"}}
-					{{else}}
-						<p class="no-results">No results</p>
-					{{/if}}
-				</a>
-				{{#unless ../readonly}}
-					<div class="btn-group options-button text-right">
-							<button type="button" class="btn btn-info btn-xs dropdown-toggle" data-toggle="dropdown"><span class="sr-only">Options</span><span class="glyphicon glyphicon-cog"></span></button>
-							<ul class="dropdown-menu pull-right" role="menu">
-								<li><a href="{{href}}/edit">Edit this task</a></li>
-								<li><a href="{{href}}/delete">Delete this task</a></li>
-								<li class="divider"></li>
-								<li><a href="{{href}}/run" data-test="run-task">Run pa11y</a></li>
-							</ul>
-						</div>
-				{{/unless}}
-			</li>
-		{{/each}}
-	</ul>
-
-</div>
+	{{/each}}
+</ul>