diff --git a/app/controller.php b/app/controller.php
index 640bb7af6..a3dae528b 100644
--- a/app/controller.php
+++ b/app/controller.php
@@ -14,7 +14,15 @@ function beforeroute($f3) {
 		$f3->set('active',$f3->get('menu["'.$uri.'"]'));
 	}
 
-	function afterroute() {
+	function afterroute($f3) {
+		// Collect errors.
+		if ($results=$f3->get('results')) {
+			$f3->set('errors', array_reduce($results, function($carry, $item){
+				if (!$item['status']) $carry[]=$item;
+				return $carry;
+			}, array()));
+		}
+
 		echo \Preview::instance()->render('layout.htm');
 	}
 
diff --git a/ui/layout.htm b/ui/layout.htm
index 5dc5bc3c2..20b4ae927 100644
--- a/ui/layout.htm
+++ b/ui/layout.htm
@@ -24,9 +24,23 @@ <h1>{{ @VERSION }}</h1>
 			</div>
 			<div class="main">
 				<h1>{{ @active }}</h1>
-				{~ foreach (@results as @i=>@result): ~}
-				<p>
-					<span class="status {{ @result.status?'pass':'fail' }}">{{ @i+1 }}</span>
+
+				<h2 id="errors">Errors</h2>
+				{~ if (@errors): ~}
+					{~ foreach (@errors as @result): ~}
+						<p>
+							<span class="status fail"><a href="{{ @PATH }}#test-{{ @result.id }}">{{ @result.id }}</a></span>
+							<span class="text">{{ @result.text }} {~ if (@result.source) echo '('.@result.source.')' ~}</span><br/>
+						</p>
+					{~ endforeach ~}
+				{~ else: ~}
+					<p>No errors.</p>
+				{~ endif ~}
+
+				<h2 id="tests">Tests</h2>
+				{~ foreach (@results as @result): ~}
+				<p id="test-{{ @result.id }}">
+					<span class="status {{ @result.status?'pass':'fail' }}">{{ @result.id }}</span>
 					<span class="text">{{ @result.text }} {~ if (!@result.status && @result.source) echo '('.@result.source.')' ~}</span><br/>
 				</p>
 				{~ endforeach ~}