diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 860b267a..7fcbc6ea 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -34,7 +34,9 @@
   [% END %]
 
   [% IF project %]
-    [% WRAPPER makeSubMenu title=("Project: " _ project.name)  %]
+    [% WRAPPER makeSubMenu title="Project"  %]
+      <li class="nav-header">[% HTML.escape(project.name) %]</li>
+      <li class="divider"></li>
       [% 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 = "Latest builds" %]
       [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('jobstatus'), [project.name]) title = "Job status" %]
@@ -50,7 +52,9 @@
   [% END %]
 
   [% IF jobset %]
-    [% WRAPPER makeSubMenu title=("Jobset: " _ ellipsize(jobset.name, 30)) %]
+    [% WRAPPER makeSubMenu title="Jobset" %]
+      <li class="nav-header">[% HTML.escape(jobset.name) %]</li>
+      <li class="divider"></li>
       [% INCLUDE menuItem
         uri = c.uri_for(c.controller('Jobset').action_for('index'), [project.name, jobset.name])
         title = "Overview" %]
@@ -98,7 +102,9 @@
   [% END %]
 
   [% IF job %]
-    [% WRAPPER makeSubMenu title=("Job: " _ ellipsize(job.name, 30)) %]
+    [% WRAPPER makeSubMenu title="Job" %]
+      <li class="nav-header">[% HTML.escape(job.name) %]</li>
+      <li class="divider"></li>
       [% INCLUDE menuItem
         uri = c.uri_for(c.controller('Job').action_for('overview'), [project.name, jobset.name, job.name])
         title = "Overview" %]
@@ -117,7 +123,9 @@
   [% END %]
 
   [% IF build %]
-    [% WRAPPER makeSubMenu title=("Build: " _ build.id) %]
+    [% WRAPPER makeSubMenu title="Build" %]
+      <li class="nav-header">#[% build.id %]</li>
+      <li class="divider"></li>
       [% INCLUDE menuItem
         uri = c.uri_for('/build' build.id)
         title = "Overview" %]