diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index 28c1d44347..0272121811 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -1086,6 +1086,12 @@ input[type="checkbox"].checkbox-no-label {
   }
 }
 
+.table.table-condensed.flyout {
+    thead>tr>th {
+        border: none;
+    }
+}
+
 
 /* Table info rows */
 
diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index fbfe170218..d2b727746a 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -187,7 +187,7 @@
 
 .Form-formGroup--checkbox{
     display: flex;
-    align-items: flex-start;
+    align-items: flex-end;
 }
 
 .Form-checkbox--stacked {
@@ -510,7 +510,7 @@ input[type='radio']:checked:before {
     border-color: @default-border;
 }
 
-.Form-saveButton{
+.Form-saveButton, .Form-launchButton{
     background-color: @submit-button-bg;
     color: @submit-button-text;
     text-transform: uppercase;
@@ -519,11 +519,11 @@ input[type='radio']:checked:before {
     padding-right: 15px;
 }
 
-.Form-saveButton:disabled{
+.Form-saveButton:disabled, .Form-launchButton:disabled{
     background-color: @submit-button-bg-dis;
 }
 
-.Form-saveButton:hover{
+.Form-saveButton:hover, .Form-launchButton:hover{
     background-color: @submit-button-bg-hov;
     color: @submit-button-text;
 }
diff --git a/awx/ui/client/legacy-styles/jquery-ui-overrides.less b/awx/ui/client/legacy-styles/jquery-ui-overrides.less
index 0d13547c5b..07f3c76c58 100644
--- a/awx/ui/client/legacy-styles/jquery-ui-overrides.less
+++ b/awx/ui/client/legacy-styles/jquery-ui-overrides.less
@@ -93,10 +93,6 @@ table.ui-datepicker-calendar {
         background-color: @default-succ-disabled;
         border-color: @default-succ-disabled;
       }
-
-      &:first-of-type {
-        margin-right: 24px;
-      }
     }
 
     button.btn.btn-default {
diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less
index d52d4277c8..860022c60f 100644
--- a/awx/ui/client/legacy-styles/lists.less
+++ b/awx/ui/client/legacy-styles/lists.less
@@ -203,7 +203,7 @@ table, tbody {
 }
 
 .List-action:not(.ng-hide) ~ .List-action:not(.ng-hide) {
-    margin-left: 10px;
+    margin-left: 20px;
 }
 
 .List-buttonSubmit {
diff --git a/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html b/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html
index d0c2d08b3d..27be4c729e 100644
--- a/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html
+++ b/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html
@@ -17,7 +17,7 @@
                 ng-class-odd="'List-tableRow--oddRow'"
                 ng-class-even="'List-tableRow--evenRow'"
                 ng-repeat = "job in jobs">
-              <td class="DashboardList-nameCell">
+                <td class="DashboardList-nameCell">
                     <a href="{{ job.detailsUrl }}" ng-if="isSuccessful(job.status)" aw-tool-tip="Job successful. Click for details." aw-tip-placement="right">
                         <i class="fa DashboardList-status DashboardList-status--success icon-job-successful"></i>
                     </a>
diff --git a/awx/ui/client/src/forms/Hosts.js b/awx/ui/client/src/forms/Hosts.js
index a80882c13c..0da34d3e2e 100644
--- a/awx/ui/client/src/forms/Hosts.js
+++ b/awx/ui/client/src/forms/Hosts.js
@@ -83,7 +83,6 @@ export default
             buttons: {
                 cancel: {
                     ngClick: 'formCancel()',
-                    ngDisabled: true
                 },
                 save: {
                     ngClick: 'formSave()',
diff --git a/awx/ui/client/src/helpers/Hosts.js b/awx/ui/client/src/helpers/Hosts.js
index 7fafc5b7d9..25c80de8d9 100644
--- a/awx/ui/client/src/helpers/Hosts.js
+++ b/awx/ui/client/src/helpers/Hosts.js
@@ -114,9 +114,10 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', listGenerator.name,
                         job = jobs[j];
                         html += "<tr>\n";
 
-                        html += "<td><a href=\"#/jobs/" + job.id + "\" " +
-                            "aw-tool-tip=\"" + job.status.charAt(0).toUpperCase() + job.status.slice(1) +
-                            ". Click for details\" data-placement=\"top\"><i class=\"fa icon-job-" +
+                        // SmartStatus-tooltips are named --success whereas icon-job uses successful
+                        var iconStatus = (job.status === 'successful') ? 'success' : 'failed';
+
+                        html += "<td><a href=\"#/jobs/" + job.id + "\"><i class=\"fa DashboardList-status SmartStatus-tooltip--" + iconStatus + " icon-job-" +
                             job.status + "\"></i></a></td>\n";
 
                         html += "<td>" + ($filter('longDate')(job.finished)).replace(/ /,'<br />') + "</td>\n";
@@ -450,4 +451,4 @@ return function(params) {
 
 
 };
-}]);
\ No newline at end of file
+}]);
diff --git a/awx/ui/client/src/helpers/Schedules.js b/awx/ui/client/src/helpers/Schedules.js
index b7bf70c833..50afb5c741 100644
--- a/awx/ui/client/src/helpers/Schedules.js
+++ b/awx/ui/client/src/helpers/Schedules.js
@@ -661,7 +661,8 @@ export default
                     scope: scope,
                     searchSize: (searchSize) ? searchSize : 'col-lg-6 col-md-6 col-sm-6 col-xs-12',
                     showSearch: true,
-                    title: true
+                    title: true,
+                    cancelButton: true
                 });
 
                 SearchInit({
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 1934aa1341..13e74be4d9 100644
--- a/awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js
+++ b/awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js
@@ -133,7 +133,7 @@ export default function() {
                 label: 'Save',
                 ngClick: 'launchJob()',
                 ngDisabled: true,
-                'class': 'btn btn-sm List-buttonSubmit'
+                'class': 'btn btn-sm List-buttonSubmit launchButton'
             }
         },
 
diff --git a/awx/ui/client/src/inventories/manage/copy-move/copy-move.block.less b/awx/ui/client/src/inventories/manage/copy-move/copy-move.block.less
index 5385dc3855..85d3852759 100644
--- a/awx/ui/client/src/inventories/manage/copy-move/copy-move.block.less
+++ b/awx/ui/client/src/inventories/manage/copy-move/copy-move.block.less
@@ -22,7 +22,7 @@
 }
 .copyMove-buttons{
     height: 30px;
-    margin-top: 10px;
+    margin-top: 20px;
 
     button {
         margin-left: 20px;
diff --git a/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html b/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html
index 949769ec3d..44d67974a5 100644
--- a/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html
+++ b/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html
@@ -3,12 +3,22 @@
     <div class="modal-dialog">
         <div class="modal-content Modal-content">
             <div class="Modal-header">
-                  <div class="Modal-title ng-binding">Delete Group</div>
+                  <div class="Modal-title ng-binding">
+                      Delete Group
+                      <a href="" id="awp-promote" href=""
+                          aw-pop-over="<dl><dt>Delete</dt><dd>Deletes groups and hosts associated with the group being deleted. If a group or host is associated with other groups, it will still exist within those groups. Otherwise, the associated groups and hosts will no longer appear in the inventory.</dd>\n<dt style='margin-top: 5px;'>Promote</dt><dd>Groups and hosts associated with the group being removed will be promoted root level. Note: groups already associated with other groups cannot be promoted.</dd></dl>\n" aw-tool-tip="Click for help"
+                          data-placement="right"
+                          data-container="body"
+                          data-title="Delete Group"
+                          class="help-link">
+                          <i class="fa fa-question-circle"></i>
+                      </a>
+                  </div>
                   <div class="Modal-exitHolder">
                       <button class="close Modal-exit" data-target="#group-delete-modal" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times-circle"></i></button>
                   </div>
             </div>
-            <div class="modal-body">
+            <div class="Modal-body">
                 <div ng-show="toDelete.total_groups > 0 || toDelete.total_hosts > 0">
                     <div>
                         <p class="Prompt-bodyQuery">Deleting group <em>{{ toDelete.name }}</em>.
@@ -61,9 +71,6 @@
                     <div class="Prompt-bodyTarget">{{ toDelete.name }}</div>
                 </div>
                 <div class="Modal-footer">
-                <div class="GroupDelete-help--container">
-                    <a href="" id="awp-promote" href="" aw-pop-over="<dl><dt>Delete</dt><dd>Deletes groups and hosts associated with the group being deleted. If a group or host is associated with other groups, it will still exist within those groups. Otherwise, the associated groups and hosts will no longer appear in the inventory.</dd>\n<dt style='margin-top: 5px;'>Promote</dt><dd>Groups and hosts associated with the group being removed will be promoted root level. Note: groups already associated with other groups cannot be promoted.</dd></dl>\n" aw-tool-tip="Click for help"  data-placement="right" data-container="body" data-title="Help" class="help-link"><i class="fa fa-question-circle"></i> Click for help</a>
-                </div>
                   <a href="#" data-target="#group-delete-modal" data-dismiss="modal" id="prompt_cancel_btn_groups_list" class="btn Modal-defaultButton Modal-footerButton">CANCEL</a>
                   <a href="" ng-class="promptActionBtnClass" ng-click="confirmDelete()" id="prompt_action_btn_groups_list" class="btn Modal-footerButton Modal-errorButton">DELETE</a>
               </div>
diff --git a/awx/ui/client/src/inventories/manage/groups/groups.block.less b/awx/ui/client/src/inventories/manage/groups/groups.block.less
index 67deadef22..7cecd16d38 100644
--- a/awx/ui/client/src/inventories/manage/groups/groups.block.less
+++ b/awx/ui/client/src/inventories/manage/groups/groups.block.less
@@ -1,11 +1,8 @@
 .select2-selection.select2-selection--multiple.Form-dropDown{
 	height: auto !important;
 }
-.GroupDelete-help--container{
-	margin-right: auto;
-}
 .GroupDelete .Modal-header{
-	margin-bottom: 0;
+	margin-bottom: 20px;
 }
 .GroupDelete .modal-body{
 	padding-top: 20px;
@@ -16,4 +13,13 @@
 		display: block;
 		padding-bottom: 5px;
 	}
-}
\ No newline at end of file
+}
+#schedule-list-target {
+    .Form-exitHolder {
+        order: 1
+    }
+    .List-actionHolder {
+        margin-top: 40px;
+        margin-right: -18px;
+    }
+}
diff --git a/awx/ui/client/src/scheduler/scheduler.controller.js b/awx/ui/client/src/scheduler/scheduler.controller.js
index f1df6625f0..e67e691246 100644
--- a/awx/ui/client/src/scheduler/scheduler.controller.js
+++ b/awx/ui/client/src/scheduler/scheduler.controller.js
@@ -14,11 +14,11 @@
 export default [
     '$scope', '$compile', '$location', '$stateParams', 'SchedulesList', 'Rest',
     'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath', 'Wait',
-    'Find', 'LoadSchedulesScope', 'GetChoices', '$q',
+    'Find', 'LoadSchedulesScope', 'GetChoices', '$q', '$state',
     function ($scope, $compile, $location, $stateParams,
     SchedulesList, Rest, ProcessErrors, ReturnToCaller, ClearScope,
     GetBasePath, Wait, Find, LoadSchedulesScope, GetChoices,
-    $q) {
+    $q, $state) {
         var schedList = _.cloneDeep(SchedulesList);
 
         ClearScope();
@@ -66,7 +66,8 @@ export default [
                 list: schedList,
                 id: 'schedule-list-target',
                 url: url,
-                pageSize: 20
+                pageSize: 20,
+                cancelButton: true,
             });
         });
 
@@ -118,6 +119,10 @@ export default [
             $scope.search(SchedulesList.iterator);
         };
 
+        $scope.formCancel = function() {
+            $state.go('^', {}, {reload: true});
+        };
+
         Wait('start');
 
         GetChoices({
diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html
index 0287239bf1..3e45e79c72 100644
--- a/awx/ui/client/src/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html
@@ -686,4 +686,3 @@
                     ng-disabled="!schedulerIsValid"> Save</button>
             </div>
     </div>
-</div>
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 35b291c848..9c82498e24 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1682,7 +1682,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                                 }
                                 if (btn === 'launch') {
                                     button.label = 'Launch';
-                                    button['class'] = 'btn-primary';
+                                    button['class'] = 'Form-launchButton';
                                 }
                                 if (btn === 'add_survey') {
                                     button.label = 'Add Survey';
diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js
index 1fcb580d8a..6a36b2d1dc 100644
--- a/awx/ui/client/src/shared/generator-helpers.js
+++ b/awx/ui/client/src/shared/generator-helpers.js
@@ -796,7 +796,7 @@ angular.module('GeneratorHelpers', [systemStatus.name])
             html += "<!-- Paginate Widget -->\n";
             html += `
 <div id=\"${iterator}-pagination\" class=\"List-pagination page-row\"
-    ng-hide=\"is_superuser && ${hideOnSuperuser}\">
+    ng-hide=\"is_superuser && ${hideOnSuperuser}\ || ${iterator}.length < 1">
             `;
             html += "<div class=\"List-paginationPagerHolder\">";
             html += "<div class=\"List-paginationPager\" ng-hide=\"" + iterator + "HidePaginator || " + iterator + "_num_pages <= 1\">";