diff --git a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
index c85e23403c..25ecfd3280 100644
--- a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
+++ b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
@@ -78,4 +78,8 @@
   .switcher > .selected {
     color: var(--ink);
   }
+
+  .panel {
+    height: 100%;
+  }
 </style>
diff --git a/packages/builder/src/components/userInterface/DesignView.svelte b/packages/builder/src/components/userInterface/DesignView.svelte
index 40aac9027a..9e005ee3bb 100644
--- a/packages/builder/src/components/userInterface/DesignView.svelte
+++ b/packages/builder/src/components/userInterface/DesignView.svelte
@@ -55,6 +55,7 @@
     display: flex;
     flex-direction: column;
     width: 100%;
+    height: 100%;
   }
 
   .design-view-state-categories {
diff --git a/packages/builder/src/components/userInterface/OptionSelect.svelte b/packages/builder/src/components/userInterface/OptionSelect.svelte
index 4fbedde4ac..8ac0ca4184 100644
--- a/packages/builder/src/components/userInterface/OptionSelect.svelte
+++ b/packages/builder/src/components/userInterface/OptionSelect.svelte
@@ -1,36 +1,218 @@
 <script>
-  import { onMount } from "svelte"
-  export let value = ""
-  export let onChange = value => {}
+  import { onMount, beforeUpdate } from "svelte"
+  //Create utilities and move this in
+  import { buildStyle } from "../../../../standard-components/src/buildStyle.js"
   export let options = []
-  export let initialValue = ""
-  export let styleBindingProperty = ""
+  export let value = ""
+  export let styleBindingProperty
+  export let onChange = value => {}
+
+  let open = null
+  let rotate = ""
+  let select
+  let selectMenu
+  let icon
+
+  let selectYPosition = null
+  let availableSpace = 0
+
+  let positionSide = "top"
+  let maxHeight = null
+  let menuHeight
 
   const handleStyleBind = value =>
     !!styleBindingProperty ? { style: `${styleBindingProperty}: ${value}` } : {}
 
-  $: isOptionsObject = options.every(o => typeof o === "object")
-
   onMount(() => {
-    if (!value && !!initialValue) {
-      value = initialValue
+    if (select) {
+      select.addEventListener("keydown", addSelectKeyEvents)
+    }
+    return () => {
+      select.removeEventListener("keydown", addSelectKeyEvents)
     }
   })
+
+  function checkPosition() {
+    const { bottom, top: spaceAbove } = select.getBoundingClientRect()
+    const spaceBelow = window.innerHeight - bottom
+
+    if (spaceAbove > spaceBelow) {
+      positionSide = "bottom"
+      maxHeight = `${spaceAbove.toFixed(0) - 20}px`
+    } else {
+      positionSide = "top"
+      maxHeight = `${spaceBelow.toFixed(0) - 20}px`
+    }
+  }
+
+  function addSelectKeyEvents(e) {
+    if (e.key === "Enter") {
+      if (!open) {
+        toggleSelect(true)
+      }
+    } else if (e.key === "Escape") {
+      if (open) {
+        toggleSelect(false)
+      }
+    }
+  }
+
+  function toggleSelect(isOpen) {
+    checkPosition()
+    if (isOpen) {
+      icon.style.transform = "rotate(180deg)"
+    } else {
+      icon.style.transform = "rotate(0deg)"
+    }
+    open = isOpen
+  }
+
+  function handleClick(val) {
+    value = val
+    onChange(value)
+  }
+
+  $: menuStyle = buildStyle({
+    maxHeight,
+    transformOrigin: `center ${positionSide}`,
+    [positionSide]: "32px",
+  })
+
+  $: isOptionsObject = options.every(o => typeof o === "object")
+
+  $: selectedOption = isOptionsObject
+    ? options.find(o => o.value === value)
+    : {}
+
+  $: displayLabel =
+    selectedOption && selectedOption.label ? selectedOption.label : value || ""
 </script>
 
-<select
-  class="uk-select uk-form-small"
-  {value}
-  on:change={ev => onChange(ev.target.value)}>
-  {#if isOptionsObject}
-    {#each options as { value, label }}
-      <option {...handleStyleBind(value || label)} value={value || label}>
-        {label}
-      </option>
-    {/each}
-  {:else}
-    {#each options as value}
-      <option {...handleStyleBind(value)} {value}>{value}</option>
-    {/each}
-  {/if}
-</select>
+<div
+  tabindex="0"
+  bind:this={select}
+  class="bb-select-container"
+  on:click={() => toggleSelect(!open)}>
+  <div class="bb-select-anchor selected">
+    <span>{displayLabel}</span>
+    <i bind:this={icon} class="ri-arrow-down-s-fill" />
+  </div>
+  <div
+    bind:this={selectMenu}
+    style={menuStyle}
+    class="bb-select-menu"
+    class:open>
+    <ul>
+      {#if isOptionsObject}
+        {#each options as { value: v, label }}
+          <li
+            {...handleStyleBind(v)}
+            on:click|self={handleClick(v)}
+            class:selected={value === v}>
+            {label}
+          </li>
+        {/each}
+      {:else}
+        {#each options as v}
+          <li
+            {...handleStyleBind(v)}
+            on:click|self={handleClick(v)}
+            class:selected={value === v}>
+            {v}
+          </li>
+        {/each}
+      {/if}
+    </ul>
+  </div>
+</div>
+{#if open}
+  <div on:click|self={() => toggleSelect(false)} class="overlay" />
+{/if}
+
+<style>
+  .overlay {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    z-index: 1;
+  }
+
+  .bb-select-container {
+    position: relative;
+    outline: none;
+    margin: 5px;
+    width: 164px;
+    height: 32px;
+    cursor: pointer;
+  }
+
+  .bb-select-anchor {
+    cursor: pointer;
+    display: flex;
+    padding: 5px 10px;
+    background-color: #f2f2f2;
+    border-radius: 2px;
+    border: 1px solid var(--grey-dark);
+  }
+
+  .bb-select-anchor > span {
+    color: #565a66;
+    font-weight: 500;
+    flex: 1;
+  }
+
+  .bb-select-anchor > i {
+    flex: 0 0 20px;
+  }
+
+  .selected {
+    color: #565a66;
+    font-weight: 500;
+  }
+
+  .bb-select-menu {
+    position: absolute;
+    display: flex;
+    box-sizing: border-box;
+    flex-direction: column;
+    opacity: 0;
+    width: 164px;
+    z-index: 2;
+    color: #808192;
+    font-weight: 500;
+    height: fit-content !important;
+    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: 2px;
+    border-right: 1px solid var(--grey-dark);
+    border-left: 1px solid var(--grey-dark);
+    border-bottom: 1px solid var(--grey-dark);
+    background-color: #f2f2f2;
+    transform: scale(0);
+    transition: opacity 0.13s linear, transform 0.12s cubic-bezier(0, 0, 0.2, 1);
+    overflow-y: auto;
+  }
+
+  .open {
+    transform: scale(1);
+    opacity: 1;
+  }
+
+  ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 5px 10px;
+  }
+
+  li {
+    height: auto;
+    padding: 5px 0px;
+    cursor: pointer;
+  }
+
+  i {
+    transition: transform 0.13s ease;
+    transform-origin: center;
+  }
+</style>
diff --git a/packages/builder/src/components/userInterface/OptionSelectOld.svelte b/packages/builder/src/components/userInterface/OptionSelectOld.svelte
new file mode 100644
index 0000000000..db3c19de35
--- /dev/null
+++ b/packages/builder/src/components/userInterface/OptionSelectOld.svelte
@@ -0,0 +1,33 @@
+<script>
+  import { onMount } from "svelte"
+  export let value = ""
+  export let onChange = value => {}
+  export let options = []
+  export let initialValue = ""
+  export let styleBindingProperty = ""
+
+  const handleStyleBind = value =>
+    !!styleBindingProperty ? { style: `${styleBindingProperty}: ${value}` } : {}
+
+  $: isOptionsObject = options.every(o => typeof o === "object")
+
+  onMount(() => {
+    if (!value && !!initialValue) {
+      value = initialValue
+    }
+  })
+</script>
+
+<select {value} on:change={ev => onChange(ev.target.value)}>
+  {#if isOptionsObject}
+    {#each options as { value, label }}
+      <option {...handleStyleBind(value || label)} value={value || label}>
+        {label}
+      </option>
+    {/each}
+  {:else}
+    {#each options as value}
+      <option {...handleStyleBind(value)} {value}>{value}</option>
+    {/each}
+  {/if}
+</select>
diff --git a/packages/builder/src/components/userInterface/PropertyControl.svelte b/packages/builder/src/components/userInterface/PropertyControl.svelte
index cd1bad35f7..2946636872 100644
--- a/packages/builder/src/components/userInterface/PropertyControl.svelte
+++ b/packages/builder/src/components/userInterface/PropertyControl.svelte
@@ -49,6 +49,8 @@
 
   .label {
     flex: 0 0 50px;
+    display: flex;
+    align-items: center;
     padding: 0px 5px;
     font-size: 12px;
     font-weight: 500;
diff --git a/packages/builder/src/components/userInterface/PropertyGroup.svelte b/packages/builder/src/components/userInterface/PropertyGroup.svelte
index 240618a4c7..2e227d0b61 100644
--- a/packages/builder/src/components/userInterface/PropertyGroup.svelte
+++ b/packages/builder/src/components/userInterface/PropertyGroup.svelte
@@ -70,12 +70,16 @@
   }
 
   .property-panel {
-    height: 0px;
-    overflow: hidden;
+    /* height: 0px;
+    overflow: hidden; */
+    display: none;
   }
 
   .show {
-    overflow: auto;
-    height: auto;
+    /* overflow: auto;
+    height: auto; */
+    display: flex;
+    flex-direction: column;
+    flex: 1;
   }
 </style>
diff --git a/packages/builder/src/components/userInterface/SettingsView.svelte b/packages/builder/src/components/userInterface/SettingsView.svelte
index 36b2ab9c75..e5b997b8aa 100644
--- a/packages/builder/src/components/userInterface/SettingsView.svelte
+++ b/packages/builder/src/components/userInterface/SettingsView.svelte
@@ -3,6 +3,7 @@
   import InputGroup from "../common/Inputs/InputGroup.svelte"
   import Colorpicker from "../common/Colorpicker.svelte"
   import { excludeProps } from "./propertyCategories.js"
+  import OptionSelectNew from "./OptionSelectNew.svelte"
 
   export let panelDefinition = []
   export let componentDefinition = {}
@@ -16,6 +17,9 @@
   }
 </script>
 
+<OptionSelectNew
+  options={['arial enjfhewhfhw iejfiewj ewfnew', 'comicsans', 'tachoma', 'bla']} />
+
 {#if panelDefinition.length > 0}
   {#each panelDefinition as definition}
     {#if propExistsOnComponentDef(definition.key)}
diff --git a/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte b/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
index 13d7a7e2a1..68f3ff80da 100644
--- a/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
+++ b/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
@@ -151,8 +151,7 @@
   .components-pane {
     grid-column: 3;
     background-color: var(--white);
-    height: 100vh;
-    overflow-y: scroll;
+    height: calc(100vh - 49px);
   }
 
   .components-nav-page {
diff --git a/packages/builder/src/components/userInterface/propertyCategories.js b/packages/builder/src/components/userInterface/propertyCategories.js
index 07101779a5..bbcef302f6 100644
--- a/packages/builder/src/components/userInterface/propertyCategories.js
+++ b/packages/builder/src/components/userInterface/propertyCategories.js
@@ -13,9 +13,9 @@ export const layout = [
     control: OptionSelect,
     initialValue: "columnReverse",
     options: [
-      { label: "row" },
+      { label: "row", value: "row" },
       { label: "row-reverse", value: "rowReverse" },
-      { label: "column" },
+      { label: "column", value: "column" },
       { label: "column-reverse", value: "columnReverse" },
     ],
   },
@@ -25,7 +25,10 @@ export const layout = [
     label: "Wrap",
     key: "flex-wrap",
     control: OptionSelect,
-    options: [{ label: "wrap" }, { label: "no wrap", value: "noWrap" }],
+    options: [
+      { label: "wrap", value: "wrap" },
+      { label: "no wrap", value: "noWrap" },
+    ],
   },
 ]
 
@@ -59,13 +62,7 @@ export const position = [
     label: "Position",
     key: "position",
     control: OptionSelect,
-    options: [
-      { label: "static" },
-      { label: "relative" },
-      { label: "fixed" },
-      { label: "absolute" },
-      { label: "sticky" },
-    ],
+    options: ["static", "relative", "fixed", "absolute", "sticky"],
   },
 ]
 
@@ -91,12 +88,7 @@ export const typography = [
     label: "Weight",
     key: "font-weight",
     control: OptionSelect,
-    options: [
-      { label: "normal" },
-      { label: "bold" },
-      { label: "bolder" },
-      { label: "lighter" },
-    ],
+    options: ["normal", "bold", "bolder", "lighter"],
   },
   { label: "size", key: "font-size", defaultValue: "", control: Input },
   { label: "Line H", key: "line-height", control: Input },
diff --git a/packages/builder/src/pages/[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte
index df9762fb07..8afee37d74 100644
--- a/packages/builder/src/pages/[application]/frontend/_layout.svelte
+++ b/packages/builder/src/pages/[application]/frontend/_layout.svelte
@@ -163,7 +163,6 @@
     grid-column: 3;
     background-color: var(--white);
     min-height: 0px;
-    overflow-y: scroll;
   }
 
   .components-nav-page {