diff --git a/cypress/integration/all/app/packflow.spec.ts b/cypress/integration/all/app/packflow.spec.ts
index 12217098f7..106f8f8912 100644
--- a/cypress/integration/all/app/packflow.spec.ts
+++ b/cypress/integration/all/app/packflow.spec.ts
@@ -25,6 +25,7 @@ describe(
 
       cy.visit("/packs/manage");
       cy.wait(1000); // eslint-disable-line cypress/no-unnecessary-waiting
+
       cy.findByText(/errors and crashes/i).click();
 
       cy.wait(1000); // eslint-disable-line cypress/no-unnecessary-waiting
diff --git a/cypress/integration/free/maintainer.spec.ts b/cypress/integration/free/maintainer.spec.ts
index 5f5a42267b..726d99ea68 100644
--- a/cypress/integration/free/maintainer.spec.ts
+++ b/cypress/integration/free/maintainer.spec.ts
@@ -116,6 +116,7 @@ describe(
       // Packs pages: Can create, edit, delete a pack
       cy.visit("/packs/manage");
       cy.wait(1000); // eslint-disable-line cypress/no-unnecessary-waiting
+
       cy.findByRole("button", { name: /create new pack/i }).click();
 
       cy.findByLabelText(/name/i).click().type("Errors and crashes");
diff --git a/frontend/pages/policies/PolicyPage/_styles.scss b/frontend/pages/policies/PolicyPage/_styles.scss
index cefb466b1c..d39ea89128 100644
--- a/frontend/pages/policies/PolicyPage/_styles.scss
+++ b/frontend/pages/policies/PolicyPage/_styles.scss
@@ -13,7 +13,7 @@
     background-color: #fff0b9;
     border: 1px solid #f2c94c;
     border-radius: $border-radius;
-  
+
     p {
       margin: 0;
       line-height: 20px;
@@ -22,7 +22,7 @@
         color: $core-vibrant-blue;
         font-weight: 700;
         text-decoration: none;
-        
+
         img {
           vertical-align: text-bottom;
           position: relative;
@@ -108,7 +108,7 @@
       flex-wrap: wrap;
 
       .target-pill-selector {
-        padding: 8px;
+        padding: $pad-small;
         background-color: $core-white;
         border: none;
         box-shadow: inset 0 0 0 1px $ui-fleet-black-25;
@@ -116,9 +116,10 @@
         cursor: pointer;
         display: flex;
         align-items: center;
+        margin-bottom: $pad-small;
 
         &:not(:last-of-type) {
-          margin-right: 8px;
+          margin-right: $pad-small;
         }
         img {
           max-width: 12px;
@@ -185,7 +186,7 @@
         color: $core-vibrant-blue;
         font-weight: 700;
         text-decoration: none;
-        
+
         img {
           vertical-align: text-bottom;
           position: relative;
diff --git a/frontend/pages/queries/QueryPage/_styles.scss b/frontend/pages/queries/QueryPage/_styles.scss
index 27c7057990..8c0bae69b3 100644
--- a/frontend/pages/queries/QueryPage/_styles.scss
+++ b/frontend/pages/queries/QueryPage/_styles.scss
@@ -13,7 +13,7 @@
     background-color: #fff0b9;
     border: 1px solid #f2c94c;
     border-radius: $border-radius;
-  
+
     p {
       margin: 0;
       line-height: 20px;
@@ -22,7 +22,7 @@
         color: $core-vibrant-blue;
         font-weight: 700;
         text-decoration: none;
-        
+
         img {
           vertical-align: text-bottom;
           position: relative;
@@ -108,7 +108,7 @@
       flex-wrap: wrap;
 
       .target-pill-selector {
-        padding: 8px;
+        padding: $pad-small;
         background-color: $core-white;
         border: none;
         box-shadow: inset 0 0 0 1px $ui-fleet-black-25;
@@ -116,9 +116,10 @@
         cursor: pointer;
         display: flex;
         align-items: center;
+        margin-bottom: $pad-small;
 
         &:not(:last-of-type) {
-          margin-right: 8px;
+          margin-right: $pad-small;
         }
         img {
           max-width: 12px;
@@ -185,7 +186,7 @@
         color: $core-vibrant-blue;
         font-weight: 700;
         text-decoration: none;
-        
+
         img {
           vertical-align: text-bottom;
           position: relative;