diff --git a/src/lib/Hydra/Controller/Job.pm b/src/lib/Hydra/Controller/Job.pm
index 455035a8..1b4619f2 100644
--- a/src/lib/Hydra/Controller/Job.pm
+++ b/src/lib/Hydra/Controller/Job.pm
@@ -29,7 +29,7 @@ sub overview : Chained('job') PathPart('') Args(0) {
                                                                                      , '+as' => ["releasename", "buildstatus"], order_by => 'system' })];
 
     $c->stash->{lastBuilds} = [$c->stash->{job}->builds->search({ finished => 1 }, { join => 'resultInfo', '+select' => ["resultInfo.releasename", "resultInfo.buildstatus"]
-                                                                                          , '+as' => ["releasename", "buildstatus"], order_by => 'timestamp DESC', rows => 5 })];
+                                                                                          , '+as' => ["releasename", "buildstatus"], order_by => 'timestamp DESC', rows => 10 })];
 
     $c->stash->{runningBuilds} = [$c->stash->{job}->builds->search({busy => 1}, { join => ['schedulingInfo', 'project'] , order_by => ["priority DESC", "timestamp"]
                                                                                      , '+select' => ['project.enabled', 'schedulingInfo.priority', 'schedulingInfo.disabled', 'schedulingInfo.busy']
diff --git a/src/root/job.tt b/src/root/job.tt
index 0d0933e4..c74f5804 100644
--- a/src/root/job.tt
+++ b/src/root/job.tt
@@ -17,19 +17,18 @@
 		<!-- <li><a href="#tabs-statistics">Statistics</a></li> -->
 	</ul>
 	<div id="tabs-status">
-            [% IF currentBuilds.size != 0 %]
-	        <h2>Finished builds</h2>
-		[% INCLUDE renderBuildList builds=currentBuilds showStatusChange=0 %]
-	    [% ELSE %]
-                 [% IF lastBuilds.size != 0 %]
-	            <h2>Last 5 builds</h2>
-		    [% INCLUDE renderBuildList builds=lastBuilds showStatusChange=0 %]
-    	        [% END %]
+            [% IF runningBuilds.size == 0 %]
+	        <h2>Latest builds (latest evaluation)</h2>
+  	        [% INCLUDE renderBuildList builds=currentBuilds showStatusChange=0 %]
             [% END %]
             [% IF runningBuilds.size != 0 %]
 	        <h2>Running builds</h2>
 	        [% INCLUDE renderBuildList builds=runningBuilds showSchedulingInfo=1 hideResultInfo=1 %]
 	    [% END %]
+            [% IF lastBuilds.size != 0 %]
+	        <h2>Last 10 builds</h2>
+	        [% INCLUDE renderBuildList builds=lastBuilds showStatusChange=0 %]
+	    [% END %]
 	</div>
 	<div id="tabs-channels">
 		<p>This job provides the following Nix channels:</p>