diff --git a/awx/ui/static/js/system-tracking/fact-data-group.block.less b/awx/ui/static/js/system-tracking/fact-data-group.block.less
index 546e787b95..c93416abaa 100644
--- a/awx/ui/static/js/system-tracking/fact-data-group.block.less
+++ b/awx/ui/static/js/system-tracking/fact-data-group.block.less
@@ -9,14 +9,13 @@
 @import 'shared/text-label.less';
 
 .FactDataGroup {
-    &-header {
-        display: flex;
-        &--new {
-            &:after {
-                .include-text-label(#676767; white; "new");
-                align-self: center;
-                font-size: 1rem;
-            }
+    &-headings {
+        &:hover {
+            background-color: #fff;
+            border-color: transparent;
         }
     }
+    &-header {
+        padding: 0;
+    }
 }
diff --git a/awx/ui/static/js/system-tracking/fact-data-table.block.less b/awx/ui/static/js/system-tracking/fact-data-table.block.less
index 81c084f132..96b694f269 100644
--- a/awx/ui/static/js/system-tracking/fact-data-table.block.less
+++ b/awx/ui/static/js/system-tracking/fact-data-table.block.less
@@ -1,7 +1,7 @@
 /** @define FactDataTable */
 
 .FactDataTable {
-    &-row, &-headingRow {
+    &-row, &-headingRow, &-groupHeadingRow {
         display: flex;
     }
 
@@ -9,7 +9,8 @@
       margin-bottom: 0.5em;
       align-items: center;
       transition: background-color 100ms, border-color 100ms;
-      border: solid 1px transparent;
+      max-height: 36px;
+      border: solid 1px #fff;
       &:hover {
         background-color: #ebebeb;
         border-color: #adadad;
@@ -22,7 +23,7 @@
     }
 
     &-column {
-        padding: 0.5em 0;
+        padding: 8px;
         flex: 1;
         white-space: nowrap;
         &--offsetLeft {
diff --git a/awx/ui/static/js/system-tracking/fact-datum.block.less b/awx/ui/static/js/system-tracking/fact-datum.block.less
index a12ab5aa80..49c9e02a83 100644
--- a/awx/ui/static/js/system-tracking/fact-datum.block.less
+++ b/awx/ui/static/js/system-tracking/fact-datum.block.less
@@ -2,6 +2,17 @@
 
 .FactDatum {
     &--divergent {
-        font-style: italic;
+        margin-bottom: 0;
+        background-color: #ffb2ae;
+        border: none;
+
+        &:hover {
+            background-color: #ffb2ae;
+            border: none;
+        }
+
+        .FactDataTable-column:first-child {
+            background-color: #fff;
+        }
     }
 }
diff --git a/awx/ui/static/js/system-tracking/fact-module-filter.block.less b/awx/ui/static/js/system-tracking/fact-module-filter.block.less
index a89cf51e71..9be4bea6fb 100644
--- a/awx/ui/static/js/system-tracking/fact-module-filter.block.less
+++ b/awx/ui/static/js/system-tracking/fact-module-filter.block.less
@@ -18,7 +18,7 @@
         @media screen and (max-width: 750px) {
             flex-basis: 50%;
         }
-        &--isActive {
+        &--isActive, &:active, &:focus {
             // copied from bootstrap's .btn:focus
             background-color: @enabled-item-background;
             border-color: @enabled-item-border;
diff --git a/awx/ui/static/js/system-tracking/system-tracking.partial.html b/awx/ui/static/js/system-tracking/system-tracking.partial.html
index 5b2dec27d9..bda14ba775 100644
--- a/awx/ui/static/js/system-tracking/system-tracking.partial.html
+++ b/awx/ui/static/js/system-tracking/system-tracking.partial.html
@@ -67,7 +67,7 @@
 
             <div class="FactDataTable-factGroup FactDataGroup" ng-repeat="group in factData | orderBy: 'displayKeyPath'">
 
-                <div class="FactDataTable-row FactDataGroup-headings" ng-switch="group.nestingLevel">
+                <div class="FactDataTable-groupHeadingRow" ng-switch="group.nestingLevel" ng-if="group.displayKeyPath">
                     <h2 class="FactDataTable-column FactDataTable-column--full FactDataGroup-header" ng-switch-when="0">
                         {{group.displayKeyPath}}
                     </h2>