diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index 117c7c5c..b517edab 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -26,8 +26,6 @@ sub jobsetIndex {
 
     $c->stash->{template} = 'jobset.tt';
 
-    #getBuildStats($c, scalar $c->stash->{jobset}->builds);
-
     my $projectName = $c->stash->{project}->name;
     my $jobsetName = $c->stash->{jobset}->name;
 
@@ -51,6 +49,20 @@ sub jobsetIndex {
         }
     }
 
+    $c->stash->{evals} = [ $c->stash->{jobset}->jobsetevals->search(
+        { hasnewbuilds => 1 }, 
+        { order_by => "id DESC"
+        , '+select' => # !!! Slow - should precompute this.
+	    [ "(select count(*) from JobsetEvalMembers where eval = me.id)"
+	    , "(select count(*) from JobsetEvalMembers where eval = me.id and exists(select 1 from Builds b where b.id = build and b.finished = 0))" 
+	    , "(select count(*) from JobsetEvalMembers where eval = me.id and exists(select 1 from Builds b where b.id = build and b.finished = 1))"
+	    , "(select count(*) from JobsetEvalMembers where eval = me.id and exists(select 1 from Builds b where b.id = build and b.finished = 1 and b.buildStatus = 0))" 
+	    ]
+        , '+as' => [ "nrBuilds", "nrScheduled", "nrFinished", "nrSucceeded" ]
+        , rows => 5
+        }
+    ) ];
+
     $c->stash->{systems} = 
         [ $c->stash->{jobset}->builds->search({ iscurrent => 1 }, { select => ["system"], distinct => 1, order_by => "system" }) ];
 
@@ -80,10 +92,6 @@ sub jobsetIndex {
 	          })];
     }
 
-    # Last builds for jobset.
-    $c->stash->{lastBuilds} = 
-	[ $c->stash->{jobset}->builds->search({ finished => 1 }, 
-            { order_by => "timestamp DESC", rows => 5, columns => [@buildListColumns] }) ];
 }
 
 
diff --git a/src/root/common.tt b/src/root/common.tt
index aff25137..85aab482 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -399,18 +399,43 @@
     <li [% IF page * resultsPerPage >= total %]class="disabled"[% END %]><a href="[% "$baseUri?page="; (page + 1) %]">Next</a></li>
     <li><a href="[% "$baseUri?page="; (total - 1) div resultsPerPage + 1 %]">Last</a></li>
 </ul>
-<!--
-<p>
-[]
-[% IF page > 1 %]
-  [<a href="[% "$baseUri?page="; (page - 1) %]">Prev</a>]
-[% END %]
-[% IF page * resultsPerPage < total %]
-  [<a href="[% "$baseUri?page="; (page + 1) %]">Next</a>]
-[% END %]
-[<a href="[% "$baseUri?page="; (total - 1) div resultsPerPage + 1 %]">Last</a>]
-</p>
--->
 [% END %]
 
 
+[% BLOCK renderEvals %]
+
+<table class="tablesorter table table-condensed table-striped">
+  <thead>
+    <tr>
+      <th>#</th>
+      <th>Date</th>
+      <th colspan='2'>Success</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% last = nrShown - 1; FOREACH n IN [0..last]; eval = evals.$n; m = n + 1; next = evals.$m; %]
+     <tr>
+       <td><a href="[% c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) %]">[% eval.id %]</a>&nbsp;</td>
+       <td>[% INCLUDE renderDateTime timestamp = eval.timestamp %]&nbsp;</td>
+       <td align='right'>
+         <span class="label label-success">[% eval.get_column('nrSucceeded') %]</span>
+         <span class="label label-important">[% eval.get_column('nrBuilds') - eval.get_column('nrSucceeded') - eval.get_column('nrScheduled') %]</span>
+	 [% IF eval.get_column('nrScheduled') > 0 %]
+	 <span class="label">[% eval.get_column('nrScheduled') %]</span>
+	 [% END %]
+       </td>
+       <td align='right'>
+	 [% diff = eval.get_column('nrSucceeded') - next.get_column('nrSucceeded');
+	    IF diff > 0 %]
+	    <span class='label label-success'><strong>+[% diff %]</strong></span>
+	 [% ELSIF diff < 0 && eval.get_column('nrScheduled') == 0 %]
+	    <span class='label label-important'><strong>[% diff %]</strong></span>
+	 [% END %]
+       </td>
+     </tr>
+    [% END %]
+  </tbody>
+</table>
+
+
+[% END %]
diff --git a/src/root/jobset-eval.tt b/src/root/jobset-eval.tt
index 1a41cbab..cbdbf44f 100644
--- a/src/root/jobset-eval.tt
+++ b/src/root/jobset-eval.tt
@@ -1,7 +1,7 @@
 [% WRAPPER layout.tt title="Jobset $project.name:$jobset.name evaluation $eval.id" %]
 [% PROCESS common.tt %]
 
-<h1>Jobset <tt>[% project.name %]:[% jobset.name %]</tt> evaluation [% eval.id %]</h1>
+<h2>Jobset <tt>[% project.name %]:[% jobset.name %]</tt> evaluation [% eval.id %]</h2>
 
 [%- IF otherEval -%]
 <p>Comparisons are relative to [% INCLUDE renderFullJobsetName
diff --git a/src/root/jobset-evals.tt b/src/root/jobset-evals.tt
index 8b686b22..640bff11 100644
--- a/src/root/jobset-evals.tt
+++ b/src/root/jobset-evals.tt
@@ -1,9 +1,9 @@
 [% WRAPPER layout.tt title="Jobset ‘$project.name:$jobset.name’ Evaluations" %]
 [% PROCESS common.tt %]
 
-<h1>Evaluations of Jobset <tt>[% INCLUDE renderLink
+<h2>Evaluations of Jobset <tt>[% INCLUDE renderLink
   uri = c.uri_for(c.controller('Project').action_for('view'), [project.name])
-  title = project.name %]:[% jobset.name %]</tt></h1>
+  title = project.name %]:[% jobset.name %]</tt></h2>
 
 [% nrShown = evals.size > resultsPerPage ? resultsPerPage : evals.size %]
   
@@ -12,37 +12,6 @@
 
 [% INCLUDE renderPager %]
 
-<table class="tablesorter table table-condensed table-striped">
-  <thead>
-    <tr>
-      <th>#</th>
-      <th>Date</th>
-      <th colspan='2'>Success</th>
-    </tr>
-  </thead>
-  <tbody>
-    [% last = nrShown - 1; FOREACH n IN [0..last]; eval = evals.$n; m = n + 1; next = evals.$m; %]
-     <tr>
-       <td><a href="[% c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) %]">[% eval.id %]</a>&nbsp;</td>
-       <td>[% INCLUDE renderDateTime timestamp = eval.timestamp %]&nbsp;</td>
-       <td align='right'>
-         <span class="label label-success">[% eval.get_column('nrSucceeded') %]</span>
-         <span class="label label-important">[% eval.get_column('nrBuilds') - eval.get_column('nrSucceeded') - eval.get_column('nrScheduled') %]</span>
-	 [% IF eval.get_column('nrScheduled') > 0 %]
-	 <span class="label">[% eval.get_column('nrScheduled') %]</span>
-	 [% END %]
-       </td>
-       <td align='right'>
-	 [% diff = eval.get_column('nrSucceeded') - next.get_column('nrSucceeded');
-	    IF diff > 0 %]
-	    <span class='label label-success'><strong>+[% diff %]</strong></span>
-	 [% ELSIF diff < 0 && eval.get_column('nrScheduled') == 0 %]
-	    <span class='label label-important'><strong>[% diff %]</strong></span>
-	 [% END %]
-       </td>
-     </tr>
-    [% END %]
-  </tbody>
-</table>
+[% INCLUDE renderEvals %]
 
 [% END %]
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index c38d789a..62724393 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -91,10 +91,12 @@
 		</script>
 	    [% END %]
 	    
-	    [% IF lastBuilds %]
-	    	<h2>Most recent builds</h2>
-	    	[% INCLUDE renderBuildList builds=lastBuilds hideProjectName=1 hideJobsetName=1 %]
-	    [% END %]
+	    	<h2>Most recent evaluations</h2>
+	    	[% INCLUDE renderEvals nrShown=5 %]
+   
+                <a href="c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name])" class="btn">All evaluations</a>
+                <br />
+                <br />
 	
 		[% IF !edit && activeJobsStatus -%]
 		    <h2>Status</h2>
diff --git a/src/root/project.tt b/src/root/project.tt
index b1c997d9..da1e7b9f 100644
--- a/src/root/project.tt
+++ b/src/root/project.tt
@@ -28,7 +28,6 @@
 			      <th>Description</th>
 			      <th>Last evaluated</th>
                   <th colspan="2">Success</th>
-                  [% IF c.check_user_roles('admin') %]<th>Options</th>[% END%]
 			    </tr>
 			  </thead>
 			  <tbody>
@@ -76,15 +75,6 @@
                       <span class="label label">[% j.get_column('nrscheduled') %]</span>
                       [% END %]
                   </td>
-                  [% IF c.check_user_roles('admin') %]
-                    <td>[% INCLUDE maybeButton uri = c.uri_for(c.controller('Admin').action_for('force_eval'), project.name, j.name) content = "Evaluate" confirmmsg = ("Are you sure you want to force evaluation of jobset " _ project.name _ ":" _ j.name _ "?") %]
-                          [% IF j.hidden %]
-                              [% INCLUDE maybeButton uri = c.uri_for('/jobset' project.name j.name 'unhide') content = "Unhide" %]
-                          [% ELSE %] 
-                              [% INCLUDE maybeButton uri = c.uri_for('/jobset' project.name j.name 'hide') content = "Hide" %]
-                          [% END %]
-                    </td>
-                  [% END%]
 			    </tr>
 			    [% END %]
 			  </tbody>
diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 7144d167..3fb8201a 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -44,10 +44,11 @@
   [% IF project %]
     [% WRAPPER makeSubMenu title=("Project: " _ project.name) collapsed=(jobset || job)  %]
       [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('view'), [project.name]) title = "Overview" %]
-      [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('releases'), [project.name]) title = "Releases" %]
       [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('all'), [project.name]) title = "All builds" %]
       [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('jobstatus'), [project.name]) title = "Job status" %]
       [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('errors'), [project.name]) title = "Errors" %]
+      <li class="divider"></li>
+      [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('releases'), [project.name]) title = "Releases" %]
       [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'channel' 'latest') title = "Channel (latest)" %]
       [% IF c.check_user_roles('admin') %]
           <li class="divider"></li>
@@ -75,12 +76,21 @@
       [% INCLUDE makeLink
         uri = c.uri_for(c.controller('Jobset').action_for('errors'), [project.name, jobset.name])
         title = "Errors" %]
+      <li class="divider"></li>
       [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'channel' 'latest') title = "Channel (latest)" %]
       [% IF c.check_user_roles('admin') %]
           <li class="divider"></li>
-          [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'edit') title="Edit jobset" %]
           [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'clone') title="Clone jobset" %]
+          [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'edit') title="Edit jobset" %]
+          [% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('force_eval'), project.name, j.name) content = "Evaluate" confirmmsg = ("Are you sure you want to force evaluation of jobset " _ project.name _ ":" _ j.name _ "?") %]
+          [% IF j.hidden %]
+              [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name j.name 'unhide') title = "Unhide" %]
+          [% ELSE %] 
+              [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name j.name 'hide') title = "Hide" %]
+          [% END %]
       [% END %]
+
+
     [% END %]
   [% END %]