diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js
index ac8bbb2c3d..868058d30e 100644
--- a/awx/ui/static/js/helpers/JobDetail.js
+++ b/awx/ui/static/js/helpers/JobDetail.js
@@ -709,7 +709,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
             url = scope.job.related.job_events + '?parent=' + scope.activeTask + '&';
             url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : '';
             url += (scope.searchAllStatus === 'failed') ? 'failed=true&' : '';
-            url += 'host__isnull=false&page_size=' + scope.hostTableRows + '&order_by=host__name';
+            url += 'event__icontains=runner&page_size=' + scope.hostTableRows + '&order_by=host__name';
             Rest.setUrl(url);
             Rest.get()
                 .success(function(data) {
diff --git a/awx/ui/static/js/widgets/JobStatus.js b/awx/ui/static/js/widgets/JobStatus.js
index a756dea46f..bbd14de919 100644
--- a/awx/ui/static/js/widgets/JobStatus.js
+++ b/awx/ui/static/js/widgets/JobStatus.js
@@ -10,90 +10,24 @@
 'use strict';
 
 angular.module('JobStatusWidget', ['RestServices', 'Utilities'])
-    .factory('JobStatus', ['$rootScope', '$compile', 'Rest', 'GetBasePath', 'ProcessErrors', 'Wait',
-        function ($rootScope, $compile) {
-            return function (params) {
+    .factory('JobStatus', ['$rootScope', '$compile', 'Rest', 'GetBasePath', 'ProcessErrors', 'Wait', function ($rootScope, $compile) {
+        return function (params) {
+            var scope = params.scope,
+                target = params.target,
+                html = '', element;
 
-                var scope = params.scope,
-                    target = params.target,
-                    dashboard = params.dashboard,
-                    html = '', element;
-                
-                html = "<div class=\"panel panel-default\">\n";
-                html += "<div class=\"panel-heading\">Job Status</div>\n";
-                html += "<div class=\"panel-body\">\n";
-                html += "<table class=\"table table-condensed table-hover\">\n";
-                html += "<thead>\n";
-                html += "<tr>\n";
-                html += "<th class=\"col-md-4 col-lg-3\"></th>\n";
-                html += "<th class=\"col-md-2 col-lg-1 text-right\">Failed</th>\n";
-                html += "<th class=\"col-md-2 col-lg-1 text-right\">Total</th>\n";
-                html += "</tr>\n";
-                html += "</thead>\n";
-                html += "<tbody>\n";
+            html += "<ul id=\"job_status_tabs\" class=\"nav nav-tabs\">\n";
+            html += "<li class=\"active\"><a id=\"active_jobs_link\" ng-click=\"toggleTab($event, 'active_jobs_link', 'job_status_tabs')\"\n";
+            html += " href=\"#active-jobs-tab\" data-toggle=\"tab\">Jobs</a></li>\n";
+            html += "<li><a id=\"scheduled_jobs_link\" ng-click=\"toggleTab($event, 'scheduled_jobs_link', 'job_status_tabs')\"\n";
+            html += "href=\"#scheduled-jobs-tab\" data-toggle=\"tab\">Schedule</a></li>\n";
+            html += "</ul>\n";
+            html += "<div class=\"tab-content\">\n";
+            html += "<div class=\"tab-pane active\" id=\"active-jobs-tab\"></div>\n";
+            html += "<div class=\"tab-pane\" id=\"scheduled-jobs-tab\"></div>\n";
+            html += "<div class=\"tab-pane\" id=\"schedules-tab\"></div>\n";
+            html += "</div>\n";
 
-                function makeRow(params) {
-                    var html = '',
-                        label = params.label,
-                        link = params.link,
-                        fail_link = params.fail_link,
-                        count = params.count,
-                        fail = params.fail;
-                    html += "<tr>\n";
-                    html += "<td><a href=\"" + link + "\"";
-                    html += (label === 'Hosts' || label === 'Groups') ? " class=\"pad-left-sm\" " : "";
-                    html += ">" + label + "</a></td>\n";
-                    html += "<td class=\"";
-                    html += (fail > 0) ? 'failed-column' : 'zero-column';
-                    html += " text-right\">";
-                    html += "<a href=\"" + fail_link + "\">" + fail + "</a>";
-                    html += "</td>\n";
-                    html += "<td class=\"text-right\">";
-                    html += "<a href=\"" + link + "\" >" + count + "</a>";
-                    html += "</td></tr>\n";
-                    return html;
-                }
 
-                html += makeRow({
-                    label: 'Jobs',
-                    link: '/#/jobs',
-                    count: (dashboard.jobs && dashboard.jobs.total) ? dashboard.jobs.total : 0,
-                    fail: (dashboard.jobs && dashboard.jobs.failed) ? dashboard.jobs.failed : 0,
-                    fail_link: '/#/jobs/?status=failed'
-                });
-                html += makeRow({
-                    label: 'Inventories',
-                    link: '/#/inventories',
-                    count: (dashboard.inventories && dashboard.inventories.total) ? dashboard.inventories.total : 0,
-                    fail: (dashboard.inventories && dashboard.inventories.job_failed) ? dashboard.inventories.job_failed : 0,
-                    fail_link: '/#/inventories/?has_active_failures=true'
-                });
-                html += makeRow({
-                    label: 'Groups',
-                    link: '/#/home/groups',
-                    count: (dashboard.groups && dashboard.groups.total) ? dashboard.groups.total : 0,
-                    fail: (dashboard.groups && dashboard.groups.job_failed) ? dashboard.groups.job_failed : 0,
-                    fail_link: '/#/home/groups/?has_active_failures=true'
-                });
-                html += makeRow({
-                    label: 'Hosts',
-                    link: '/#/home/hosts',
-                    count: (dashboard.hosts && dashboard.hosts.total) ? dashboard.hosts.total : 0,
-                    fail: (dashboard.hosts && dashboard.hosts.failed) ? dashboard.hosts.failed : 0,
-                    fail_link: '/#/home/hosts/?has_active_failures=true'
-                });
-
-                html += "</tbody>\n";
-                html += "</table>\n";
-                html += "</div>\n";
-                html += "</div>\n";
-                html += "</div>\n";
-
-                element = angular.element(document.getElementById(target));
-                element.html(html);
-                $compile(element)(scope);
-                scope.$emit('WidgetLoaded');
-
-            };
-        }
-    ]);
\ No newline at end of file
+        };
+    }]);
\ No newline at end of file