diff --git a/components/StyledPane.qml b/components/StyledPane.qml
deleted file mode 100644
index 4560aa4..0000000
--- a/components/StyledPane.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import qs.config
-import QtQuick
-import QtQuick.Controls
-
-Pane {
-    padding: 24
-    background: Rectangle {
-        color: "transparent"
-        border.width: Styling.theme.border
-        border.color: Styling.theme.basecontent
-        opacity: 0.33
-        Behavior on border.color {
-            ColorAnimation {
-                duration: Styling.animations.speed.fast
-            }
-        }
-        radius: Styling.theme.radiusBox
-    }
-}
diff --git a/components/StyledTabButton.qml b/components/StyledTabButton.qml
index 9ac48bd..de9ac89 100644
--- a/components/StyledTabButton.qml
+++ b/components/StyledTabButton.qml
@@ -12,7 +12,6 @@ TabButton {
         text: control.text
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
-        padding: 6
         color: control.hovered ? Styling.theme.primarycontent : Styling.theme.basecontent
         Behavior on color {
             ColorAnimation {
diff --git a/modules/storybook/Fields.qml b/modules/storybook/Fields.qml
index 1c76a2f..ff6c1ae 100644
--- a/modules/storybook/Fields.qml
+++ b/modules/storybook/Fields.qml
@@ -1,33 +1,21 @@
 import qs.components
 import qs.config
 import QtQuick
+import QtQuick.Controls
 import QtQuick.Layouts
 
-ColumnLayout {
-
-    spacing: Styling.layout.spacing.xl
-
-    ColumnLayout {
-        StyledText {
-            text: "Button"
-            font.pixelSize: 18
-        }
-        StyledPane {
-            StyledButton {
-                text: "Button"
-            }
-        }
-    }
+GridLayout {
+    flow: GridLayout.TopToBottom
+    columns: 2
+    rows: 10
 
     ColumnLayout {
         StyledText {
             text: "Icon Button"
             font.pixelSize: 18
         }
-        StyledPane {
-            StyledIconButton {
-                text: Styling.lucide.icons.square
-            }
+        StyledIconButton {
+            text: Styling.lucide.icons.square
         }
     }
 
@@ -36,18 +24,11 @@ ColumnLayout {
             text: "Slider"
             font.pixelSize: 18
         }
-        StyledPane {
-            StyledSlider {
-                id: slider
-                from: 0
-                to: 100
-                value: 50
-            }
+        StyledSlider {
+            id: slider
+            from: 0
+            to: 100
+            value: 50
         }
     }
-
-    component FieldElement: QtObject {
-        property string title
-        property Component component
-    }
 }
diff --git a/modules/storybook/Storybook.qml b/modules/storybook/Storybook.qml
index 0c0851f..729a49c 100644
--- a/modules/storybook/Storybook.qml
+++ b/modules/storybook/Storybook.qml
@@ -27,17 +27,15 @@ StyledPanelWindow {
         }
     }
 
-    Item {
+    ColumnLayout {
         id: layout
+
         anchors.fill: parent
+        spacing: 0
 
         StyledTabBar {
             id: tabs
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.bottom: stack.top
-
+            Layout.fillWidth: true
             StyledTabButton {
                 text: "Fields"
             }
@@ -50,26 +48,20 @@ StyledPanelWindow {
         }
 
         StackLayout {
-            id: stack
-
-            anchors.top: tabs.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-
             currentIndex: tabs.currentIndex
 
             ScrollView {
-                Layout.fillWidth: true
+                Layout.maximumHeight: 400
                 padding: 36
                 Fields {}
             }
             ScrollView {
+                Layout.maximumHeight: 400
                 padding: 36
                 Selectors {}
             }
             ScrollView {
-                Layout.fillWidth: true
+                Layout.maximumHeight: 400
                 padding: 36
                 Components {}
             }