diff --git a/app/templates/build.hbs b/app/templates/build.hbs
index bdd36126..69d77943 100644
--- a/app/templates/build.hbs
+++ b/app/templates/build.hbs
@@ -61,6 +61,7 @@
         <li>
           <span class="icon icon--clock"></span>
           {{#if build.isFinished}}ran{{else}}running{{/if}} for {{format-duration build.duration}}
+        </li>
         <li {{bind-attr title="build.finishedAt"}}>
           <span class="icon icon--cal"></span>
           {{format-time build.finishedAt}}
diff --git a/app/templates/components/build-repo-actions.hbs b/app/templates/components/build-repo-actions.hbs
index 9b00cd3b..163eee0f 100644
--- a/app/templates/components/build-repo-actions.hbs
+++ b/app/templates/components/build-repo-actions.hbs
@@ -14,7 +14,7 @@
     <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
   {{else}}
     <a href="#" {{action "restart"}} class="button-circle" title="Restart Build">
-      <span class="icon icon--trigger">
+      <span class="icon icon--trigger"></span>
     </a>
   {{/if}}
 {{/if}}
diff --git a/app/templates/components/job-repo-actions.hbs b/app/templates/components/job-repo-actions.hbs
index a02d9fd1..68db5cff 100644
--- a/app/templates/components/job-repo-actions.hbs
+++ b/app/templates/components/job-repo-actions.hbs
@@ -13,7 +13,7 @@
     <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
   {{else}}
     <a href="#" {{action "restart"}} class="button-circle" title="Restart Job">
-      <span class="icon icon--trigger">
+      <span class="icon icon--trigger"></span>
     </a>
   {{/if}}
 {{/if}}
diff --git a/app/templates/components/repo-actions.hbs b/app/templates/components/repo-actions.hbs
index 7a2f4e24..3ba1fddd 100644
--- a/app/templates/components/repo-actions.hbs
+++ b/app/templates/components/repo-actions.hbs
@@ -11,7 +11,7 @@
   {{#if displayCodeClimate}}
     <a href="#" name="code-climate"
       {{action "codeClimatePopup"}} class="button-circle open-popup"
-      {{bind-attr class=":open-popup"}} title="Test Coverage with Code Climate">
+      title="Test Coverage with Code Climate">
       <span class="icon icon--codeclimate"></span>
     </a>
   {{/if}}
diff --git a/app/templates/job.hbs b/app/templates/job.hbs
index 95bb366e..31e2d6b6 100644
--- a/app/templates/job.hbs
+++ b/app/templates/job.hbs
@@ -49,6 +49,7 @@
       <li>
         <span class="icon icon--clock"></span>
         {{#if job.isFinished}}ran{{else}}running{{/if}} for {{format-duration job.duration}}
+      </li>
       <li>
         <span class="icon icon--cal"></span>
         {{format-time job.finishedAt}}
diff --git a/app/templates/queue.hbs b/app/templates/queue.hbs
index 76fdcf0f..e780f625 100644
--- a/app/templates/queue.hbs
+++ b/app/templates/queue.hbs
@@ -2,11 +2,10 @@
   {{#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 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}}
 
         <p class="tile-title float-right">
           <span class="icon icon--hash"></span>
diff --git a/app/templates/repo.hbs b/app/templates/repo.hbs
index dc4e2c2e..f2f7de4b 100644
--- a/app/templates/repo.hbs
+++ b/app/templates/repo.hbs
@@ -19,12 +19,13 @@
         <div class="repo-menus">
           <div class="repo-menu-header">
             {{view 'repo-show-tools'}}
-            
+
             {{view 'repo-show-tabs'}}
           </div>
           <div class="tabbody repo-main">
             {{outlet}}
           </div>
+        </div>
       </article>
 
     {{else}}
diff --git a/app/templates/running-jobs.hbs b/app/templates/running-jobs.hbs
index d039ae2d..0c12c853 100644
--- a/app/templates/running-jobs.hbs
+++ b/app/templates/running-jobs.hbs
@@ -2,11 +2,10 @@
   {{#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 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}}
 
         <p class="tile-title float-right">
           <span class="icon icon--hash"></span>
diff --git a/app/templates/settings/index.hbs b/app/templates/settings/index.hbs
index ae97ba2d..eb576cb7 100644
--- a/app/templates/settings/index.hbs
+++ b/app/templates/settings/index.hbs
@@ -15,7 +15,7 @@
   </p>
 
   <p class="settings-row">
-    <p class="short-settings-element" {{bind-attr class="settings.maximum_number_of_builds_valid"}}>
+    <p {{bind-attr class=":short-settings-element settings.maximum_number_of_builds_valid"}}>
       {{input value=settings.maximum_number_of_builds size="4" pattern='/^[0-9]+$/'}}
     </p>
     <label>