diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index 36815540c4..c2d59dc1b6 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -2156,7 +2156,7 @@ tr td button i {
     border: 1px solid @d7grey;
     cursor: text;
     max-height: 135px;
-    overflow: scroll;
+    overflow-y: auto;
 }
 
 body.is-modalOpen {
@@ -2216,6 +2216,10 @@ a:hover {
     border-radius: 5px;
     line-height: 21px;
     font-size: 13px;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    word-break: break-all;
+    white-space: normal;
 }
 
 .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index 2290610880..1160f45844 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -201,7 +201,8 @@
        background-color: @f2grey;
        border-color: @b7grey;
        border-radius: 5px;
-       height: 30px;
+       height: auto;
+       min-height: 30px;
        padding: 0 10px;
     }
 }
@@ -443,7 +444,7 @@
 }
 
 .Form-lookupButton {
-    height: 30px;
+    height: auto;
     width: 30px;
     color: @field-lookup-btn-icon!important;
     font-size: 16px;
@@ -521,7 +522,17 @@ input[type='radio']:checked:before {
 }
 
 .Form-mixedInputGroup {
+    display: flex;
     width: 100%;
+
+    .form-control {
+        padding: 0 12px !important;
+    }
+
+    .input-group-btn {
+        display: flex;
+        width: 30px;
+    }
 }
 
 .FormToggle {}
@@ -679,11 +690,9 @@ input[type='radio']:checked:before {
 }
 
 .Form-variableHeightButtonGroup {
-    height: 100%;
-}
-
-.Form-lookupButton--variableHeight {
-    height: 100%;
+    display: flex;
+    height: auto;
+    width: 30px;
 }
 
 @media only screen and (max-width: 650px) {
diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.block.less b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.block.less
index 8553d4ce30..86db1b3fff 100644
--- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.block.less
+++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.block.less
@@ -39,7 +39,7 @@
 .MultiCredential-tag {
     border-radius: 5px;
     padding: 2px 10px;
-    margin: 4px 0px;
+    margin: 3px 0px;
     font-size: 12px;
     margin-right: 10px;
     max-width: 100%;
@@ -68,7 +68,7 @@
     border-top-left-radius: 5px;
     border-bottom-left-radius: 5px;
     padding: 0 5px;
-    margin: 4px 0px;
+    margin: 3px 0px;
     align-items: center;
     display: flex;
     cursor: pointer;