diff --git a/app/sign-in/[[...sign-in]]/page.tsx b/app/sign-in/[[...sign-in]]/page.tsx
index 3b64227..a06c0c8 100644
--- a/app/sign-in/[[...sign-in]]/page.tsx
+++ b/app/sign-in/[[...sign-in]]/page.tsx
@@ -1,10 +1,42 @@
-import { SignIn } from '@clerk/nextjs'
+import { ClerkLoaded, ClerkLoading, SignIn } from '@clerk/nextjs'
 
-export default function Page() {
+import { cn } from '@/lib/utils'
+import { ExternalLink } from '@/components/external-link'
+import { buttonVariants } from '@/components/ui/button'
+import { IconSpinner } from '@/components/ui/icons'
+
+export default function SignInPage() {
   return (
-    <div className="flex flex-col items-center justify-center h-full min-h-screen">
-      <div className="flex flex-col items-center justify-center h-full">
-        <SignIn />
+    <div className="flex h-full min-h-screen flex-col items-center justify-center">
+      <div className="space-y-4">
+        <ClerkLoading>
+          <div className="flex items-center text-sm text-muted-foreground">
+            <IconSpinner className="mr-2 h-5 w-5" /> Loading...
+          </div>
+        </ClerkLoading>
+        <ClerkLoaded>
+          <SignIn
+            appearance={{
+              elements: {
+                card: 'shadow rounded-lg border border-border',
+                formFieldInput:
+                  'flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
+                formButtonPrimary: cn(buttonVariants(), 'normal-case'),
+                footerAction: 'text-sm',
+                footerActionLink:
+                  'text-primary font-medium hover:underline hover:text-primary'
+              }
+            }}
+          />
+          <p className="hidden px-2 text-center text-xs leading-normal text-muted-foreground sm:block">
+            Open source AI chatbot app built with{' '}
+            <ExternalLink href="https://nextjs.org">Next.js</ExternalLink> and{' '}
+            <ExternalLink href="https://vercel.com/storage/kv">
+              Vercel KV
+            </ExternalLink>
+            .
+          </p>
+        </ClerkLoaded>
       </div>
     </div>
   )
diff --git a/app/sign-up/[[...sign-up]]/page.tsx b/app/sign-up/[[...sign-up]]/page.tsx
index 38e2669..49f0245 100644
--- a/app/sign-up/[[...sign-up]]/page.tsx
+++ b/app/sign-up/[[...sign-up]]/page.tsx
@@ -1,10 +1,46 @@
-import { SignUp } from '@clerk/nextjs'
+import { ClerkLoaded, ClerkLoading, SignUp } from '@clerk/nextjs'
+
+import { cn } from '@/lib/utils'
+import { buttonVariants } from '@/components/ui/button'
+import { ExternalLink } from '@/components/external-link'
+import { IconSpinner } from '@/components/ui/icons'
 
 export default function Page() {
   return (
-    <div className="flex flex-col items-center justify-center h-full min-h-screen">
-      <div className="flex flex-col items-center justify-center h-full">
-        <SignUp />
+    <div className="flex h-full min-h-screen flex-col items-center justify-center">
+      <div className="space-y-4">
+        <ClerkLoading>
+          <div className="flex items-center text-sm text-muted-foreground">
+            <IconSpinner className="mr-2 h-5 w-5" /> Loading...
+          </div>
+        </ClerkLoading>
+        <ClerkLoaded>
+          <SignUp
+            appearance={{
+              elements: {
+                card: 'shadow rounded-lg border border-border',
+                formFieldInput:
+                  'flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
+                formButtonPrimary: cn(buttonVariants(), 'normal-case'),
+                footerAction: 'text-sm',
+                footerActionLink:
+                  'text-primary font-medium hover:underline hover:text-primary',
+                identityPreview: 'rounded-md',
+                identityPreviewEditButton: 'text-primary',
+                otpCodeFieldInput: 'text-primary focus:border-b-primary',
+                formResendCodeLink: 'text-primary font-medium'
+              }
+            }}
+          />
+          <p className="hidden px-2 text-center text-xs leading-normal text-muted-foreground sm:block">
+            Open source AI chatbot app built with{' '}
+            <ExternalLink href="https://nextjs.org">Next.js</ExternalLink> and{' '}
+            <ExternalLink href="https://vercel.com/storage/kv">
+              Vercel KV
+            </ExternalLink>
+            .
+          </p>
+        </ClerkLoaded>
       </div>
     </div>
   )