diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index 354e14a1d1..f98c3ff9e1 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -922,7 +922,6 @@ select.page-size {
 */
 /* end */
 
-
 .greeting {
   padding-right: 22px;
 }
@@ -1978,7 +1977,7 @@ tr td button i {
 
 .nvtooltip {
     border-radius: 4px;
-    padding: 10px;
+    padding: 5px;
 }
 
 .nvtooltip td.value {
diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index f452a028e9..5e383a6c0f 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -64,7 +64,6 @@
     color: @default-interface-txt;
     background-color: @default-list-header-bg;
     border-radius: 5px;
-    border: 1px solid @btn-bord;
     font-size: 10px;
     padding-left: 10px;
     padding-right: 10px;
diff --git a/awx/ui/client/legacy-styles/jquery-ui-overrides.less b/awx/ui/client/legacy-styles/jquery-ui-overrides.less
index 6e00e30180..0d13547c5b 100644
--- a/awx/ui/client/legacy-styles/jquery-ui-overrides.less
+++ b/awx/ui/client/legacy-styles/jquery-ui-overrides.less
@@ -117,6 +117,11 @@ table.ui-datepicker-calendar {
     }
 
 }
+.ui-dialog-buttonpane > .ui-dialog-buttonset {
+    button {
+        margin-left: 20px;
+    }
+}
 
 .ui-dialog-buttonset {
     text-transform: uppercase;
diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less
index 7b6683f85a..d52d4277c8 100644
--- a/awx/ui/client/legacy-styles/lists.less
+++ b/awx/ui/client/legacy-styles/lists.less
@@ -150,7 +150,6 @@ table, tbody {
 
 .List-header {
     display: flex;
-    align-items: center;
     min-height: 34px;
 }
 
diff --git a/awx/ui/client/src/controllers/Projects.js b/awx/ui/client/src/controllers/Projects.js
index 6e5a4e68d1..0512ebe45e 100644
--- a/awx/ui/client/src/controllers/Projects.js
+++ b/awx/ui/client/src/controllers/Projects.js
@@ -443,6 +443,11 @@ export function ProjectsAdd(Refresh, $scope, $rootScope, $compile, $location, $l
         input_type: "radio"
     });
 
+    CreateSelect2({
+        element: '#local-path-select',
+        multiple: false
+    });
+
     // Save
     $scope.formSave = function () {
         var i, fld, url, data={};
diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less
index e2674b8c6f..09cdbf7b72 100644
--- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less
+++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less
@@ -119,6 +119,7 @@
     box-shadow: none;
     text-transform: uppercase;
     cursor: pointer;
+    border-color: @d7grey;
 }
 
 .DashboardGraphs-periodDropdown,
diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js
index 92642bf239..24ca35acd2 100644
--- a/awx/ui/client/src/forms/Credentials.js
+++ b/awx/ui/client/src/forms/Credentials.js
@@ -239,7 +239,6 @@ export default
                     },
                     class: 'Form-textAreaLabel Form-formGroup--fullWidth',
                     elementClass: 'Form-monospace',
-                    hintText: "{{ key_hint }}",
                     addRequired: false,
                     editRequired: false,
                     awDropFile: true,
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 aa865c165b..5385dc3855 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
@@ -23,6 +23,10 @@
 .copyMove-buttons{
     height: 30px;
     margin-top: 10px;
+
+    button {
+        margin-left: 20px;
+    }
 }
 .copyMove-root{
     margin-top: 10px;
diff --git a/awx/ui/client/src/inventories/manage/copy-move/copy-move.partial.html b/awx/ui/client/src/inventories/manage/copy-move/copy-move.partial.html
index 39a87a729f..1847837b92 100644
--- a/awx/ui/client/src/inventories/manage/copy-move/copy-move.partial.html
+++ b/awx/ui/client/src/inventories/manage/copy-move/copy-move.partial.html
@@ -15,7 +15,7 @@
         <span><input type="checkbox" ng-model="targetRootGroup" ng-change="toggleTargetRootGroup()">  Use the inventory root</span>
     </div>
     <div class="copyMove-buttons">
-        <button type="button" class="pull-right btn btn-sm btn-default Form-cancelButton" ng-click="formCancel()">Cancel</button>
         <button type="button" class="pull-right btn btn-sm Form-saveButton" ng-disabled="!selected" ng-click="formSave()">Save</button>
+        <button type="button" class="pull-right btn btn-sm btn-default Form-cancelButton" ng-click="formCancel()">Cancel</button>
     </div>
 </div>
diff --git a/awx/ui/client/src/job-templates/add/inventory-job-templates-add.route.js b/awx/ui/client/src/job-templates/add/inventory-job-templates-add.route.js
index 329d537e6b..bec16437f4 100644
--- a/awx/ui/client/src/job-templates/add/inventory-job-templates-add.route.js
+++ b/awx/ui/client/src/job-templates/add/inventory-job-templates-add.route.js
@@ -10,5 +10,8 @@ export default {
     name: 'inventoryJobTemplateAdd',
     url: '/inventories/:inventory_id/job_templates/add',
     templateUrl: templateUrl('job-templates/add/job-templates-add'),
-    controller: 'JobTemplatesAdd'
+    controller: 'JobTemplatesAdd',
+    ncyBreadcrumb: {
+        label: "Inventory Job Template Add"
+    },
 };
diff --git a/awx/ui/client/src/lists/Credentials.js b/awx/ui/client/src/lists/Credentials.js
index 74a75c6ef9..8aff2db5e4 100644
--- a/awx/ui/client/src/lists/Credentials.js
+++ b/awx/ui/client/src/lists/Credentials.js
@@ -20,6 +20,7 @@ export default
             "finished, click the blue <em>Select</em> button, located bottom right.</p> <p>Create a brand new credential by clicking ",
         index: false,
         hover: true,
+        emptyListText: 'No Credentials Have Been Created',
 
         fields: {
             name: {
diff --git a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
index 0a162fd015..a4fb115005 100644
--- a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
@@ -629,15 +629,15 @@
                 </div>
 
                 <div class="buttons Form-buttons">
+                    <button type="button"
+                        class="btn btn-sm Form-cancelButton"
+                        id="project_cancel_btn"
+                        ng-click="formCancel()">Cancel</button>
                     <button type="button"
                         class="btn btn-sm Form-saveButton"
                         id="project_save_btn"
                         ng-click="saveSchedule()"
                         ng-disabled="!schedulerIsValid"> Save</button>
-                    <button type="button"
-                        class="btn btn-sm Form-cancelButton"
-                        id="project_cancel_btn"
-                        ng-click="formCancel()">Cancel</button>
                 </div>
     </div>
 </div>
diff --git a/awx/ui/client/src/organizations/linkout/addUsers/addUsers.block.less b/awx/ui/client/src/organizations/linkout/addUsers/addUsers.block.less
index abadd06a9b..0e5c14d3d3 100644
--- a/awx/ui/client/src/organizations/linkout/addUsers/addUsers.block.less
+++ b/awx/ui/client/src/organizations/linkout/addUsers/addUsers.block.less
@@ -33,9 +33,7 @@
 }
 
 .AddUsers-header {
-    padding: 20px;
-    padding-bottom: 10px;
-    padding-top: 15px;
+    padding: 15px 20px 0 20px
 }
 
 .AddUsers-body {
diff --git a/awx/ui/client/src/organizations/linkout/addUsers/addUsers.partial.html b/awx/ui/client/src/organizations/linkout/addUsers/addUsers.partial.html
index ca166a2bb9..c07930f49b 100644
--- a/awx/ui/client/src/organizations/linkout/addUsers/addUsers.partial.html
+++ b/awx/ui/client/src/organizations/linkout/addUsers/addUsers.partial.html
@@ -21,17 +21,17 @@
             </div>
             <div class="AddUsers-footer">
                 <div class="buttons Form-buttons AddUsers-buttons">
+                    <button type="button"
+                        class="btn btn-sm Form-cancelButton"
+                        ng-click="closeModal()">
+                        Cancel
+                    </button>
                     <button type="button"
                         class="btn btn-sm Form-saveButton"
                         ng-click="updateUsers()"
                         ng-disabled="!selectedItems || !selectedItems.length">
                         Save
                     </button>
-                    <button type="button"
-                        class="btn btn-sm Form-cancelButton"
-                        ng-click="closeModal()">
-                        Cancel
-                    </button>
                 </div>
             </div>
         </div>
diff --git a/awx/ui/client/src/organizations/orgcards.block.less b/awx/ui/client/src/organizations/orgcards.block.less
index 03dbe13bfa..1446a16636 100644
--- a/awx/ui/client/src/organizations/orgcards.block.less
+++ b/awx/ui/client/src/organizations/orgcards.block.less
@@ -5,6 +5,7 @@
     display: flex;
     flex-wrap: wrap;
     width: 100%;
+    justify-content: space-between;
 }
 
 .OrgCards-search tag-search{
@@ -32,6 +33,7 @@
     flex-wrap: wrap;
     align-items: baseline;
     margin-top: 20px;
+    width: 32%
 }
 
 .OrgCards-card--selected {
@@ -95,42 +97,15 @@
     margin-right: 10px;
 }
 
-@media (min-width: 1179px) {
-    .OrgCards-card {
-        width: ~"calc(25% - 15px)";
-        margin-right: 20px;
-    }
-
-    .OrgCards-card:nth-child(4n+4) {
-        margin-right: 0px;
-    }
-}
-
-@media (min-width: 901px) and (max-width: 1178px) {
-    .OrgCards-card {
-        width: ~"calc(33% - 11px)";
-        margin-right: 20px;
-    }
-
-    .OrgCards-card:nth-child(3n+3) {
-        margin-right: 0px;
-    }
-}
-
-@media (min-width: 616px) and (max-width: 900px) {
-    .OrgCards-card {
-        width: ~"calc(50% - 10px)";
-        margin-right: 20px;
-    }
-
-    .OrgCards-card:nth-child(2n+2) {
-        margin-right: 0px;
-    }
-}
-
-@media (max-width: 615px) {
+@media (max-width: 840px) {
     .OrgCards-card {
         width: 100%;
         margin-right: 0px;
     }
 }
+
+@media (min-width: 840px) and (max-width: 1240px) {
+    .OrgCards-card {
+        width: ~"calc(50% - 10px)";
+    }
+ }
diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html
index d5dc06daf8..6b1636c0e2 100644
--- a/awx/ui/client/src/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html
@@ -665,15 +665,15 @@
         </div>
     </div>
             <div class="buttons Form-buttons">
+                <button type="button"
+                    class="btn btn-sm Form-cancelButton"
+                    id="project_cancel_btn"
+                    ng-click="formCancel()">Cancel</button>
                 <button type="button"
                     class="btn btn-sm Form-saveButton"
                     id="project_save_btn"
                     ng-click="saveSchedule()"
                     ng-disabled="!schedulerIsValid"> Save</button>
-                <button type="button"
-                    class="btn btn-sm Form-cancelButton"
-                    id="project_cancel_btn"
-                    ng-click="formCancel()">Cancel</button>
             </div>
     </div>
 </div>
diff --git a/awx/ui/client/src/search/tagSearch.partial.html b/awx/ui/client/src/search/tagSearch.partial.html
index 775fad1d41..a6cfa6625e 100644
--- a/awx/ui/client/src/search/tagSearch.partial.html
+++ b/awx/ui/client/src/search/tagSearch.partial.html
@@ -1,5 +1,5 @@
 <div class="TagSearch row">
-    <div ng-class="listConfig.searchSize || 'col-lg-5 col-md-12 col-sm-12 col-xs-12'">
+    <div ng-class="listConfig.searchSize || 'col-lg-12 col-md-12 col-sm-12 col-xs-12'">
         <div class="TagSearch-bar">
             <div class="TagSearch-typeDropdown"
                 ng-click="toggleTypeDropdown()"
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 414d0b2964..f0ce685e8b 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -768,7 +768,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                 if (field.type === 'alertblock') {
                     html += "<div class=\"row\">\n";
                     html += "<div class=\"";
-                    html += (options.modal || options.id) ? "col-lg-12" : "col-lg-8 col-lg-offset-2";
+                    html += (options.modal || options.id) ? "col-lg-12" : "col-lg-12";
                     html += "\">\n";
                     html += "<div class=\"Form-alertblock";
                     html += (field.closeable === undefined || field.closeable === true) ? " alert-dismissable" : "";
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 1e5615bdf3..fcdd9de179 100644
--- a/awx/ui/client/src/system-tracking/system-tracking.partial.html
+++ b/awx/ui/client/src/system-tracking/system-tracking.partial.html
@@ -1,8 +1,7 @@
 <section class="SystemTrackingContainer Panel" ng-if="noModuleData">
-
     <section class="FactDataError SystemTrackingContainer-main">
         <p class="FactDataError-note--full">
-            To setup or run scan jobs, edit the "<a link-to="inventoryEdit" model="{ inventory_id: inventory }">{{inventory.name}}</a>" inventory and select "Scan Job Templates."
+            To setup or run scan jobs, edit the "<a ui-sref="inventories.edit({ inventory_id: inventory.id })">{{inventory.name}}</a>" inventory and select "Scan Job Templates."
         </p>
     </section>
 </section>