diff --git a/app/routes/app.settings.tsx b/app/routes/app.settings.tsx
index f6e1756..a563c1b 100644
--- a/app/routes/app.settings.tsx
+++ b/app/routes/app.settings.tsx
@@ -198,17 +198,6 @@ export default function SettingsRoute() {
         </s-paragraph>
       </s-section>
 
-      {actionData?.ok && (
-        <s-banner tone="success" heading="Settings saved">
-          Your changes are now live and will be used for the next invoice.
-        </s-banner>
-      )}
-      {actionData && !actionData.ok && (
-        <s-banner tone="critical" heading="Please fix the highlighted errors">
-          Some fields below need attention before settings can be saved.
-        </s-banner>
-      )}
-
       <Form method="post" encType="multipart/form-data">
         <s-section heading="Company">
           <s-stack direction="block" gap="base">
@@ -415,11 +404,23 @@ export default function SettingsRoute() {
         </s-section>
 
         <s-section>
-          <s-stack direction="inline" gap="base" justifyContent="end" alignItems="center">
-            {isSaving ? <s-text tone="neutral">Saving…</s-text> : null}
-            <s-button type="submit" variant="primary" {...(isSaving ? { loading: true } : {})}>
-              Save settings
-            </s-button>
+          <s-stack direction="block" gap="base">
+            {actionData?.ok && (
+              <s-banner tone="success" heading="Settings saved">
+                Your changes are now live and will be used for the next invoice.
+              </s-banner>
+            )}
+            {actionData && !actionData.ok && (
+              <s-banner tone="critical" heading="Please fix the highlighted errors">
+                Some fields below need attention before settings can be saved.
+              </s-banner>
+            )}
+            <s-stack direction="inline" gap="base" justifyContent="end" alignItems="center">
+              {isSaving ? <s-text tone="neutral">Saving…</s-text> : null}
+              <s-button type="submit" variant="primary" {...(isSaving ? { loading: true } : {})}>
+                Save settings
+              </s-button>
+            </s-stack>
           </s-stack>
         </s-section>
       </Form>