diff --git a/.gitignore b/.gitignore
index 3b81fd63df..54401c6b36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ builder/*
 .data/
 .temp/
 packages/server/runtime_apps/
+.idea/
 
 # Logs
 logs
diff --git a/AUTHORS.md b/AUTHORS.md
index 3fe249cbc7..28e8898524 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -5,3 +5,5 @@ Contributors
 * Daniel Loudon - [@danbudi](https://github.com/marblekirby)
 * Joe  - [@joebudi](https://github.com/joebudi)
 * Martin McKeaveney - [@shogunpurple](https://github.com/shogunpurple)
+* Andrew Kingston - [@aptkingston](https://github.com/aptkingston)
+* Michael Drury - [@mike12345567](https://github.com/mike12345567)
\ No newline at end of file
diff --git a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
index 1c2f1d58cc..581bee5ef0 100644
--- a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
+++ b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
@@ -195,6 +195,16 @@
     cursor: pointer;
   }
 
+  button {
+    border-style: none;
+    border-radius: 2px;
+    padding: 0;
+    background: transparent;
+    cursor: pointer;
+    color: var(--ink);
+    outline: none;
+  }
+
   li:hover {
     background-color: var(--grey-2);
   }
diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
index feb44433fe..b907a2dbca 100644
--- a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
+++ b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
@@ -109,10 +109,10 @@
 
   .dropdown-menu {
     display: none;
-    height: 24px;
-    width: 24px;
     color: var(--ink);
-    padding: 0px 5px;
+    padding: 0 5px;
+    width: 24px;
+    height: 24px;
     border-style: none;
     background: rgba(0, 0, 0, 0);
     cursor: pointer;
diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte
index dee45c7c11..d9c619fae3 100644
--- a/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte
+++ b/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte
@@ -204,10 +204,10 @@
 
   .actions {
     display: none;
-    height: 24px;
-    width: 24px;
     color: var(--ink);
-    padding: 0px 5px;
+    padding: 0 5px;
+    width: 24px;
+    height: 24px;
     border-style: none;
     background: rgba(0, 0, 0, 0);
     cursor: pointer;
diff --git a/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte b/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte
index 7c32f03a6f..111336bcfe 100644
--- a/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte
+++ b/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte
@@ -64,7 +64,7 @@
   .root button {
     border-style: none;
     border-radius: 2px;
-    padding: 5px;
+    padding: 0;
     background: transparent;
     cursor: pointer;
     color: var(--ink);
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index b42f3edeee..1c2467cba0 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -36,6 +36,7 @@
   "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
   "dependencies": {
     "@beyonk/svelte-googlemaps": "^2.2.0",
+    "@budibase/bbui": "^1.29.3",
     "britecharts": "^2.16.1",
     "d3-selection": "^1.4.2",
     "fast-sort": "^2.2.0",