diff --git a/packages/builder/src/templates/rowActions.js b/packages/builder/src/templates/rowActions.js
index 62a9052bcb..639db09d00 100644
--- a/packages/builder/src/templates/rowActions.js
+++ b/packages/builder/src/templates/rowActions.js
@@ -63,6 +63,7 @@ export const getRowActionButtonTemplates = async ({
         _instanceName: Helpers.uuid(),
         text: action.name,
         type: "primary",
+        quiet: true,
       }
     )
 
diff --git a/packages/builder/src/templates/screenTemplating/form.js b/packages/builder/src/templates/screenTemplating/form.js
index 769851cf88..e0fe815896 100644
--- a/packages/builder/src/templates/screenTemplating/form.js
+++ b/packages/builder/src/templates/screenTemplating/form.js
@@ -55,6 +55,7 @@ const form = async ({ tableOrView, type, permissions, screens }) => {
       actionType: getActionType(type),
       title: getTitle(type),
       rowId: type === "new" ? undefined : `{{ url.id }}`,
+      buttonPosition: "bottom",
     })
     .instanceName(`${tableOrView.name} - Form block`)
     .json()
@@ -69,6 +70,11 @@ const form = async ({ tableOrView, type, permissions, screens }) => {
     })
     if (rowActionButtons.length) {
       formBlock.buttons = [...(formBlock.buttons || []), ...rowActionButtons]
+
+      // Collapse buttons if more than 3 row actions
+      if (rowActionButtons.length > 3) {
+        formBlock.buttonsCollapsed = true
+      }
     }
   }
 
diff --git a/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte b/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte
index b5b65398b6..cf833642d2 100644
--- a/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte
+++ b/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte
@@ -113,7 +113,7 @@
         }}
         styles={{
           normal: {
-            "margin-top": "16",
+            "margin-top": "24",
           },
         }}
         order={1}
diff --git a/packages/frontend-core/src/utils/utils.js b/packages/frontend-core/src/utils/utils.js
index 3e8cdcc781..fef9a7a31b 100644
--- a/packages/frontend-core/src/utils/utils.js
+++ b/packages/frontend-core/src/utils/utils.js
@@ -240,7 +240,7 @@ export const buildFormBlockButtonConfig = props => {
       _component: "@budibase/standard-components/button",
       onClick: onDelete,
       quiet: true,
-      type: "secondary",
+      type: "warning",
     })
   }