diff --git a/resources/css/components/forms.css b/resources/css/components/forms.css
index 47303fb598..2f580aba16 100644
--- a/resources/css/components/forms.css
+++ b/resources/css/components/forms.css
@@ -125,8 +125,10 @@
     display: none;
 }
 
-/* Collapsed state */
+/* GROUP MAIN COLUMN / COLLAPSIBLE FIELDS / COLLAPSED STATE
+=================================================== */
 [data-fields-collapsed="true"] {
+    /* Hide the inputs */
     [data-ui-input-group] {
         [data-ui-description],
         > :not(:first-child, :has([data-logic-attached])) {
@@ -137,25 +139,45 @@
             margin-bottom: 0;
         }
     }
+
     [data-editing-item] {
-        /* Tweak things optically, since the field is no longer here */
-        > *:first-child {
-            top: -0.175rem;
+        /* Tweak the actions position since the surrounding space is different */
+        [data-editing-field-actions] {
+            top: 50%;
+            transform: translateY(calc(-50% - 0.5px));
+            @apply pe-3;
         }
+
+        &[data-first-row]::before,
+        &[data-last-row]::before,
         &::before {
-            inset-block: -0.75rem;
-        }
-        &[data-first-row]::before {
-            inset-block-start: -1.25rem;
-        }
-        &[data-last-row]::before {
-            inset-block-end: -1.25rem;
+            inset: calc(0% - 1px);
         }
     }
+
     /* Field Icons */
     [data-collapsed-field-icon] {
         display: inline-flex;
     }
+
+    /* Wrapper/white background */
+    [data-section-drop-zone]:has(&) {
+        background: unset;
+        box-shadow: unset;
+        padding: 0;
+    }
+
+    [data-field-item] {
+        @apply px-3 sm:px-5 py-2.75 bg-white dark:bg-gray-850 rounded-xl ring ring-gray-200 dark:ring-gray-700/80 shadow-ui-md;
+    }
+
+    ~ [data-pagination] {
+        @apply mt-4;
+        /* Editing a button like "Next page" and "Submit" */
+        :has(> button)::before {
+            inset: calc(0% - 1px);
+        }
+    }
 }
 
 
diff --git a/resources/css/components/publish.css b/resources/css/components/publish.css
index e70cfd7595..5ed7a3a50c 100644
--- a/resources/css/components/publish.css
+++ b/resources/css/components/publish.css
@@ -9,7 +9,7 @@
 
     &[data-fields-collapsed="true"] {
         /* Collapse the grid further on Forms > Someform > Edit, when we're in the collapsed view */
-        @apply gap-5;
+        @apply gap-2;
     }
 
     aside & {
diff --git a/resources/js/components/forms/builder/Page.vue b/resources/js/components/forms/builder/Page.vue
index 3d263b282c..b97cfb25c9 100644
--- a/resources/js/components/forms/builder/Page.vue
+++ b/resources/js/components/forms/builder/Page.vue
@@ -110,7 +110,7 @@ onMounted(() => {
                 @deleted="sectionDeleted"
             >
                 <template v-if="section.fields.length && sectionIndex === (sections.length - 1)" #footer>
-                    <div :id="`actions-${page._id}`" class="mt-8">
+                    <div :id="`actions-${page._id}`" data-pagination class="mt-8">
                         <div class="cursor-pointer flex gap-2.5" @click.prevent="inspectAction">
                             <Button
                                 v-if="page.previous_page_label"