diff --git a/src/root/all.tt b/src/root/all.tt
index d90796ff..de92fc21 100644
--- a/src/root/all.tt
+++ b/src/root/all.tt
@@ -6,7 +6,7 @@
 
 <p>Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %] out of [% total %] in order of descending timestamp.</p>
 
-[% INCLUDE renderPager %]
 [% INCLUDE renderBuildList hideProjectName=project hideJobsetName=jobset hideJobName=job %]
+[% INCLUDE renderPager %]
 
 [% END %]
diff --git a/src/root/common.tt b/src/root/common.tt
index d956882c..0a1e07e9 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -385,14 +385,12 @@ BLOCK renderInputDiff; %]
 
 
 BLOCK renderPager %]
-  <div class="pagination">
-    <ul>
-      <li><a href="[% "$baseUri?page=1" %]">First</a></li>
-      <li [% IF page == 1 %]class="disabled"[% END %]><a href="[% "$baseUri?page="; (page - 1) %]">Previous</a></li>
-      <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>
-  </div>
+  <ul class="pager">
+    <li [% IF page == 1 %]class="disabled"[% END %]><a href="[% "$baseUri?page=1" %]">&laquo; First</a></li>
+    <li [% IF page == 1 %]class="disabled"[% END %]><a href="[% "$baseUri?page="; (page - 1) %]">&lsaquo; Previous</a></li>
+    <li [% IF page * resultsPerPage >= total %]class="disabled"[% END %]><a href="[% "$baseUri?page="; (page + 1) %]">Next &rsaquo;</a></li>
+    <li [% IF page * resultsPerPage >= total %]class="disabled"[% END %]><a href="[% "$baseUri?page="; (total - 1) div resultsPerPage + 1 %]">Last &raquo;</a></li>
+  </ul>
 [% END;
 
 
diff --git a/src/root/evals.tt b/src/root/evals.tt
index ae42e833..977441b3 100644
--- a/src/root/evals.tt
+++ b/src/root/evals.tt
@@ -7,8 +7,8 @@
 <p>Showing evaluations [% (page - 1) * resultsPerPage + 1 %] - [%
 (page - 1) * resultsPerPage + evals.size %] out of [% total %].</p>
 
-[% INCLUDE renderPager %]
-
 [% INCLUDE renderEvals %]
 
+[% INCLUDE renderPager %]
+
 [% END %]