diff --git a/src/Hydra/lib/Hydra/Controller/Root.pm b/src/Hydra/lib/Hydra/Controller/Root.pm
index 9b51757e..69488af2 100644
--- a/src/Hydra/lib/Hydra/Controller/Root.pm
+++ b/src/Hydra/lib/Hydra/Controller/Root.pm
@@ -118,42 +118,58 @@ sub queue :Local {
 }
 
 
-sub jobstatus :Local {
-    my ($self, $c) = @_;
+sub showJobStatus :Local {
+    my ($c, $builds) = @_;
     $c->stash->{template} = 'jobstatus.tt';
 
     # Get the latest finished build for each unique job.
-    $c->stash->{latestBuilds} = [$c->model('DB::Builds')->search(undef,
+    $c->stash->{latestBuilds} = [$builds->search({},
         { join => 'resultInfo'
-        , where => "finished != 0 and timestamp = (select max(timestamp) from Builds " .
-            "where project == me.project and attrName == me.attrName and finished != 0 and system == me.system)"
+        , where => {
+            finished => { "!=", 0 },
+            timestamp => \ (
+                "= (select max(timestamp) from Builds " .
+                "where project == me.project and attrName == me.attrName and finished != 0 and system == me.system)"),
+          }
         , order_by => "project, attrname, system"
         })];
 }
 
 
-sub all :Local {
-    my ($self, $c, $page) = @_;
+sub jobstatus :Local {
+    my ($self, $c) = @_;
+    showJobStatus($c, $c->model('DB::Builds'));
+}
+
+
+sub showAllBuilds {
+    my ($c, $baseUri, $page, $builds) = @_;
     $c->stash->{template} = 'all.tt';
 
     $page = int($page) || 1;
 
     my $resultsPerPage = 50;
 
-    my $nrBuilds = scalar($c->model('DB::Builds')->search({finished => 1}));
+    my $nrBuilds = scalar($builds->search({finished => 1}));
 
+    $c->stash->{baseUri} = $baseUri;
     $c->stash->{page} = $page;
     $c->stash->{resultsPerPage} = $resultsPerPage;
     $c->stash->{totalBuilds} = $nrBuilds;
 
-    $c->stash->{builds} = [$c->model('DB::Builds')->search(
+    $c->stash->{builds} = [$builds->search(
         {finished => 1}, {order_by => "timestamp DESC", rows => $resultsPerPage, page => $page})];
 }
 
 
+sub all :Local {
+    my ($self, $c, $page) = @_;
+    showAllBuilds($c, $c->uri_for("/all"), $page, $c->model('DB::Builds'));
+}
+
+
 sub updateProject {
     my ($c, $project) = @_;
-
     my $projectName = trim $c->request->params->{name};
     die "Invalid project name: $projectName" unless $projectName =~ /^[[:alpha:]]\w*$/;
     
@@ -277,7 +293,7 @@ sub updateProject {
 
 
 sub project :Local {
-    my ($self, $c, $projectName, $subcommand) = @_;
+    my ($self, $c, $projectName, $subcommand, $arg) = @_;
     $c->stash->{template} = 'project.tt';
     
     (my $project) = $c->model('DB::Projects')->search({ name => $projectName });
@@ -285,9 +301,20 @@ sub project :Local {
 
     my $isPosted = $c->request->method eq "POST";
 
+    $c->stash->{curProject} = $project;
+    
     $subcommand = "" unless defined $subcommand;
 
-    if ($subcommand ne "") {
+    if ($subcommand eq "jobstatus") {
+        return showJobStatus($c, scalar $project->builds);
+    }
+
+    elsif ($subcommand eq "all") {
+        return showAllBuilds($c, $c->uri_for("/project", $projectName, "all"),
+            $arg, scalar $project->builds);
+    }
+
+    elsif ($subcommand ne "") {
 
         return requireLogin($c) if !$c->user_exists;
 
@@ -317,8 +344,6 @@ sub project :Local {
         }
     }
 
-    $c->stash->{curProject} = $project;
-    
     getBuildStats($c, scalar $project->builds);
     
     $c->stash->{jobNames} =
diff --git a/src/Hydra/root/all.tt b/src/Hydra/root/all.tt
index f095fc59..1d90dbe4 100644
--- a/src/Hydra/root/all.tt
+++ b/src/Hydra/root/all.tt
@@ -1,20 +1,20 @@
 [% WRAPPER layout.tt title="All Builds" %]
 [% PROCESS common.tt %]
 
-<h1>All Builds</h1>
+<h1>All Builds[% IF curProject %] in Project <tt>[% curProject.name %]</tt>[% END %]</h1>
 
 <p>Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %]
 out of [% totalBuilds %] in order of descending timestamp.</p>
 
 [% PROCESS renderBuildList %]
 
-[<a href="[% c.uri_for('/all' 1) %]">First</a>]
+[<a href="[% "$baseUri/1" %]">First</a>]
 [% IF page > 1 %]
-  [<a href="[% c.uri_for('/all' (page - 1)) %]">Prev</a>]
+  [<a href="[% "$baseUri/"; (page - 1) %]">Prev</a>]
 [% END %]
 [% IF page * resultsPerPage < totalBuilds %]
-  [<a href="[% c.uri_for('/all' (page + 1)) %]">Next</a>]
+  [<a href="[% "$baseUri/"; (page + 1) %]">Next</a>]
 [% END %]
-[<a href="[% c.uri_for('/all' (totalBuilds - 1) div resultsPerPage + 1) %]">Last</a>]
+[<a href="[% "$baseUri/"; (totalBuilds - 1) div resultsPerPage + 1 %]">Last</a>]
 
 [% END %]
diff --git a/src/Hydra/root/jobstatus.tt b/src/Hydra/root/jobstatus.tt
index 1667b333..214d2ce1 100644
--- a/src/Hydra/root/jobstatus.tt
+++ b/src/Hydra/root/jobstatus.tt
@@ -1,7 +1,7 @@
 [% WRAPPER layout.tt title="Job Status" %]
 [% PROCESS common.tt %]
 
-<h1>Job Status</h1>
+<h1>Job Status[% IF curProject %] in Project <tt>[% curProject.name %]</tt>[% END %]</h1>
 
 <p>Below are the latest builds for each job.</p>
 
diff --git a/src/Hydra/root/layout.tt b/src/Hydra/root/layout.tt
index a4a101d0..cd1114e9 100644
--- a/src/Hydra/root/layout.tt
+++ b/src/Hydra/root/layout.tt
@@ -98,7 +98,7 @@
                   [% IF curProject.name == project.name %]
                     <ul class="subsubmenu">
                       [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'edit') title = "Edit" %]
-                      [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'status') title = "Status" %]
+                      [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'jobstatus') title = "Job status" %]
                       [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'all') title = "All builds" %]
                     </ul>
                   [% END %]