diff --git a/app/templates/queue.hbs b/app/templates/queue.hbs
index 5a7d24d6..2dee38d5 100644
--- a/app/templates/queue.hbs
+++ b/app/templates/queue.hbs
@@ -1,28 +1,30 @@
 {{#if isLoaded}}
-{{#if length}}
-  {{#each job in controller}}
-    <div {{bind-attr class=":tile :tile--sidebar job.state"}}>
-        {{#if job.repo.slug}}
-          <span {{bind-attr class=":icon :icon--job job.state"}}></span>
-          {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}}
-        {{/if}}
-      </h2>
+  {{#if length}}
+    {{#each job in controller}}
+      <div {{bind-attr class=":tile :tile--sidebar job.state"}}>
+          {{#if job.repo.slug}}
+            <span {{bind-attr class=":icon :icon--job job.state"}}></span>
+            {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}}
+          {{/if}}
+        </h2>
 
-      <p class="tile-title float-right">
-        <span class="icon icon--hash"></span>
-        {{#link-to "job" job.repo job}}{{job.number}}{{/link-to}}
-      </p>
+        <p class="tile-title float-right">
+          <span class="icon icon--hash"></span>
+          {{#link-to "job" job.repo job}}{{job.number}}{{/link-to}}
+        </p>
 
-      <p>
-        <span class="icon icon--clock"></span> Queued
-      </p>
+        <p>
+          <span class="icon icon--clock"></span> Queued
+        </p>
 
-    </div>
+      </div>
 
-  {{/each}}
+    {{/each}}
+  {{else}}
+    <div class="spinner-container">There are no jobs queued</div>
+  {{/if}}
 {{else}}
-  <div class="spinner-container">There are no jobs queued</div>
-{{/if}}
-{{else}}
-  <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
+  <div class="spinner-container">
+    <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
+  </div>
 {{/if}}
diff --git a/app/templates/running-jobs.hbs b/app/templates/running-jobs.hbs
index 7a91eaef..f59228d6 100644
--- a/app/templates/running-jobs.hbs
+++ b/app/templates/running-jobs.hbs
@@ -1,34 +1,36 @@
 {{!-- <h4>Running Jobs ({{controller.length}})</h4> --}}
 
 {{#if isLoaded}}
-{{#if controller.length}}
-  {{#each job in controller}}
-    <div {{bind-attr class=":tile :tile--sidebar job.state"}}>
-        {{#if job.repo.slug}}
-          <span {{bind-attr class=":icon :icon--job job.state"}}></span>
-          {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}}
-        {{/if}}
-      </h2>
+  {{#if controller.length}}
+    {{#each job in controller}}
+      <div {{bind-attr class=":tile :tile--sidebar job.state"}}>
+          {{#if job.repo.slug}}
+            <span {{bind-attr class=":icon :icon--job job.state"}}></span>
+            {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}}
+          {{/if}}
+        </h2>
 
-      <p class="tile-title float-right">
-        <span class="icon icon--hash"></span>
-        {{#link-to "job" job.repo job}}{{job.number}}{{/link-to}}
-      </p>
+        <p class="tile-title float-right">
+          <span class="icon icon--hash"></span>
+          {{#link-to "job" job.repo job}}{{job.number}}{{/link-to}}
+        </p>
 
-      <p>
-        <span class="icon icon--clock"></span>
-        Duration: 
-        <abbr class="duration" {{bind-attr title="job.startedAt"}}>
-          {{format-duration job.startedAt}}
-        </abbr>
-      </p>
+        <p>
+          <span class="icon icon--clock"></span>
+          Duration: 
+          <abbr class="duration" {{bind-attr title="job.startedAt"}}>
+            {{format-duration job.startedAt}}
+          </abbr>
+        </p>
 
-    </div>
+      </div>
 
-  {{/each}}
+    {{/each}}
+  {{else}}
+    <div class="spinner-container">There are no jobs running</div>
+  {{/if}}
 {{else}}
-  <div class="spinner-container">There are no jobs running</div>
-{{/if}}
-{{else}}
-  <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
+  <div class="spinner-container">
+    <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
+  </div>
 {{/if}}