diff --git a/app/styles/components/_dropdown.scss b/app/styles/components/_dropdown.scss
index feed356c6..cddf99dd2 100644
--- a/app/styles/components/_dropdown.scss
+++ b/app/styles/components/_dropdown.scss
@@ -124,13 +124,6 @@ $dropdown-caret-color                : $mid-grey !default;
       cursor: default;
       transition: ease-in-out all .25s;
     }
-
-    &:nth-child(2) {
-      margin-top: 4px;
-    }
-    &:last-child {
-      margin-bottom: 8px;
-    }
   }
 }
 .resource-actions-tabbable {
diff --git a/app/styles/components/_searchable-select.scss b/app/styles/components/_searchable-select.scss
index 577ccc5f7..2c754ef16 100644
--- a/app/styles/components/_searchable-select.scss
+++ b/app/styles/components/_searchable-select.scss
@@ -52,7 +52,9 @@
     z-index: 2;
     border: 1px solid $accent-border;
     border-top: none;
-    padding: 2px 0 5px;
+
+    @expand .dropdown-menu;
+
     input {
       margin-bottom: 10px;
       border-left: none;
@@ -73,6 +75,14 @@
     padding: 0px 0;
     padding-left: $indent;
     position: relative;
+    border-bottom: 1px $border solid;
+    padding: 8px 18px;
+    font-size: 14px;
+
+    &:last-child {
+      border-bottom: 0;
+    }
+
     .icon-check {
       margin-left: -15px;
       margin-right: 5px;
diff --git a/lib/global-admin/addon/clusters/new/rke/controller.js b/lib/global-admin/addon/clusters/new/rke/controller.js
index 636cbeb6a..6e1f38ce5 100644
--- a/lib/global-admin/addon/clusters/new/rke/controller.js
+++ b/lib/global-admin/addon/clusters/new/rke/controller.js
@@ -30,12 +30,6 @@ const headersAll = [
     translationKey: 'generic.name',
     scope: 'embedded',
   },
-  {
-    name: 'all',
-    sort: false,
-    searchField: null,
-    translationKey: 'clustersPage.addPage.rke.new.headers.labels.all',
-  },
   {
     name: 'etcd',
     sort: false,
@@ -55,6 +49,12 @@ const headersAll = [
     translationKey: 'clustersPage.addPage.rke.new.headers.labels.worker',
     scope: 'embedded',
   },
+  {
+    name: 'all',
+    sort: false,
+    searchField: null,
+    translationKey: 'clustersPage.addPage.rke.new.headers.labels.all',
+  },
 ];
 
 const workerHeaders = headersAll.filter((x) => x.scope === 'embedded');
diff --git a/lib/global-admin/addon/clusters/new/rke/template.hbs b/lib/global-admin/addon/clusters/new/rke/template.hbs
index 173dadbdf..fba3e1737 100644
--- a/lib/global-admin/addon/clusters/new/rke/template.hbs
+++ b/lib/global-admin/addon/clusters/new/rke/template.hbs
@@ -51,11 +51,7 @@
           <td data-title="{{dt.name}}">
             {{host.displayName}}
           </td>
-          {{#if (eq scope "dedicated")}}
-            <td data-title="{{dt.all}}">
-              {{input type="checkbox" checked=(array-includes host.role 'worker' 'controlplane' 'etcd') change=(action 'selectAllRoles' host)}}
-            </td>
-          {{/if}}
+
           {{#if (eq scope "dedicated")}}
             <td data-title="{{dt.etcd}}">
               {{!-- disabled=(not-eq host.state "active") --}}
@@ -70,7 +66,11 @@
             {{!-- disabled=(not-eq host.state "active") --}}
             {{input type="checkbox" checked=(array-includes host.role 'worker') change=(action 'addRole' host 'worker')}}
           </td>
-
+          {{#if (eq scope "dedicated")}}
+            <td data-title="{{dt.all}}">
+              {{input type="checkbox" checked=(array-includes host.role 'worker' 'controlplane' 'etcd') change=(action 'selectAllRoles' host)}}
+            </td>
+          {{/if}}
         </tr>
       {{else if (eq kind "nomatch")}}
         <tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted lacsso pt-20 pb-20">{{t 'nodesPage.table.noMatch'}}</td></tr>
diff --git a/lib/shared/addon/components/machine/driver-amazonec2/template.hbs b/lib/shared/addon/components/machine/driver-amazonec2/template.hbs
index be76ed22a..e818dd309 100644
--- a/lib/shared/addon/components/machine/driver-amazonec2/template.hbs
+++ b/lib/shared/addon/components/machine/driver-amazonec2/template.hbs
@@ -115,10 +115,9 @@
       {{/if}}
     </div>
     <div class="row {{if isStep3 'inline-form'}}">
-      <div class="col span-2 col-inline">
-        <label class="acc-label">{{t 'machine.driverAmazon.subnet'}}</label>
-      </div>
-      <div class="col span-10">
+
+        <label class="acc-label pt-20">{{t 'machine.driverAmazon.subnet'}}</label>
+
         {{#if isStep3}}
           {{#if subnetChoices.length}}
             {{#each subnetChoices as |choice|}}
@@ -147,8 +146,7 @@
                   {{/each}}
                 </label>
                 </div>
-{{!--                 <hr class="mt-20 mb-20" />
- --}}              {{/if}}
+             {{/if}}
             {{/each}}
           {{/if}}
         {{else}}
@@ -160,7 +158,7 @@
             {{/if}}
           </div>
         {{/if}}
-      </div>
+
     </div>
   </div>
   {{#if isStep3}}
@@ -181,7 +179,7 @@
 
 <section class="horizontal-form {{unless isGteStep5 'hide'}}" style="padding-top: 0">
   <div class="box mt-20">
-    <span>{{t 'machine.driverAmazon.securityGroupSection'}}</span>
+    <h4>{{t 'machine.driverAmazon.securityGroupSection'}}</h4>
 
     <div class="row {{if isStep5 'inline-form'}}">
       {{!-- <div class="col span-2 col-inline"> --}}
diff --git a/lib/shared/addon/components/project-member-row/template.hbs b/lib/shared/addon/components/project-member-row/template.hbs
index 291a626a1..c3c921854 100644
--- a/lib/shared/addon/components/project-member-row/template.hbs
+++ b/lib/shared/addon/components/project-member-row/template.hbs
@@ -1,7 +1,7 @@
-<td class="pr-20">
+<td>
   {{t kind}}
 </td>
-<td class="pr-20">
+<td class="pr-10">
   {{#if owner}}
     {{owner.displayName}}
   {{else if editing}}
@@ -10,7 +10,7 @@
     {{member.role.user.displayName}}
   {{/if}}
 </td>
-<td class="pr-20">
+<td class="pr-10">
   {{#if owner}}
     {{if (eq type 'project') 'Project Owner' 'Cluster Owner'}}
   {{else if (or hasCustom member.customRolesExisting)}}
diff --git a/lib/shared/addon/components/searchable-select/template.hbs b/lib/shared/addon/components/searchable-select/template.hbs
index d5ae175cb..76e1b2f80 100644
--- a/lib/shared/addon/components/searchable-select/template.hbs
+++ b/lib/shared/addon/components/searchable-select/template.hbs
@@ -2,7 +2,7 @@
   {{input disabled=readOnly class=(concat 'form-control input-search search ' class) placeholder=placeholder type="text" autocomplete="off" value=filter}}
 
   {{#if showOptions}}
-    <section class="searchable-options {{if showSearch '' 'pt-10'}}">
+    <section class="searchable-options">
       {{#if prompt}}
         <div
           class="searchable-option searchable-prompt"