diff --git a/src/root/common.tt b/src/root/common.tt
index fddeaecc..542a03c3 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -54,9 +54,9 @@ END;
 
 
 BLOCK renderDuration;
-  IF duration >= 24 * 60 * 60; duration div (24 * 60 * 60) %]d[% END;
-  IF duration >= 60 * 60; duration div (60 * 60) % 24 %]h[% END;
-  IF duration >= 60; duration div 60 % 60 %]m[% END;
+  IF duration >= 24 * 60 * 60; duration div (24 * 60 * 60) %]d [% END;
+  IF duration >= 60 * 60; duration div (60 * 60) % 24 %]h [% END;
+  IF duration >= 60; duration div 60 % 60 %]m [% END;
   duration % 60 %]s[%
 END;
 
diff --git a/src/root/machine-status.tt b/src/root/machine-status.tt
index 01aafc3d..d8db95fa 100644
--- a/src/root/machine-status.tt
+++ b/src/root/machine-status.tt
@@ -2,38 +2,37 @@
 [% PROCESS common.tt %]
 
 <table class="table table-condensed table-striped">
-[% FOREACH m IN machines %]
+  [% FOREACH m IN machines %]
     <thead>
-        <tr>
-            <th colspan="5">
-                [% IF m.enabled == 1 %]
-                    <a class="btn btn-success btn-mini" href="[% c.uri_for('/admin/machine' m.hostname 'disable' ) %]">Running</a>
-                [% ELSE %]
-                    <a class="btn btn-danger btn-mini" href="[% c.uri_for('/admin/machine' m.hostname 'enable' ) %]">Stopped</a>
-                [% END %]
-                [% m.hostname %] <tt>[% FOREACH ms IN m.buildmachinesystemtypes %] [% ms.system %][% END %]</tt>
-            </th>
-        </tr>
+      <tr>
+        <th colspan="5">
+          [% IF m.enabled == 1 %]
+            <a class="btn btn-success btn-mini" href="[% c.uri_for('/admin/machine' m.hostname 'disable' ) %]">Running</a>
+          [% ELSE %]
+            <a class="btn btn-danger btn-mini" href="[% c.uri_for('/admin/machine' m.hostname 'enable' ) %]">Stopped</a>
+          [% END %] <tt>[% m.hostname %]</tt> (<tt>[% comma=0; FOREACH ms IN m.buildmachinesystemtypes %][% IF comma; %], [% ELSE; comma = 1; END; ms.system; END %])</tt>
+        </th>
+      </tr>
     </thead>
     <tbody>
-    [% idle = 1 %]
-    [% FOREACH step IN steps %]
+      [% idle = 1 %]
+      [% FOREACH step IN steps %]
         [% IF step.machine.match('@(.*)').0 == m.hostname %]
-            [% idle = 0 %]
-            <tr>
-                <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><tt>[% step.drvpath.match('-(.*)').0 %]</tt></td>
-                <td class='right'>[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>
-            </tr>
+          [% idle = 0 %]
+          <tr>
+            <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><tt>[% step.drvpath.match('-(.*)').0 %]</tt></td>
+            <td class='right'>[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>
+          </tr>
         [% END %]
-    [% END %]
-    [% IF idle == 1 %]
-        <tr><td colspan="5">Idle since [% INCLUDE renderDuration duration = curTime - m.get_column('idle') %]</td></tr>
-    [% END %]
+      [% END %]
+      [% IF idle == 1 %]
+          <tr><td colspan="5">Idle since [% INCLUDE renderDuration duration = curTime - m.get_column('idle') %]</td></tr>
+      [% END %]
     </tbody>
-[% END %]
+  [% END %]
 </table>