diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index 5da836f921..7d8dc7ae0c 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -98,8 +98,8 @@
 
 .Form-tabHolder{
     display: flex;
-    margin-bottom: 20px;
     min-height: 30px;
+    flex-wrap:wrap;
 }
 
 .Form-tabs {
@@ -115,6 +115,7 @@
     height: 30px;
     border-radius: 5px;
     margin-right: 20px;
+    margin-bottom: 20px;
     padding-left: 10px;
     padding-right: 10px;
     padding-bottom: 5px;
@@ -560,6 +561,8 @@ input[type='radio']:checked:before {
     padding-left:15px;
     padding-right: 15px;
     margin-right: 20px;
+    min-height: 30px;
+    margin-bottom: 20px;
 }
 
 .Form-primaryButton:hover {
diff --git a/awx/ui/client/src/configuration/configuration.block.less b/awx/ui/client/src/configuration/configuration.block.less
index 2ce7d4e4b9..1abfa77023 100644
--- a/awx/ui/client/src/configuration/configuration.block.less
+++ b/awx/ui/client/src/configuration/configuration.block.less
@@ -36,19 +36,11 @@
 
 .Form-nav--dropdownContainer {
     width: 285px;
-    margin-top: -52px;
     margin-bottom: 22px;
-    margin-left: auto;
     display: flex;
     justify-content: space-between;
 }
 
-@media (max-width: 900px) {
-  .Form-nav--dropdownContainer {
-    margin: 0;
-  }
-}
-
 .Form-nav--dropdown {
     width: 60%;
 }