diff --git a/src/root/queue.tt b/src/root/queue.tt
index e4795a70..2e10214b 100644
--- a/src/root/queue.tt
+++ b/src/root/queue.tt
@@ -1,8 +1,6 @@
 [% WRAPPER layout.tt title="Queue" %]
 [% PROCESS common.tt %]
 
-<p><a class="btn" href="[% c.uri_for('/status') %]">Running build steps</a></p>
-
 [% IF queue.size == 0 %]
 
   <p>The queue is empty.</p>
diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 2d9f531f..e92cdf94 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -25,15 +25,24 @@
 [% END %]
 
 <ul class="nav" id="top-menu">
-  [% INCLUDE makeLink
-     uri = c.uri_for(c.controller('Root').action_for('queue'))
-     title = "Queue ("_ nrRunningBuilds _"/"_ nrQueuedBuilds _")" %]
-  [% INCLUDE makeLink
-     uri = c.uri_for(c.controller('Root').action_for('all'))
-     title = "All builds" %]
+
+  [% WRAPPER makeSubMenu title="Status" %]
+    [% INCLUDE makeLink
+       uri = c.uri_for(c.controller('Root').action_for('queue'))
+       title = "Queue ("_ nrRunningBuilds _"/"_ nrQueuedBuilds _")" %]
+    [% INCLUDE makeLink
+       uri = c.uri_for(c.controller(Root).action_for('status'))
+       title = "Active build steps" %]
+    [% INCLUDE makeLink
+       uri = c.uri_for(c.controller('Admin').action_for('index'))
+       title = "Machine status" %]
+    [% INCLUDE makeLink
+       uri = c.uri_for(c.controller('Root').action_for('all'))
+       title = "Recent builds" %]
+  [% END %]
 
   [% IF project %]
-    [% WRAPPER makeSubMenu title=("Project: " _ project.name) collapsed=(jobset || job)  %]
+    [% WRAPPER makeSubMenu title=("Project: " _ project.name)  %]
       [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('view'), [project.name]) title = "Overview" %]
       [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('all'), [project.name]) title = "All builds" %]
       [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('jobstatus'), [project.name]) title = "Job status" %]
@@ -55,7 +64,7 @@
   [% END %]
 
   [% IF jobset %]
-    [% WRAPPER makeSubMenu title=("Jobset: " _ jobset.name) collapsed=job %]
+    [% WRAPPER makeSubMenu title=("Jobset: " _ jobset.name) %]
       [% INCLUDE makeLink
         uri = c.uri_for(c.controller('Jobset').action_for('index'), [project.name, jobset.name])
         title = "Overview" %]
@@ -141,10 +150,6 @@
 
   [% IF c.user_exists && c.check_user_roles('admin') %]
     [% WRAPPER makeSubMenu title="Admin" %]
-      [% INCLUDE makeLink
-        uri = c.uri_for(c.controller('Admin').action_for('index'))
-        title = "Machine status" %]
-      <li class="divider"></li>
       [% INCLUDE makeLink
         uri = c.uri_for(c.controller('Admin').action_for('machines'))
         title = "Manage machines" %]