diff --git a/ui/js/directives.js b/ui/js/directives.js
index 542ed3bdc..1825b94cb 100755
--- a/ui/js/directives.js
+++ b/ui/js/directives.js
@@ -40,13 +40,23 @@ treeherder.directive('thJobButton', function () {
                     };
                     break;
             }
+        } else {
+            switch(job.result) {
+                case "running":
+                    job.display.btnClass="";
+                    break
+            }
         }
 
     };
 
     var getHoverText = function(job) {
         var duration = Math.round((job.end_timestamp - job.submit_timestamp) / 60);
-        return job.job_type_name + " - " + job.result + " - " + duration + "mins";
+        var status = job.result;
+        if (job.state != "finished") {
+            status = job.state;
+        }
+        return job.job_type_name + " - " + status + " - " + duration + "mins";
     };
 
     return {
diff --git a/ui/partials/jobs.html b/ui/partials/jobs.html
index 957e6b8b7..8360c12d3 100755
--- a/ui/partials/jobs.html
+++ b/ui/partials/jobs.html
@@ -49,17 +49,17 @@
             <tr ng-repeat="platform in job_results | filter:query">
                 <td class="span2"><span>{{ platform.name }}</span></td>
                 <td class="span10">
-                    <div ng-repeat="group in platform.groups"
-                         ng-class="{'btn-group': group.symbol}">
-                        <a ng-show="group.symbol"
-                           class="btn-mini btn disabled"
+                    <div ng-repeat="group in platform.groups">
+                        <span ng-show="group.symbol"
+                           class="disabled"
                            title="{{ group.name }}">
-                           {{ group.symbol }}
-                        </a>
+                           {{ group.symbol }}(
+                        </span>
                         <th-job-button
                             data-job="job"
                             ng-repeat="job in group.jobs">
                         </th-job-button>
+                        <span ng-show="group.symbol">)</span>
                     </div>
                 </td>
             </tr>