diff --git a/src/root/common.tt b/src/root/common.tt
index fe70e713..b6d59c24 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -137,6 +137,9 @@ BLOCK renderBuildListBody;
       [% END %]
     </tr>
   [% END;
+  IF linkToAll %]
+    <td class="centered" colspan="5"><a href="[% linkToAll %]"><em>More...</em></a></td></tr>
+  [% END;
 END;
 
 
@@ -431,7 +434,7 @@ BLOCK renderEvals %]
         </tr>
       [% END;
       IF linkToAll %]
-        <tr><td class="centered" colspan="54"><a href="[% linkToAll %]"><em>All evaluations...</em></a></td></tr>
+        <tr><td class="centered" colspan="5"><a href="[% linkToAll %]"><em>More...</em></a></td></tr>
       [% END %]
     </tbody>
   </table>
diff --git a/src/root/job.tt b/src/root/job.tt
index 6858d2ed..5ccef23f 100644
--- a/src/root/job.tt
+++ b/src/root/job.tt
@@ -4,23 +4,24 @@
 
 <ul class="nav nav-tabs">
   <li class="active"><a href="#tabs-status" data-toggle="tab">Status</a></li>
-  <li><a href="#tabs-latestbuilds" data-toggle="tab">Latest builds</a></li>
+  <li><a href="#tabs-links" data-toggle="tab">Links</a></li>
 </ul>
 
 <div id="generic-tabs" class="tab-content">
 
   <div id="tabs-status" class="tab-pane active">
+    [% IF lastBuilds.size != 0 %]
+      <h3>Lastest builds</h3>
+      [% INCLUDE renderBuildList builds=lastBuilds showStatusChange=0
+          linkToAll=c.uri_for('/job' project.name jobset.name job.name 'all') %]
+    [% END %]
     [% IF queuedBuilds.size != 0 %]
       <h3>Queued builds</h3>
       [% INCLUDE renderBuildList builds=queuedBuilds showSchedulingInfo=1 hideResultInfo=1 %]
     [% END %]
-    [% IF lastBuilds.size != 0 %]
-      <h3>Last 10 builds</h3>
-      [% INCLUDE renderBuildList builds=lastBuilds showStatusChange=0 %]
-    [% END %]
   </div>
 
-  <div id="tabs-latestbuilds" class="tab-pane">
+  <div id="tabs-links" class="tab-pane">
     <ul>
       <li><a href="[% c.uri_for('/job' project.name jobset.name job.name 'latest') %]">Latest successful build</a></li>
       [% FOREACH system IN systems %]