diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index 20bf364141..2da1af9e62 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -429,6 +429,10 @@ input[type='radio']:checked:before {
     height: 30px;
     display: flex;
     justify-content: flex-end;
+
+    button:last-of-type {
+        margin-left: 20px;
+    }
 }
 
 .Form-button{
@@ -443,7 +447,6 @@ input[type='radio']:checked:before {
 
 .Form-saveButton{
     background-color: @submit-button-bg;
-    margin-right: 20px;
     color: @submit-button-text;
     text-transform: uppercase;
     transition: background-color 0.2s;
diff --git a/awx/ui/client/src/adhoc/adhoc.form.js b/awx/ui/client/src/adhoc/adhoc.form.js
index 4afa92525e..44a5c3ba6d 100644
--- a/awx/ui/client/src/adhoc/adhoc.form.js
+++ b/awx/ui/client/src/adhoc/adhoc.form.js
@@ -124,18 +124,18 @@ export default function() {
         },
 
         buttons: {
-            launch: {
-                label: 'Save',
-                ngClick: 'launchJob()',
-                ngDisabled: true,
-                'class': 'Form-buttonDefault Form-button'
-            },
             reset: {
                 ngClick: 'formReset()',
                 ngDisabled: true,
                 label: 'Reset',
                 'class': 'Form-buttonDefault Form-button'
-            }
+            },
+            launch: {
+                label: 'Save',
+                ngClick: 'launchJob()',
+                ngDisabled: true,
+                'class': 'Form-buttonDefault Form-button'
+            }            
         },
 
         related: {}
diff --git a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js
index 99e5ab7683..ecff07052b 100644
--- a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js
+++ b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js
@@ -65,13 +65,13 @@ export default function(){
             }
         },
         buttons: {
+            cancel: {
+                ngClick: 'formCancel()'
+            },
             save: {
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: "host_form.$invalid"//true          //Disable when $pristine or $invalid, optional and when can_edit = false, for permission reasons
-            },
-            cancel: {
-                ngClick: 'formCancel()'
-            }
+            }            
         }
     };
 }
diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js
index 8f1c84fc38..ac6b534431 100644
--- a/awx/ui/client/src/forms/Credentials.js
+++ b/awx/ui/client/src/forms/Credentials.js
@@ -406,13 +406,13 @@ export default
             },
 
             buttons: {
+                cancel: {
+                    ngClick: 'formCancel()',
+                },
                 save: {
                     label: 'Save',
                     ngClick: 'formSave()', //$scope.function to call on click, optional
                     ngDisabled: true //Disable when $pristine or $invalid, optional
-                },
-                cancel: {
-                    ngClick: 'formCancel()',
                 }
             },
 
diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js
index 9eb8e5f955..35b7f65a2e 100644
--- a/awx/ui/client/src/forms/Groups.js
+++ b/awx/ui/client/src/forms/Groups.js
@@ -295,12 +295,12 @@ export default
             },
 
             buttons: {
-                save: {
-                    ngClick: 'saveGroup()'
-                },
                 cancel: {
                     ngClick: 'formCancel()'
-                }
+                },
+                save: {
+                    ngClick: 'saveGroup()'
+                }                
             },
 
             related: {
diff --git a/awx/ui/client/src/forms/HostGroups.js b/awx/ui/client/src/forms/HostGroups.js
index 3418726c34..cfa8aea02a 100644
--- a/awx/ui/client/src/forms/HostGroups.js
+++ b/awx/ui/client/src/forms/HostGroups.js
@@ -3,7 +3,7 @@
  *
  * All Rights Reserved
  *************************************************/
- 
+
  /**
  * @ngdoc function
  * @name forms.function:HostGroups
@@ -41,13 +41,13 @@ export default
             },
 
             buttons: { //for now always generates <button> tags
-                save: {
-                    ngClick: 'formSave()',
-                    ngDisabled: true
-                },
                 reset: {
                     ngClick: 'formReset()',
                     ngDisabled: true
+                },
+                save: {
+                    ngClick: 'formSave()',
+                    ngDisabled: true
                 }
             },
 
diff --git a/awx/ui/client/src/forms/Hosts.js b/awx/ui/client/src/forms/Hosts.js
index c7a63c5a1f..637cba0981 100644
--- a/awx/ui/client/src/forms/Hosts.js
+++ b/awx/ui/client/src/forms/Hosts.js
@@ -81,13 +81,13 @@ export default
             },
 
             buttons: {
-                save: {
-                    ngClick: 'formSave()',
-                    ngDisabled: true
-                },
                 cancel: {
                     ngClick: 'formCancel()',
                     ngDisabled: true
+                },
+                save: {
+                    ngClick: 'formSave()',
+                    ngDisabled: true
                 }
             },
 
diff --git a/awx/ui/client/src/forms/Inventories.js b/awx/ui/client/src/forms/Inventories.js
index c748f0d225..b77f71d94e 100644
--- a/awx/ui/client/src/forms/Inventories.js
+++ b/awx/ui/client/src/forms/Inventories.js
@@ -68,12 +68,12 @@ export default
             },
 
             buttons: {
+                cancel: {
+                    ngClick: 'formCancel()'
+                },
                 save: {
                     ngClick: 'formSave()',
                     ngDisabled: true
-                },
-                cancel: {
-                    ngClick: 'formCancel()'
                 }
             },
 
diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js
index 16620b8fc5..c177656d23 100644
--- a/awx/ui/client/src/forms/JobTemplates.js
+++ b/awx/ui/client/src/forms/JobTemplates.js
@@ -320,12 +320,12 @@ export default
             },
 
             buttons: { //for now always generates <button> tags
+                cancel: {
+                    ngClick: 'formCancel()'
+                },
                 save: {
                     ngClick: 'formSave()',    //$scope.function to call on click, optional
                     ngDisabled: "job_templates_form.$invalid || can_edit!==true"//true          //Disable when $pristine or $invalid, optional and when can_edit = false, for permission reasons
-                },
-                cancel: {
-                    ngClick: 'formCancel()'
                 }
             },
 
diff --git a/awx/ui/client/src/forms/Organizations.js b/awx/ui/client/src/forms/Organizations.js
index 12e8356267..113322d881 100644
--- a/awx/ui/client/src/forms/Organizations.js
+++ b/awx/ui/client/src/forms/Organizations.js
@@ -36,13 +36,13 @@ export default
             },
 
             buttons: { //for now always generates <button> tags
+                cancel: {
+                    ngClick: 'formCancel()'
+                },
                 save: {
                     ngClick: 'formSave()', //$scope.function to call on click, optional
                     ngDisabled: true //Disable when $pristine or $invalid, optional
-                },
-                cancel: {
-                    ngClick: 'formCancel()'
-                }
+                }                
             },
 
             related: {
diff --git a/awx/ui/client/src/forms/Projects.js b/awx/ui/client/src/forms/Projects.js
index c1d479acca..44df23be3e 100644
--- a/awx/ui/client/src/forms/Projects.js
+++ b/awx/ui/client/src/forms/Projects.js
@@ -221,12 +221,12 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
         },
 
         buttons: {
+            cancel: {
+                ngClick: 'formCancel()'
+            },
             save: {
                 ngClick: 'formSave()',
                 ngDisabled: true
-            },
-            cancel: {
-                ngClick: 'formCancel()'
             }
         },
 
diff --git a/awx/ui/client/src/forms/Teams.js b/awx/ui/client/src/forms/Teams.js
index f674bd8dc8..11a9205012 100644
--- a/awx/ui/client/src/forms/Teams.js
+++ b/awx/ui/client/src/forms/Teams.js
@@ -49,13 +49,13 @@ export default
             },
 
             buttons: {
+                cancel: {
+                    ngClick: 'formCancel()'
+                },
                 save: {
                     ngClick: 'formSave()',
                     ngDisabled: true
-                },
-                cancel: {
-                    ngClick: 'formCancel()'
-                }
+                }                
             },
 
             related: {
diff --git a/awx/ui/client/src/forms/Users.js b/awx/ui/client/src/forms/Users.js
index 1fa3db40d6..3db17ad5fb 100644
--- a/awx/ui/client/src/forms/Users.js
+++ b/awx/ui/client/src/forms/Users.js
@@ -105,12 +105,12 @@ export default
             },
 
             buttons: {
+                cancel: {
+                    ngClick: 'formCancel()'
+                },
                 save: {
                     ngClick: 'formSave()',
                     ngDisabled: true
-                },
-                cancel: {
-                    ngClick: 'formCancel()'
                 }
             },
 
diff --git a/awx/ui/client/src/helpers/Groups.js b/awx/ui/client/src/helpers/Groups.js
index a0ddf68d62..6eeaf797c2 100644
--- a/awx/ui/client/src/helpers/Groups.js
+++ b/awx/ui/client/src/helpers/Groups.js
@@ -822,11 +822,11 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name
                            // Create the modal
                            $('#group-modal-dialog').dialog({
                                buttons: {
-                                   'Cancel': function() {
-                                       modal_scope.cancelModal();
-                                   },
                                    'Save': function () {
                                        modal_scope.saveGroup();
+                                   },
+                                   'Cancel': function() {
+                                       modal_scope.cancelModal();
                                    }
                                },
                                modal: true,
diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
index 1bbf128caf..b9a2160a8a 100644
--- a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
+++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
@@ -62,12 +62,12 @@ export default function() {
         },
 
         buttons: { //for now always generates <button> tags
+            cancel: {
+                ngClick: 'formCancel()',
+            },
             save: {
                 ngClick: 'formSave()', //$scope.function to call on click, optional
                 ngDisabled: true //Disable when $pristine or $invalid, optional
-            },
-            cancel: {
-                ngClick: 'formCancel()',
             }
         }
     };
diff --git a/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js b/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js
index 30c441ae1a..58d95bb3b4 100644
--- a/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js
+++ b/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js
@@ -304,17 +304,17 @@ export default
         }
     },
     buttons: {
-        submit_question: {
-            ngClick: 'submitQuestion($event)',
-            ngDisabled: true,
-            'class': 'btn btn-sm Form-saveButton',
-            label: '{{editQuestionIndex === null ? "ADD" : "UPDATE"}}'
-        },
         question_cancel : {
             label: 'Cancel',
             'class' : 'btn btn-default Form-cancelButton',
             ngClick: 'generateAddQuestionForm()',
             ngDisabled: 'survey_question_form.$pristine'
+        },
+        submit_question: {
+            ngClick: 'submitQuestion($event)',
+            ngDisabled: true,
+            'class': 'btn btn-sm Form-saveButton',
+            label: '{{editQuestionIndex === null ? "ADD" : "UPDATE"}}'
         }
     }
 
diff --git a/awx/ui/client/src/lookup/lookup.factory.js b/awx/ui/client/src/lookup/lookup.factory.js
index fb7f3e2b47..7db6afd894 100644
--- a/awx/ui/client/src/lookup/lookup.factory.js
+++ b/awx/ui/client/src/lookup/lookup.factory.js
@@ -145,6 +145,13 @@ export default ['Rest', 'ProcessErrors', 'generateList',
 
                 // Show pop-up
                 buttons = [{
+                    label: "Cancel",
+                    "class": "btn btn-default",
+                    "id": "lookup-cancel-button",
+                    onClick: function() {
+                        $('#LookupModal-dialog').dialog('close');
+                    }
+                }, {
                     label: "Save",
                     onClick: function() {
                         scope.selectAction();
@@ -152,13 +159,6 @@ export default ['Rest', 'ProcessErrors', 'generateList',
                     //icon: "fa-check",
                     "class": "btn btn-primary",
                     "id": "lookup-save-button"
-                }, {
-                    label: "Cancel",
-                    "class": "btn btn-default",
-                    "id": "lookup-cancel-button",
-                    onClick: function() {
-                        $('#LookupModal-dialog').dialog('close');
-                    }
                 }];
 
                 if (scope.removeModalReady) {
diff --git a/awx/ui/client/src/management-jobs/card/card.controller.js b/awx/ui/client/src/management-jobs/card/card.controller.js
index d1fcbff93a..5bc335514d 100644
--- a/awx/ui/client/src/management-jobs/card/card.controller.js
+++ b/awx/ui/client/src/management-jobs/card/card.controller.js
@@ -109,6 +109,14 @@ export default
                             fieldScope.granularity_keep_amount = 1;
                         },
                         buttons: [
+                            {
+                                "label": "Cancel",
+                                "onClick": function() {
+                                    $(this).dialog('close');
+                                },
+                                "class": "btn btn-default",
+                                "id": "prompt-for-days-facts-cancel"
+                            },
                             {
                                 "label": "Launch",
                                 "onClick": function() {
@@ -134,15 +142,8 @@ export default
                                 },
                                 "class": "btn btn-primary",
                                 "id": "prompt-for-days-facts-launch",
-                            },
-                            {
-                                "label": "Cancel",
-                                "onClick": function() {
-                                    $(this).dialog('close');
-                                },
-                                "class": "btn btn-default",
-                                "id": "prompt-for-days-facts-cancel"
-                        }]
+                            }
+                            ]
                     });
 
                     if (scope.removePromptForDays) {
@@ -198,6 +199,15 @@ export default
                                 scope.prompt_for_days_form.$invalid = false;
                             },
                             buttons: [
+                                {
+                                    "label": "Cancel",
+                                    "onClick": function() {
+                                        $(this).dialog('close');
+
+                                    },
+                                    "class": "btn btn-default",
+                                    "id": "prompt-for-days-cancel"
+                                },
                             {
                                 "label": "Launch",
                                 "onClick": function() {
@@ -220,16 +230,8 @@ export default
                                 },
                                 "class": "btn btn-primary",
                                 "id": "prompt-for-days-launch"
-                            },
-                            {
-                                "label": "Cancel",
-                                "onClick": function() {
-                                    $(this).dialog('close');
-
-                                },
-                                "class": "btn btn-default",
-                                "id": "prompt-for-days-cancel"
-                            }]
+                            }
+                            ]
                         });
 
                         if (scope.removePromptForDays) {
diff --git a/awx/ui/client/src/notifications/notificationTemplates.form.js b/awx/ui/client/src/notifications/notificationTemplates.form.js
index 579e0189a8..356efba43b 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.form.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.form.js
@@ -344,12 +344,12 @@ export default function() {
         },
 
         buttons: { //for now always generates <button> tags
+            cancel: {
+                ngClick: 'formCancel()',
+            },
             save: {
                 ngClick: 'formSave()', //$scope.function to call on click, optional
                 ngDisabled: true //Disable when $pristine or $invalid, optional
-            },
-            cancel: {
-                ngClick: 'formCancel()',
             }
         }
     };
diff --git a/awx/ui/client/src/permissions/shared/permissions.form.js b/awx/ui/client/src/permissions/shared/permissions.form.js
index e60dd6762c..ecfb737842 100644
--- a/awx/ui/client/src/permissions/shared/permissions.form.js
+++ b/awx/ui/client/src/permissions/shared/permissions.form.js
@@ -131,13 +131,13 @@ export default function() {
         },
 
         buttons: {
-            save: {
-                ngClick: 'formSave()',
-                ngDisabled: true
-            },
             reset: {
                 ngClick: 'formReset()',
                 ngDisabled: true
+            },
+            save: {
+                ngClick: 'formSave()',
+                ngDisabled: true
             }
         },