diff --git a/package.json b/package.json
index 68ad314a..8d6621e4 100644
--- a/package.json
+++ b/package.json
@@ -62,18 +62,15 @@
         "rebuild": "0.1.2",
         "tailwind-merge": "2.5.3",
         "tailwindcss-animate": "1.0.7",
+        "vaul": "1.1.1",
         "winston": "3.14.2",
         "winston-daily-rotate-file": "5.0.0",
         "zod": "3.23.8",
         "zod-validation-error": "3.4.0"
     },
     "devDependencies": {
-        "drizzle-kit": "0.24.2",
-        "esbuild": "0.20.1",
-        "esbuild-node-externals": "1.13.0",
-        "yargs": "17.7.2",
-        "@esbuild-plugins/tsconfig-paths": "0.1.2",
         "@dotenvx/dotenvx": "1.14.2",
+        "@esbuild-plugins/tsconfig-paths": "0.1.2",
         "@types/better-sqlite3": "7.6.11",
         "@types/cookie-parser": "1.4.7",
         "@types/cors": "2.8.17",
@@ -84,6 +81,9 @@
         "@types/react": "npm:types-react@19.0.0-rc.1",
         "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
         "@types/yargs": "17.0.33",
+        "drizzle-kit": "0.24.2",
+        "esbuild": "0.20.1",
+        "esbuild-node-externals": "1.13.0",
         "eslint": "^8",
         "eslint-config-next": "15.0.1",
         "postcss": "^8",
@@ -91,7 +91,8 @@
         "tailwindcss": "^3.4.1",
         "tsc-alias": "1.8.10",
         "tsx": "4.19.1",
-        "typescript": "^5"
+        "typescript": "^5",
+        "yargs": "17.7.2"
     },
     "overrides": {
         "@types/react": "npm:types-react@19.0.0-rc.1",
diff --git a/src/app/[orgId]/settings/users/components/InviteUserForm.tsx b/src/app/[orgId]/settings/users/components/InviteUserForm.tsx
index 1823f91b..c693eb7f 100644
--- a/src/app/[orgId]/settings/users/components/InviteUserForm.tsx
+++ b/src/app/[orgId]/settings/users/components/InviteUserForm.tsx
@@ -64,7 +64,7 @@ export default function InviteUserForm() {
         resolver: zodResolver(formSchema),
         defaultValues: {
             email: "",
-            validForHours: "24",
+            validForHours: "168",
             roleId: "4",
         },
     });
@@ -189,15 +189,14 @@ export default function InviteUserForm() {
                                 </FormItem>
                             )}
                         />
-                        <div className="flex justify-center">
-                            <Button
-                                type="submit"
-                                loading={loading}
-                                disabled={inviteLink !== null}
-                            >
-                                Invite User
-                            </Button>
-                        </div>
+                        <Button
+                            type="submit"
+                            className="w-full"
+                            loading={loading}
+                            disabled={inviteLink !== null}
+                        >
+                            Invite User
+                        </Button>
                     </form>
                 </Form>
             )}
@@ -216,7 +215,7 @@ export default function InviteUserForm() {
                         </b>
                         .
                     </p>
-                    {/* <CopyTextBox text={inviteLink} wrapText={false} /> */}
+                    <CopyTextBox text={inviteLink} wrapText={false} />
                 </div>
             )}
         </>
diff --git a/src/app/[orgId]/settings/users/components/UsersTable.tsx b/src/app/[orgId]/settings/users/components/UsersTable.tsx
index 2922249f..d8f730d7 100644
--- a/src/app/[orgId]/settings/users/components/UsersTable.tsx
+++ b/src/app/[orgId]/settings/users/components/UsersTable.tsx
@@ -19,6 +19,7 @@ import {
 } from "@app/components/ui/dialog";
 import { useState } from "react";
 import InviteUserForm from "./InviteUserForm";
+import { Credenza, CredenzaTitle, CredenzaDescription, CredenzaHeader, CredenzaClose, CredenzaFooter, CredenzaContent, CredenzaBody } from "@app/components/Credenza";
 
 export type UserRow = {
     id: string;
@@ -73,17 +74,19 @@ export default function UsersTable({ users }: UsersTableProps) {
 
     return (
         <>
-            <Dialog
-                open={isInviteModalOpen}
-                onOpenChange={setIsInviteModalOpen}
-            >
-                <DialogContent>
-                    <DialogHeader>
-                        <DialogTitle>Invite User</DialogTitle>
-                    </DialogHeader>
+            <Credenza open={isInviteModalOpen} onOpenChange={setIsInviteModalOpen}>
+                <CredenzaContent>
+                    <CredenzaHeader>
+                        <CredenzaTitle>Invite User</CredenzaTitle>
+                        <CredenzaDescription>
+                            Give new users access to your organization
+                        </CredenzaDescription>
+                    </CredenzaHeader>
+                    <CredenzaBody>
                     <InviteUserForm />
-                </DialogContent>
-            </Dialog>
+                    </CredenzaBody>
+                </CredenzaContent>
+            </Credenza>
 
             <UsersDataTable
                 columns={columns}
diff --git a/src/app/auth/login/LoginForm.tsx b/src/app/auth/login/LoginForm.tsx
index 55dafe33..c40c6f7e 100644
--- a/src/app/auth/login/LoginForm.tsx
+++ b/src/app/auth/login/LoginForm.tsx
@@ -42,6 +42,7 @@ export default function LoginForm({ redirect }: LoginFormProps) {
     const router = useRouter();
 
     const [error, setError] = useState<string | null>(null);
+    const [loading, setLoading] = useState(false);
 
     const form = useForm<z.infer<typeof formSchema>>({
         resolver: zodResolver(formSchema),
@@ -53,6 +54,9 @@ export default function LoginForm({ redirect }: LoginFormProps) {
 
     async function onSubmit(values: z.infer<typeof formSchema>) {
         const { email, password } = values;
+
+        setLoading(true);
+
         const res = await api
             .post<AxiosResponse<LoginResponse>>("/auth/login", {
                 email,
@@ -86,6 +90,8 @@ export default function LoginForm({ redirect }: LoginFormProps) {
                 router.push("/");
             }
         }
+
+        setLoading(false);
     }
 
     return (
@@ -140,7 +146,7 @@ export default function LoginForm({ redirect }: LoginFormProps) {
                                 <AlertDescription>{error}</AlertDescription>
                             </Alert>
                         )}
-                        <Button type="submit" className="w-full">
+                        <Button type="submit" className="w-full" loading={loading}>
                             Login
                         </Button>
                     </form>
diff --git a/src/app/auth/signup/SignupForm.tsx b/src/app/auth/signup/SignupForm.tsx
index 2991183a..b8af07aa 100644
--- a/src/app/auth/signup/SignupForm.tsx
+++ b/src/app/auth/signup/SignupForm.tsx
@@ -46,6 +46,7 @@ const formSchema = z
 export default function SignupForm({ redirect }: SignupFormProps) {
     const router = useRouter();
 
+    const [loading, setLoading] = useState(false);
     const [error, setError] = useState<string | null>(null);
 
     const form = useForm<z.infer<typeof formSchema>>({
@@ -59,6 +60,8 @@ export default function SignupForm({ redirect }: SignupFormProps) {
 
     async function onSubmit(values: z.infer<typeof formSchema>) {
         const { email, password } = values;
+
+        setLoading(true);
         const res = await api
             .put<AxiosResponse<SignUpResponse>>("/auth/signup", {
                 email,
@@ -92,6 +95,8 @@ export default function SignupForm({ redirect }: SignupFormProps) {
                 router.push("/");
             }
         }
+
+        setLoading(false);
     }
 
     return (
diff --git a/src/components/Credenza.tsx b/src/components/Credenza.tsx
new file mode 100644
index 00000000..cfadd9b6
--- /dev/null
+++ b/src/components/Credenza.tsx
@@ -0,0 +1,152 @@
+"use client";
+
+import * as React from "react";
+
+import { cn } from "@/lib/utils";
+import { useMediaQuery } from "@app/hooks/useMediaQuery";
+import {
+    Dialog,
+    DialogClose,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+    Drawer,
+    DrawerClose,
+    DrawerContent,
+    DrawerDescription,
+    DrawerFooter,
+    DrawerHeader,
+    DrawerTitle,
+    DrawerTrigger,
+} from "@/components/ui/drawer";
+
+interface BaseProps {
+    children: React.ReactNode;
+}
+
+interface RootCredenzaProps extends BaseProps {
+    open?: boolean;
+    onOpenChange?: (open: boolean) => void;
+}
+
+interface CredenzaProps extends BaseProps {
+    className?: string;
+    asChild?: true;
+}
+
+const desktop = "(min-width: 768px)";
+
+const Credenza = ({ children, ...props }: RootCredenzaProps) => {
+    const isDesktop = useMediaQuery(desktop);
+    const Credenza = isDesktop ? Dialog : Drawer;
+
+    return <Credenza {...props}>{children}</Credenza>;
+};
+
+const CredenzaTrigger = ({ className, children, ...props }: CredenzaProps) => {
+    const isDesktop = useMediaQuery(desktop);
+    const CredenzaTrigger = isDesktop ? DialogTrigger : DrawerTrigger;
+
+    return (
+        <CredenzaTrigger className={className} {...props}>
+            {children}
+        </CredenzaTrigger>
+    );
+};
+
+const CredenzaClose = ({ className, children, ...props }: CredenzaProps) => {
+    const isDesktop = useMediaQuery(desktop);
+    const CredenzaClose = isDesktop ? DialogClose : DrawerClose;
+
+    return (
+        <CredenzaClose className={className} {...props}>
+            {children}
+        </CredenzaClose>
+    );
+};
+
+const CredenzaContent = ({ className, children, ...props }: CredenzaProps) => {
+    const isDesktop = useMediaQuery(desktop);
+    const CredenzaContent = isDesktop ? DialogContent : DrawerContent;
+
+    return (
+        <CredenzaContent className={className} {...props}>
+            {children}
+        </CredenzaContent>
+    );
+};
+
+const CredenzaDescription = ({
+    className,
+    children,
+    ...props
+}: CredenzaProps) => {
+    const isDesktop = useMediaQuery(desktop);
+    const CredenzaDescription = isDesktop
+        ? DialogDescription
+        : DrawerDescription;
+
+    return (
+        <CredenzaDescription className={className} {...props}>
+            {children}
+        </CredenzaDescription>
+    );
+};
+
+const CredenzaHeader = ({ className, children, ...props }: CredenzaProps) => {
+    const isDesktop = useMediaQuery(desktop);
+    const CredenzaHeader = isDesktop ? DialogHeader : DrawerHeader;
+
+    return (
+        <CredenzaHeader className={className} {...props}>
+            {children}
+        </CredenzaHeader>
+    );
+};
+
+const CredenzaTitle = ({ className, children, ...props }: CredenzaProps) => {
+    const isDesktop = useMediaQuery(desktop);
+    const CredenzaTitle = isDesktop ? DialogTitle : DrawerTitle;
+
+    return (
+        <CredenzaTitle className={className} {...props}>
+            {children}
+        </CredenzaTitle>
+    );
+};
+
+const CredenzaBody = ({ className, children, ...props }: CredenzaProps) => {
+    return (
+        <div className={cn("px-4 md:px-0 mb-4", className)} {...props}>
+            {children}
+        </div>
+    );
+};
+
+const CredenzaFooter = ({ className, children, ...props }: CredenzaProps) => {
+    const isDesktop = useMediaQuery(desktop);
+    const CredenzaFooter = isDesktop ? DialogFooter : DrawerFooter;
+
+    return (
+        <CredenzaFooter className={className} {...props}>
+            {children}
+        </CredenzaFooter>
+    );
+};
+
+export {
+    Credenza,
+    CredenzaTrigger,
+    CredenzaClose,
+    CredenzaContent,
+    CredenzaDescription,
+    CredenzaHeader,
+    CredenzaTitle,
+    CredenzaBody,
+    CredenzaFooter,
+};
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
index 7d24311b..52e291b6 100644
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -38,7 +38,7 @@ const DialogContent = React.forwardRef<
         <DialogPrimitive.Content
             ref={ref}
             className={cn(
-                "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+                "fixed left-[50%] top-[30%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
                 className
             )}
             {...props}
diff --git a/src/components/ui/drawer.tsx b/src/components/ui/drawer.tsx
new file mode 100644
index 00000000..6a0ef53d
--- /dev/null
+++ b/src/components/ui/drawer.tsx
@@ -0,0 +1,118 @@
+"use client"
+
+import * as React from "react"
+import { Drawer as DrawerPrimitive } from "vaul"
+
+import { cn } from "@/lib/utils"
+
+const Drawer = ({
+  shouldScaleBackground = true,
+  ...props
+}: React.ComponentProps<typeof DrawerPrimitive.Root>) => (
+  <DrawerPrimitive.Root
+    shouldScaleBackground={shouldScaleBackground}
+    {...props}
+  />
+)
+Drawer.displayName = "Drawer"
+
+const DrawerTrigger = DrawerPrimitive.Trigger
+
+const DrawerPortal = DrawerPrimitive.Portal
+
+const DrawerClose = DrawerPrimitive.Close
+
+const DrawerOverlay = React.forwardRef<
+  React.ElementRef<typeof DrawerPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <DrawerPrimitive.Overlay
+    ref={ref}
+    className={cn("fixed inset-0 z-50 bg-black/80", className)}
+    {...props}
+  />
+))
+DrawerOverlay.displayName = DrawerPrimitive.Overlay.displayName
+
+const DrawerContent = React.forwardRef<
+  React.ElementRef<typeof DrawerPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+  <DrawerPortal>
+    <DrawerOverlay />
+    <DrawerPrimitive.Content
+      ref={ref}
+      className={cn(
+        "fixed inset-x-0 bottom-0 z-50 mt-24 flex h-auto flex-col rounded-t-[10px] border bg-background",
+        className
+      )}
+      {...props}
+    >
+      <div className="mx-auto mt-4 h-2 w-[100px] rounded-full bg-muted" />
+      {children}
+    </DrawerPrimitive.Content>
+  </DrawerPortal>
+))
+DrawerContent.displayName = "DrawerContent"
+
+const DrawerHeader = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn("grid gap-1.5 p-4 text-center sm:text-left", className)}
+    {...props}
+  />
+)
+DrawerHeader.displayName = "DrawerHeader"
+
+const DrawerFooter = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn("mt-auto flex flex-col gap-2 p-4", className)}
+    {...props}
+  />
+)
+DrawerFooter.displayName = "DrawerFooter"
+
+const DrawerTitle = React.forwardRef<
+  React.ElementRef<typeof DrawerPrimitive.Title>,
+  React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Title>
+>(({ className, ...props }, ref) => (
+  <DrawerPrimitive.Title
+    ref={ref}
+    className={cn(
+      "text-lg font-semibold leading-none tracking-tight",
+      className
+    )}
+    {...props}
+  />
+))
+DrawerTitle.displayName = DrawerPrimitive.Title.displayName
+
+const DrawerDescription = React.forwardRef<
+  React.ElementRef<typeof DrawerPrimitive.Description>,
+  React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Description>
+>(({ className, ...props }, ref) => (
+  <DrawerPrimitive.Description
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+))
+DrawerDescription.displayName = DrawerPrimitive.Description.displayName
+
+export {
+  Drawer,
+  DrawerPortal,
+  DrawerOverlay,
+  DrawerTrigger,
+  DrawerClose,
+  DrawerContent,
+  DrawerHeader,
+  DrawerFooter,
+  DrawerTitle,
+  DrawerDescription,
+}
diff --git a/src/hooks/useMediaQuery.ts b/src/hooks/useMediaQuery.ts
new file mode 100644
index 00000000..6436177b
--- /dev/null
+++ b/src/hooks/useMediaQuery.ts
@@ -0,0 +1,19 @@
+import * as React from "react";
+
+export function useMediaQuery(query: string) {
+    const [value, setValue] = React.useState(false);
+
+    React.useEffect(() => {
+        function onChange(event: MediaQueryListEvent) {
+            setValue(event.matches);
+        }
+
+        const result = matchMedia(query);
+        result.addEventListener("change", onChange);
+        setValue(result.matches);
+
+        return () => result.removeEventListener("change", onChange);
+    }, [query]);
+
+    return value;
+}