diff --git a/awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js b/awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js
index a1be88d05c..7f67d81936 100644
--- a/awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js
+++ b/awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js
@@ -10,7 +10,7 @@
  * @description This controller controls the adhoc form creation, command launching and navigating to standard out after command has been succesfully ran.
 */
 function adhocController($q, $scope, $location, $stateParams,
-    $state, CheckPasswords, PromptForPasswords, CreateLaunchDialog, adhocForm,
+    $state, CheckPasswords, PromptForPasswords, CreateLaunchDialog, CreateSelect2, adhocForm,
     GenerateForm, Rest, ProcessErrors, ClearScope, GetBasePath, GetChoices,
     KindChange, LookUpInit, CredentialList, Empty, Wait) {
 
@@ -68,6 +68,17 @@ function adhocController($q, $scope, $location, $stateParams,
             if (formReadyPromise === 2) {
                 privateFn.setFieldDefaults($scope.adhoc_verbosity_options,
                     $scope.forks_field.default);
+
+                CreateSelect2({
+                    element: '#adhoc_module_name',
+                    multiple: false
+                });
+
+                CreateSelect2({
+                    element: '#adhoc_verbosity',
+                    multiple: false
+                });
+
                 Wait('stop');
             }
         }
@@ -295,7 +306,7 @@ function adhocController($q, $scope, $location, $stateParams,
 }
 
 export default ['$q', '$scope', '$location', '$stateParams',
-    '$state', 'CheckPasswords', 'PromptForPasswords', 'CreateLaunchDialog', 'adhocForm',
-    'GenerateForm', 'Rest', 'ProcessErrors', 'ClearScope', 'GetBasePath',
+    '$state', 'CheckPasswords', 'PromptForPasswords', 'CreateLaunchDialog', 'CreateSelect2',
+     'adhocForm', 'GenerateForm', 'Rest', 'ProcessErrors', 'ClearScope', 'GetBasePath',
     'GetChoices', 'KindChange', 'LookUpInit', 'CredentialList', 'Empty', 'Wait',
     adhocController];
diff --git a/awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js b/awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js
index 6c61349352..1934aa1341 100644
--- a/awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js
+++ b/awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js
@@ -123,17 +123,17 @@ export default function() {
             },
         },
         buttons: {
-            launch: {
-                label: 'Save',
-                ngClick: 'launchJob()',
-                ngDisabled: true,
-                'class': 'btn btn-sm List-buttonSubmit'
-            },
             reset: {
                 ngClick: 'formReset()',
                 ngDisabled: true,
                 label: 'Reset',
                 'class': 'btn btn-sm Form-cancelButton'
+            },
+            launch: {
+                label: 'Save',
+                ngClick: 'launchJob()',
+                ngDisabled: true,
+                'class': 'btn btn-sm List-buttonSubmit'
             }
         },
 
diff --git a/awx/ui/client/src/lists/Groups.js b/awx/ui/client/src/lists/Groups.js
index f93162b302..072c35f9a3 100644
--- a/awx/ui/client/src/lists/Groups.js
+++ b/awx/ui/client/src/lists/Groups.js
@@ -3,7 +3,7 @@
  *
  * All Rights Reserved
  *************************************************/
- 
+
 
 
 
@@ -15,7 +15,8 @@ export default
         iterator: 'group',
         selectTitle: 'Copy Groups',
         index: false,
-        well: false,        
+        well: false,
+        emptyListText: 'PLEASE CREATE ADDITIONAL GROUPS / HOSTS TO PERFORM THIS ACTION',
         fields: {
             name: {
                 key: true,
diff --git a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less
index 1b20cf5f8a..4dee8f65c7 100644
--- a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less
+++ b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less
@@ -85,11 +85,19 @@
     justify-content: center;
 
     &-message {
-        font-size: 1.5em;
+        font-size: 14px;
         line-height: 1.5;
-        text-align: center;
-        width: 75%;
         margin-bottom: 2em;
+        color: @default-interface-txt;
+        text-transform: uppercase;
+        width: 100%;
+        height: 200px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 5px;
+        border: 1px solid @default-no-items-bord;
+        background-color: @default-no-items-bord;
     }
 
     &-note {
diff --git a/awx/ui/client/src/system-tracking/system-tracking.partial.html b/awx/ui/client/src/system-tracking/system-tracking.partial.html
index 7082f473a5..ca13b85a7c 100644
--- a/awx/ui/client/src/system-tracking/system-tracking.partial.html
+++ b/awx/ui/client/src/system-tracking/system-tracking.partial.html
@@ -8,7 +8,7 @@
 </section>
 <section class="SystemTrackingContainer Panel" ng-hide="noModuleData">
     <div class="row">
-        <div class="Form-title ng-binding col-md-3">SYSTEM TRACKING | {{inventory.name}}</div>
+        <div class="Form-title ng-binding col-md-3">SYSTEM TRACKING <div class="List-titleLockup"></div>{{inventory.name}}</div>
         <div class="FactModulePickers row col-md-8 col-md-offset-1">
             <div class="row">
                 <div class="FactModulePickers-dateContainer FactModulePickers-dateContainer--left col-md-6">