diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm
index 02918fc0..5f7bbd16 100644
--- a/src/lib/Hydra/Controller/Root.pm
+++ b/src/lib/Hydra/Controller/Root.pm
@@ -99,10 +99,7 @@ sub status_GET {
     my ($self, $c) = @_;
     $self->status_ok(
         $c,
-        entity => [ $c->model('DB::BuildSteps')->search(
-            { 'me.busy' => 1, 'build.finished' => 0, 'build.busy' => 1 },
-            { order_by => [ 'machine' ], join => [ 'build' ] }
-        ) ]
+        entity => [$c->model('DB::Builds')->search({finished => 0, busy => 1}, { order_by => ["priority DESC", "id"]})]
     );
 }
 
diff --git a/src/root/queue.tt b/src/root/queue.tt
index 43f0a090..202ec81a 100644
--- a/src/root/queue.tt
+++ b/src/root/queue.tt
@@ -1,9 +1,9 @@
 [% WRAPPER layout.tt title="Queue" %]
 [% PROCESS common.tt %]
 
-[% IF queue.size == 0 %]
+[% IF resource.size == 0 %]
 
-  <p>The queue is empty.</p>
+  <div class="alert alert-info">There are no pending builds.</div>
 
 [% ELSE %]
 
diff --git a/src/root/status.tt b/src/root/status.tt
index 1742c96f..a1c2157c 100644
--- a/src/root/status.tt
+++ b/src/root/status.tt
@@ -1,23 +1,14 @@
-[% WRAPPER layout.tt title="Active build steps" %]
+[% WRAPPER layout.tt title="Running builds" %]
 [% PROCESS common.tt %]
 
-<table class="table table-striped table-condensed clickable-rows">
-  <thead>
-    <tr><th>Machine</th><th>Job</th><th>Type</th><th>Build</th><th>Step</th><th>What</th><th>Since</th></tr>
-  </thead>
-  <tbody>
-    [% FOREACH step IN resource %]
-      <tr>
-        <td><tt>[% IF step.machine; step.machine.match('@(.*)').0; ELSE; 'localhost'; END %]</tt></td>
-        <td><tt>[% INCLUDE renderFullJobName project = step.build.project.name jobset = step.build.jobset.name job = step.build.job.name %]</tt></td>
-        <td><tt>[% step.system %]</tt></td>
-        <td><a href="[% c.uri_for('/build' step.build.id) %]">[% step.build.id %]</a></td>
-        <td><a class="row-link" href="[% c.uri_for('/build' step.build.id 'nixlog' step.stepnr 'tail-reload') %]">[% step.stepnr %]</a></td>
-        <td><tt>[% step.drvpath.match('-(.*)').0 %]</tt></td>
-        <td style="width: 10em">[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>
-      </tr>
-    [% END %]
-  </tbody>
-</table>
+[% IF resource.size == 0 %]
+
+  <div class="alert alert-info">There are no running builds.</div>
+
+[% ELSE %]
+
+  [% INCLUDE renderBuildList builds=resource showSchedulingInfo=1 hideResultInfo=1 %]
+
+[% END %]
 
 [% END %]
diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 09c0b8b1..c1ec295e 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -21,7 +21,7 @@
        title = "Queue ("_ nrRunningBuilds _"/"_ nrQueuedBuilds _")" %]
     [% INCLUDE menuItem
        uri = c.uri_for(c.controller('Root').action_for('status'))
-       title = "Active build steps" %]
+       title = "Running builds" %]
     [% INCLUDE menuItem
        uri = c.uri_for(c.controller('Root').action_for('machines'))
        title = "Machine status" %]