diff --git a/src/root/common.tt b/src/root/common.tt
index fe8da617..13a8a34c 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -433,7 +433,10 @@
 	 [% END %]
        </td>
      </tr>
-    [% END %]
+    [%- END -%]
+    [%- IF linkToAll -%]
+      <tr><td class="centered" colspan="4"><a href="[% linkToAll %]"><em>More...</em></a></td></tr>
+    [%- END -%]
   </tbody>
 </table>
 
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index ac94d41f..ac246e8f 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -93,11 +93,7 @@
 	    	
 		[% IF !edit-%]
                     <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 />
+	            [% INCLUDE renderEvals nrShown=5 linkToAll=c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name]) %]
                 [% END %]
 		[% IF !edit && activeJobsStatus -%]
 		    <h2>Status</h2>