diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index cb86253bad..f452a028e9 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -182,6 +182,12 @@
     align-items: flex-start;
 }
 
+.Form-checkbox--stacked {
+    label {
+        display: block;
+    }
+}
+
 .Form-textUneditable {
     .Form-textInput {
         border: none;
diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js
index e21d0cfff4..79b81459ec 100644
--- a/awx/ui/client/src/forms/Groups.js
+++ b/awx/ui/client/src/forms/Groups.js
@@ -249,6 +249,7 @@ export default
                     label: 'Update Options',
                     type: 'checkbox_group',
                     ngShow: "source && (source.value !== 'manual' && source.value !== null)",
+                    class: 'Form-checkbox--stacked',
 
                     fields: [{
                         name: 'overwrite',
diff --git a/awx/ui/client/src/help/InventoryGroups.js b/awx/ui/client/src/help/InventoryGroups.js
index 1d6b185fa3..c9ee3b7432 100644
--- a/awx/ui/client/src/help/InventoryGroups.js
+++ b/awx/ui/client/src/help/InventoryGroups.js
@@ -3,7 +3,7 @@
  *
  * All Rights Reserved
  *************************************************/
- 
+
  /**
  * @ngdoc function
  * @name help.function:InventoryGroups
@@ -53,7 +53,7 @@ angular.module('InventoryGroupsHelpDefinition', [])
                     maxWidth: 187,
                     maxHeight: 175
                 },
-                box: "To import a cloud inventory into Tower, initiate an inventory sync by clicking <i class=\"fa fa-exchange\"></i>."
+                box: "To import a cloud inventory into Tower, initiate an inventory sync by clicking <i class=\"fa fa-refresh\"></i>."
             }, {
                 intro: "Add subgroups:",
                 img: {
diff --git a/awx/ui/client/src/helpers/Groups.js b/awx/ui/client/src/helpers/Groups.js
index b34a9a081c..a39e4c2b5a 100644
--- a/awx/ui/client/src/helpers/Groups.js
+++ b/awx/ui/client/src/helpers/Groups.js
@@ -90,7 +90,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name
                          // do nothing
                      } else if (Empty(group.status) || group.status === "never updated") {
                          Alert('No Status Available', 'An inventory sync has not been performed for the selected group. Start the process by ' +
-                               'clicking the <i class="fa fa-exchange"></i> button.', 'alert-info', null, null, null, null, true);
+                               'clicking the <i class="fa fa-refresh"></i> button.', 'alert-info', null, null, null, null, true);
                      } else {
                          Wait('start');
                          Rest.setUrl(group.related.inventory_source);
@@ -174,7 +174,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name
                      case 'never updated':
                          stat = 'never';
                      stat_class = 'na';
-                     status_tip = 'Sync not performed. Click <i class="fa fa-exchange"></i> to start it now.';
+                     status_tip = 'Sync not performed. Click <i class="fa fa-refresh"></i> to start it now.';
                      break;
                      case 'none':
                          case 'ok':
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/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js
index e701b2b782..c14f46cdda 100644
--- a/awx/ui/client/src/shared/generator-helpers.js
+++ b/awx/ui/client/src/shared/generator-helpers.js
@@ -129,7 +129,7 @@ angular.module('GeneratorHelpers', [systemStatus.name])
                 icon = "fa-trash-o";
                 break;
             case 'group_update':
-                icon = 'fa-exchange';
+                icon = 'fa-refresh';
                 break;
             case 'scm_update':
                 icon = 'fa-cloud-download';
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">