diff --git a/src/root/build.tt b/src/root/build.tt
index 42ddc969..50df3fdd 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -160,9 +160,9 @@
 			
 		[% END %]
 
-        [% IF !build.finished %]
+        [% IF !build.finished && build.buildsteps.size > 0 %]
             [% INCLUDE renderBuildSteps type="Running" %]
-		[% END %]
+	[% END %]
 
 		[% IF build.finished %]
 			[% IF build.buildsteps && build.buildstatus != 0 && build.buildstatus != 6 %]
diff --git a/src/root/queue.tt b/src/root/queue.tt
index f0c5aa12..58a3d00b 100644
--- a/src/root/queue.tt
+++ b/src/root/queue.tt
@@ -3,7 +3,7 @@
 
 <h1>Hydra Queue</h1>
 
-<p>[ <a href="[% c.uri_for('/status') %]">Running buildsteps</a> ]</p>
+<p>[ <a href="[% c.uri_for('/status') %]">Running build steps</a> ]</p>
 
 [% IF flashMsg %]
 <p class="error">[% flashMsg %]</p>