diff --git a/src/lib/Hydra/Schema/Builds.pm b/src/lib/Hydra/Schema/Builds.pm
index 8160d515..6b693329 100644
--- a/src/lib/Hydra/Schema/Builds.pm
+++ b/src/lib/Hydra/Schema/Builds.pm
@@ -259,7 +259,8 @@ QUERY
           select 
             x.id, x.finished, x.timestamp, x.project, x.jobset, x.job, x.nixname,
             x.description, x.drvpath, x.outpath, x.system, x.longdescription,
-            x.license, x.homepage, x.maintainers, x.isCurrent,
+            x.license, x.homepage, x.maintainers, x.isCurrent, x.nixExprInput,
+            x.nixExprPath,
             b.id as statusChangeId, b.timestamp as statusChangeTime
           from
             (select project, jobset, job, system, max(id) as id
diff --git a/src/root/all.tt b/src/root/all.tt
index 69e3f41b..bf786c14 100644
--- a/src/root/all.tt
+++ b/src/root/all.tt
@@ -11,6 +11,7 @@ out of [% totalBuilds %] in order of descending timestamp.</p>
 
 [% INCLUDE renderBuildList %]
 
+<p>
 [<a href="[% "$baseUri?page=1" %]">First</a>]
 [% IF page > 1 %]
   [<a href="[% "$baseUri?page="; (page - 1) %]">Prev</a>]
@@ -19,5 +20,6 @@ out of [% totalBuilds %] in order of descending timestamp.</p>
   [<a href="[% "$baseUri?page="; (page + 1) %]">Next</a>]
 [% END %]
 [<a href="[% "$baseUri?page="; (totalBuilds - 1) div resultsPerPage + 1 %]">Last</a>]
+</p>
 
 [% END %]
diff --git a/src/root/view.tt b/src/root/view.tt
index aac46955..908d3da9 100644
--- a/src/root/view.tt
+++ b/src/root/view.tt
@@ -59,11 +59,12 @@
             [% END %]
           </td>
         [% END %]
-      </tr> 
+      </tr>
    [% END %]
   </tbody>
 </table>
 
+<p>
 [<a href="[% "$baseUri?page=1" %]">First</a>]
 [% IF page > 1 %]
   [<a href="[% "$baseUri?page="; (page - 1) %]">Prev</a>]
@@ -72,5 +73,6 @@
   [<a href="[% "$baseUri?page="; (page + 1) %]">Next</a>]
 [% END %]
 [<a href="[% "$baseUri?page="; (totalResults - 1) div resultsPerPage + 1 %]">Last</a>]
+</p>
 
 [% END %]