diff --git a/server/emails/templates/components/CopyCodeBox.tsx b/server/emails/templates/components/CopyCodeBox.tsx
index 686a6444..ef48b383 100644
--- a/server/emails/templates/components/CopyCodeBox.tsx
+++ b/server/emails/templates/components/CopyCodeBox.tsx
@@ -2,7 +2,7 @@ import React from "react";
 
 export default function CopyCodeBox({ text }: { text: string }) {
     return (
-        <div className="flex items-center justify-center rounded-lg bg-neutral-100 p-2">
+        <div className="text-center rounded-lg bg-neutral-100 p-2">
             <span className="text-2xl font-mono text-neutral-600 tracking-wide">
                 {text}
             </span>
diff --git a/src/app/[orgId]/settings/general/page.tsx b/src/app/[orgId]/settings/general/page.tsx
index e71dd337..7e173416 100644
--- a/src/app/[orgId]/settings/general/page.tsx
+++ b/src/app/[orgId]/settings/general/page.tsx
@@ -59,6 +59,9 @@ export default function GeneralPage() {
     const { toast } = useToast();
     const api = createApiClient(useEnvContext());
 
+    const [loadingDelete, setLoadingDelete] = useState(false);
+    const [loadingSave, setLoadingSave] = useState(false);
+
     const form = useForm<GeneralFormValues>({
         resolver: zodResolver(GeneralFormSchema),
         defaultValues: {
@@ -68,10 +71,17 @@ export default function GeneralPage() {
     });
 
     async function deleteOrg() {
+        setLoadingDelete(true);
         try {
             const res = await api.delete<AxiosResponse<DeleteOrgResponse>>(
                 `/org/${org?.org.orgId}`
             );
+
+            toast({
+                title: "Organization deleted",
+                description: "The organization and its data has been deleted."
+            });
+
             if (res.status === 200) {
                 pickNewOrgAndNavigate();
             }
@@ -85,6 +95,8 @@ export default function GeneralPage() {
                     "An error occurred while deleting the org."
                 )
             });
+        } finally {
+            setLoadingDelete(false);
         }
     }
 
@@ -116,10 +128,19 @@ export default function GeneralPage() {
     }
 
     async function onSubmit(data: GeneralFormValues) {
+        setLoadingSave(true);
         await api
             .post(`/org/${org?.org.orgId}`, {
                 name: data.name
             })
+            .then(() => {
+                toast({
+                    title: "Organization updated",
+                    description: "The organization has been updated."
+                });
+
+                router.refresh();
+            })
             .catch((e) => {
                 toast({
                     variant: "destructive",
@@ -129,6 +150,9 @@ export default function GeneralPage() {
                         "An error occurred while updating the org."
                     )
                 });
+            })
+            .finally(() => {
+                setLoadingSave(false);
             });
     }
 
@@ -201,7 +225,12 @@ export default function GeneralPage() {
                 </SettingsSectionBody>
 
                 <SettingsSectionFooter>
-                    <Button type="submit" form="org-settings-form">
+                    <Button
+                        type="submit"
+                        form="org-settings-form"
+                        loading={loadingSave}
+                        disabled={loadingSave}
+                    >
                         Save Settings
                     </Button>
                 </SettingsSectionFooter>
@@ -224,6 +253,8 @@ export default function GeneralPage() {
                         variant="destructive"
                         onClick={() => setIsDeleteModalOpen(true)}
                         className="flex items-center gap-2"
+                        loading={loadingDelete}
+                        disabled={loadingDelete}
                     >
                         Delete Organization Data
                     </Button>
diff --git a/src/app/[orgId]/settings/resources/[resourceId]/authentication/page.tsx b/src/app/[orgId]/settings/resources/[resourceId]/authentication/page.tsx
index 0f5ff963..b563616f 100644
--- a/src/app/[orgId]/settings/resources/[resourceId]/authentication/page.tsx
+++ b/src/app/[orgId]/settings/resources/[resourceId]/authentication/page.tsx
@@ -736,6 +736,7 @@ export default function ResourceAuthenticationPage() {
                             onClick={saveWhitelist}
                             form="whitelist-form"
                             loading={loadingSaveWhitelist}
+                            disabled={loadingSaveWhitelist}
                         >
                             Save Whitelist
                         </Button>
diff --git a/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx b/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
index 95f025cf..fb00d88f 100644
--- a/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
@@ -30,6 +30,7 @@ import {
 import { formatAxiosError } from "@app/lib/api";
 import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
+import { useState } from "react";
 
 const GeneralFormSchema = z.object({
     name: z.string()
@@ -43,6 +44,8 @@ export default function GeneralPage() {
 
     const api = createApiClient(useEnvContext());
 
+    const [loading, setLoading] = useState(false);
+
     const router = useRouter();
 
     const form = useForm<GeneralFormValues>({
@@ -54,6 +57,8 @@ export default function GeneralPage() {
     });
 
     async function onSubmit(data: GeneralFormValues) {
+        setLoading(true);
+
         await api
             .post(`/site/${site?.siteId}`, {
                 name: data.name
@@ -71,6 +76,8 @@ export default function GeneralPage() {
 
         updateSite({ name: data.name });
 
+        setLoading(false);
+
         router.refresh();
     }
 
@@ -117,7 +124,12 @@ export default function GeneralPage() {
                 </SettingsSectionBody>
 
                 <SettingsSectionFooter>
-                    <Button type="submit" form="general-settings-form">
+                    <Button
+                        type="submit"
+                        form="general-settings-form"
+                        loading={loading}
+                        disabled={loading}
+                    >
                         Save Settings
                     </Button>
                 </SettingsSectionFooter>
diff --git a/src/app/invite/InviteStatusCard.tsx b/src/app/invite/InviteStatusCard.tsx
index 11b37621..8957fd3e 100644
--- a/src/app/invite/InviteStatusCard.tsx
+++ b/src/app/invite/InviteStatusCard.tsx
@@ -86,15 +86,15 @@ export default function InviteStatusCard({
                         router.push("/");
                     }}
                 >
-                    Go home
+                    Go Home
                 </Button>
             );
         } else if (type === "wrong_user") {
             return (
-                <Button onClick={goToLogin}>Log in as different user</Button>
+                <Button onClick={goToLogin}>Log In as a Different User</Button>
             );
         } else if (type === "user_does_not_exist") {
-            return <Button onClick={goToSignup}>Create an account</Button>;
+            return <Button onClick={goToSignup}>Create an Account</Button>;
         }
     }