diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte
index 427a98f888..0e6ec3d155 100644
--- a/packages/bbui/src/ActionButton/ActionButton.svelte
+++ b/packages/bbui/src/ActionButton/ActionButton.svelte
@@ -130,5 +130,6 @@
     max-width: 150px;
     transform: translateX(-50%);
     text-align: center;
+    z-index: 1;
   }
 </style>
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index 7004102576..bd28347e08 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -68,9 +68,9 @@
 
   const getStepLabel = ({ stepCount, currentStep }) => {
     if (stepCount <= 1) {
-      return "Details"
+      return "Steps"
     }
-    return `Details (Step ${currentStep + 1}/${stepCount})`
+    return `Steps (${currentStep + 1}/${stepCount})`
   }
 
   const emitCurrentStep = step => {
diff --git a/packages/builder/src/components/design/settings/controls/FormStepControls.svelte b/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
index 054f9c0ed1..638d80945d 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
@@ -36,6 +36,7 @@
       on:click={() => {
         stepAction("previousStep")
       }}
+      tooltip={"Previous step"}
     />
     <ActionButton
       size="S"
@@ -45,6 +46,7 @@
       on:click={() => {
         stepAction("nextStep")
       }}
+      tooltip={"Next step"}
     />
     <ActionButton
       size="S"
@@ -54,6 +56,7 @@
       on:click={() => {
         stepAction("removeStep")
       }}
+      tooltip={"Remove step"}
     />
     <ActionButton
       size="S"
@@ -62,6 +65,7 @@
       on:click={() => {
         stepAction("addStep")
       }}
+      tooltip={"Add step"}
     />
   </div>
 {/if}