diff --git a/.DS_Store b/.DS_Store
index 3671182f..4115d15b 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/dashboard/page.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/dashboard/page.tsx
index e385c1cd..494fafb5 100644
--- a/src/app/(dynamic-pages)/(authenticated-pages)/dashboard/page.tsx
+++ b/src/app/(dynamic-pages)/(authenticated-pages)/dashboard/page.tsx
@@ -1,39 +1,54 @@
-import {
-  fetchSlimOrganizations,
-  getDefaultOrganization,
-  getOrganizationSlugByOrganizationId,
-} from '@/data/user/organizations';
-import { notFound, redirect } from 'next/navigation';
+'use client'
+
+import { getInitialOrganizationToRedirectTo } from '@/data/user/organizations';
+import { useSAToastMutation } from '@/hooks/useSAToastMutation';
+import { motion } from 'framer-motion';
+import { useRouter } from 'next/navigation';
+import { useDidMount } from 'rooks';
+
+const containerVariants = {
+  hidden: { opacity: 0 },
+  visible: { opacity: 1, transition: { duration: 0.5 } },
+  exit: { opacity: 0, transition: { duration: 0.5 } },
+};
+
+export default function DashboardPage() {
+  const router = useRouter();
+
+  const initialOrgRedirectMutation = useSAToastMutation(getInitialOrganizationToRedirectTo, {
+    loadingMessage: 'Loading your dashboard...',
+    errorMessage: 'Failed to load dashboard',
+    successMessage: 'Redirecting to your dashboard...',
+    onSuccess: (successPayload) => {
+      router.push(`/${successPayload.data}`);
+    },
+    onError: (errorPayload) => {
+      console.error(errorPayload);
+    },
+  });
+
+  useDidMount(() => {
+    initialOrgRedirectMutation.mutate();
+  });
 
-async function getOrganizationToRedirectTo(): Promise<string> {
-  const [slimOrganizations, defaultOrganizationId] = await Promise.all([
-    fetchSlimOrganizations(),
-    getDefaultOrganization(),
-  ]);
-
-  const firstOrganization = slimOrganizations[0];
-
-  if (defaultOrganizationId) {
-    return await getOrganizationSlugByOrganizationId(defaultOrganizationId);
-  }
-
-  // this condition is unreachable as the parent ../layout component ensures at least
-  // one organization exists
-  if (!firstOrganization) {
-    return notFound();
-  }
-
-
-  return firstOrganization.slug;
-}
-
-async function RedirectToDefaultOrg() {
-  const firstOrganizationId = await getOrganizationToRedirectTo();
-  return redirect(`/${firstOrganizationId}`);
-}
-
-export default async function DashboardPage() {
   return (
-    <RedirectToDefaultOrg />
+    <motion.div
+      variants={containerVariants}
+      initial="hidden"
+      animate="visible"
+      exit="exit"
+      className="flex items-center justify-center h-screen"
+    >
+      {initialOrgRedirectMutation.isLoading && (
+        <motion.div
+          initial={{ scale: 0 }}
+          animate={{ scale: 1 }}
+          transition={{ duration: 0.5 }}
+          className="text-2xl font-bold"
+        >
+          Loading your dashboard...
+        </motion.div>
+      )}
+    </motion.div>
   );
 }
diff --git a/src/app/(dynamic-pages)/(login-pages)/login/Login.tsx b/src/app/(dynamic-pages)/(login-pages)/login/Login.tsx
index 5087186f..920257a0 100644
--- a/src/app/(dynamic-pages)/(login-pages)/login/Login.tsx
+++ b/src/app/(dynamic-pages)/(login-pages)/login/Login.tsx
@@ -17,8 +17,10 @@ import {
   signInWithPassword,
   signInWithProvider,
 } from '@/data/auth/auth';
+import { getInitialOrganizationToRedirectTo } from '@/data/user/organizations';
 import { useSAToastMutation } from '@/hooks/useSAToastMutation';
 import type { AuthProvider } from '@/types';
+import { PrefetchKind } from 'next/dist/client/components/router-reducer/router-reducer-types';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useDidMount } from 'rooks';
@@ -37,15 +39,29 @@ export function Login({
 
   useDidMount(() => {
     console.log('prefetching dashboard')
-    router.prefetch('/dashboard')
+    router.prefetch('/dashboard', {
+      kind: PrefetchKind.AUTO
+    })
   })
 
+  const initialOrgRedirectMutation = useSAToastMutation(getInitialOrganizationToRedirectTo, {
+    loadingMessage: 'Loading your dashboard...',
+    errorMessage: 'Failed to load dashboard',
+    successMessage: 'Redirecting to your dashboard...',
+    onSuccess: (successPayload) => {
+      router.push(`/${successPayload.data}`);
+    },
+    onError: (errorPayload) => {
+      console.error(errorPayload);
+    },
+  });
+
+
   function redirectToDashboard() {
-    router.refresh();
     if (next) {
       router.push(`/auth/callback?next=${next}`);
     } else {
-      router.push('/auth/callback');
+      initialOrgRedirectMutation.mutate();
     }
   }
   const magicLinkMutation = useSAToastMutation(
diff --git a/src/app/(dynamic-pages)/(login-pages)/login/NewLogin.tsx b/src/app/(dynamic-pages)/(login-pages)/login/NewLogin.tsx
new file mode 100644
index 00000000..c7dfa40f
--- /dev/null
+++ b/src/app/(dynamic-pages)/(login-pages)/login/NewLogin.tsx
@@ -0,0 +1,169 @@
+
+import { Button } from "@/components/ui/button"
+import { Card } from "@/components/ui/card"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
+import Link from "next/link"
+
+export function NewLoginPage() {
+  return (
+    <div className="flex min-h-screen">
+      <div className="flex items-center justify-center w-1/2 bg-gray-100">
+        <Card className="w-full max-w-md p-4">
+          <div className="mb-4 text-center">
+            <h2 className="text-2xl font-bold">Welcome Back</h2>
+            <p className="text-muted-foreground">Please log in to your account</p>
+          </div>
+          <Tabs defaultValue="magic-link" className="w-full">
+            <TabsList className="grid w-full grid-cols-2">
+              <TabsTrigger value="magic-link">Magic Link</TabsTrigger>
+              <TabsTrigger value="email-password">Email & Password</TabsTrigger>
+            </TabsList>
+            <TabsContent value="magic-link">
+              <form className="space-y-4">
+                <div className="space-y-2">
+                  <Label htmlFor="email">Email</Label>
+                  <Input id="email" type="email" placeholder="Enter your email" />
+                </div>
+                <Button className="w-full">Send Magic Link</Button>
+              </form>
+            </TabsContent>
+            <TabsContent value="email-password">
+              <form className="space-y-4">
+                <div className="space-y-2">
+                  <Label htmlFor="email">Email</Label>
+                  <Input id="email" type="email" placeholder="Enter your email" />
+                </div>
+                <div className="space-y-2">
+                  <Label htmlFor="password">Password</Label>
+                  <Input id="password" type="password" placeholder="Enter your password" />
+                </div>
+                <Button className="w-full">Login</Button>
+              </form>
+            </TabsContent>
+          </Tabs>
+          <div className="my-4">
+            <div className="text-center text-sm text-muted-foreground">Or login with</div>
+            <div className="flex flex-col space-y-2 mt-2">
+              <Button variant="outline" className="w-full flex items-center justify-center">
+                <ChromeIcon className="mr-2 h-5 w-5" />
+                Google
+              </Button>
+              <Button variant="outline" className="w-full flex items-center justify-center">
+                <GithubIcon className="mr-2 h-5 w-5" />
+                Github
+              </Button>
+              <Button variant="outline" className="w-full flex items-center justify-center">
+                <TwitterIcon className="mr-2 h-5 w-5" />
+                Twitter
+              </Button>
+            </div>
+          </div>
+          <div className="flex justify-between text-sm text-muted-foreground">
+            <Link href="#" className="block" prefetch={false}>
+              Already have an account?
+            </Link>
+            <Link href="#" className="block" prefetch={false}>
+              Forgot password?
+            </Link>
+          </div>
+        </Card>
+      </div>
+      <div className="w-1/2 h-screen">
+        <img
+          src="/placeholder.svg"
+          alt="Background Image"
+          width={1200}
+          height={800}
+          className="object-cover w-full h-full"
+        />
+      </div>
+    </div>
+  )
+}
+
+function ChromeIcon(props) {
+  return (
+    <svg
+      {...props}
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <circle cx="12" cy="12" r="10" />
+      <circle cx="12" cy="12" r="4" />
+      <line x1="21.17" x2="12" y1="8" y2="8" />
+      <line x1="3.95" x2="8.54" y1="6.06" y2="14" />
+      <line x1="10.88" x2="15.46" y1="21.94" y2="14" />
+    </svg>
+  )
+}
+
+
+function GithubIcon(props) {
+  return (
+    <svg
+      {...props}
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M15 22v-4a4.8 4.8 0 0 0-1-3.5c3 0 6-2 6-5.5.08-1.25-.27-2.48-1-3.5.28-1.15.28-2.35 0-3.5 0 0-1 0-3 1.5-2.64-.5-5.36-.5-8 0C6 2 5 2 5 2c-.3 1.15-.3 2.35 0 3.5A5.403 5.403 0 0 0 4 9c0 3.5 3 5.5 6 5.5-.39.49-.68 1.05-.85 1.65-.17.6-.22 1.23-.15 1.85v4" />
+      <path d="M9 18c-4.51 2-5-2-7-2" />
+    </svg>
+  )
+}
+
+
+function TwitterIcon(props) {
+  return (
+    <svg
+      {...props}
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M22 4s-.7 2.1-2 3.4c1.6 10-9.4 17.3-18 11.6 2.2.1 4.4-.6 6-2C3 15.5.5 9.6 3 5c2.2 2.6 5.6 4.1 9 4-.9-4.2 4-6.6 7-3.8 1.1 0 3-1.2 3-1.2z" />
+    </svg>
+  )
+}
+
+
+function XIcon(props) {
+  return (
+    <svg
+      {...props}
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M18 6 6 18" />
+      <path d="m6 6 12 12" />
+    </svg>
+  )
+}
diff --git a/src/app/favicon.ico b/src/app/favicon.ico
new file mode 100644
index 00000000..7a9c7834
Binary files /dev/null and b/src/app/favicon.ico differ
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index bb136544..6998ca25 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,10 +1,11 @@
 import '@/styles/globals.css';
 import '@/styles/prosemirror.css';
 import { GeistSans } from 'geist/font/sans';
+import { Metadata } from 'next';
 import 'server-only';
 import { AppProviders } from './AppProviders';
 
-export const metadata = {
+export const metadata: Metadata = {
   icons: {
     icon: '/images/logo-black-main.ico',
   },
diff --git a/src/components/Auth/RedirectingPleaseWaitCard.tsx b/src/components/Auth/RedirectingPleaseWaitCard.tsx
index ab546c4a..becd4ff6 100644
--- a/src/components/Auth/RedirectingPleaseWaitCard.tsx
+++ b/src/components/Auth/RedirectingPleaseWaitCard.tsx
@@ -26,9 +26,7 @@ export function RedirectingPleaseWaitCard({
           <CardTitle className="text-center">{heading}</CardTitle>
           <CardDescription className="text-center">{message}</CardDescription>
         </CardHeader>
-
       </Card>
-
     </div>
   );
 }
diff --git a/src/data/user/organizations.ts b/src/data/user/organizations.ts
index 28864903..9b3aee9e 100644
--- a/src/data/user/organizations.ts
+++ b/src/data/user/organizations.ts
@@ -566,3 +566,40 @@ export const updateOrganizationSlug = async (
   revalidatePath("/[organizationSlug]", 'layout');
   return { status: 'success', data: `Slug updated to ${newSlug}` };
 };
+
+
+
+/**
+ * This is the organization that the user will be redirected to once they login
+ * or when they go to the /dashboard page
+ */
+export async function getInitialOrganizationToRedirectTo(): Promise<SAPayload<string>> {
+  const [slimOrganizations, defaultOrganizationId] = await Promise.all([
+    fetchSlimOrganizations(),
+    getDefaultOrganization(),
+  ]);
+
+  const firstOrganization = slimOrganizations[0];
+
+  if (defaultOrganizationId) {
+    const slug = await getOrganizationSlugByOrganizationId(defaultOrganizationId);
+    return {
+      data: slug,
+      status: 'success',
+    };
+  }
+
+  // this condition is unreachable as the parent ../layout component ensures at least
+  // one organization exists
+  if (!firstOrganization) {
+    return {
+      message: 'No organizations found',
+      status: 'error',
+    };
+  }
+
+  return {
+    data: firstOrganization.slug,
+    status: 'success',
+  };
+}