diff --git a/awx/ui/static/js/system-tracking/data-services/get-module-options.factory.js b/awx/ui/static/js/system-tracking/data-services/get-module-options.factory.js
index 031396da9d..961ef718ac 100644
--- a/awx/ui/static/js/system-tracking/data-services/get-module-options.factory.js
+++ b/awx/ui/static/js/system-tracking/data-services/get-module-options.factory.js
@@ -25,13 +25,10 @@ function makeModule(option) {
     var config = moduleConfig.hasOwnProperty(name) ?
                     moduleConfig[name] : moduleConfig.custom;
 
-    return {
-        name: name,
-        displayName: displayName,
-        compareKey: config.compareKey,
-        nameKey: config.nameKey,
-        displayType: config.displayType
-    };
+    config.name = name;
+    config.displayName = displayName;
+
+    return config;
 }
 
 function factory(hostId, rest, getBasePath, _) {
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 b8cef91cdc..6545cf4245 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
@@ -3,9 +3,13 @@
 .FactModuleFilter {
     width: 100%;
     display: flex;
+    flex-flow: row wrap;
     margin-bottom: 2.8rem;
     &-module {
-        flex: 1;
+        flex: 1 1 20%;
+        @media screen and (max-width: 750px) {
+            flex-basis: 50%;
+        }
         &--isActive {
             // copied from bootstrap's .btn:focus
             background-color: #ebebeb;