diff --git a/app/(auth)/login/old.txt b/app/(auth)/login/old.txt
deleted file mode 100644
index 3cba16d..0000000
--- a/app/(auth)/login/old.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { signIn } from "next-auth/react";
-import { useRouter } from "next/navigation";
-import { FcGoogle } from "react-icons/fc";
-import { FaFacebook } from "react-icons/fa";
-import ChatBot from "@/components/ChatBot";
-
-export default function LoginPage() {
-  const router = useRouter();
-
-  const [email, setEmail] = useState("");
-  const [password, setPassword] = useState("");
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState("");
-
-  const handleSubmit = async (e: any) => {
-    e.preventDefault();
-    setLoading(true);
-    setError("");
-
-    const res = await signIn("credentials", {
-      email,
-      password,
-      redirect: false,
-    });
-
-    setLoading(false);
-
-    if (res?.error) {
-      setError("Invalid email or password");
-      return;
-    }
-
-    router.push("/");
-  };
-
-  return (
-    <main className="flex items-center justify-center min-h-screen bg-gray-100 px-4">
-      <div className="bg-white w-full max-w-md shadow-xl rounded-xl p-8">
-        <h1 className="text-3xl font-semibold text-center mb-8">Login</h1>
-
-        <form className="space-y-4" onSubmit={handleSubmit}>
-          <div>
-            <label className="font-medium">Email</label>
-            <input
-              className="w-full border rounded-lg px-4 py-2"
-              type="email"
-              placeholder="example@gmail.com"
-              onChange={(e) => setEmail(e.target.value)}
-            />
-          </div>
-
-          <div>
-            <label className="font-medium">Password</label>
-            <input
-              className="w-full border rounded-lg px-4 py-2"
-              type="password"
-              placeholder="Your password"
-              onChange={(e) => setPassword(e.target.value)}
-            />
-          </div>
-
-          {error && <p className="text-red-500 text-sm text-center">{error}</p>}
-
-          <button
-            disabled={loading}
-            className="w-full py-2 rounded-lg bg-black text-white hover:bg-gray-800 transition"
-          >
-            {loading ? "Logging in..." : "Login"}
-          </button>
-        </form>
-
-        {/* SOCIAL LOGIN BUTTONS SECTION */}
-
-        <div className="mt-6 space-y-2">
-          <button
-            onClick={() => signIn("google")}
-            className="w-full flex items-center justify-center gap-3 py-2 rounded-lg border hover:bg-gray-200 transition"
-          >
-            <FcGoogle size={22} />
-            Continue with Google
-          </button>
-
-          <button
-            onClick={() => signIn("facebook")}
-            className="w-full flex items-center justify-center gap-3 py-2 rounded-lg bg-blue-700 text-white hover:bg-blue-600 transition"
-          >
-            <FaFacebook size={22} />
-            Continue with Facebook
-          </button>
-        </div>
-      </div>
-      <ChatBot />
-    </main>
-  );
-}
diff --git a/app/api/auth/[...nextauth]/route.ts b/app/api/auth/[...nextauth]/route.ts
index 1bf56e0..094da5e 100644
--- a/app/api/auth/[...nextauth]/route.ts
+++ b/app/api/auth/[...nextauth]/route.ts
@@ -39,7 +39,7 @@ export const authOptions = {
 
         return {
           id: user.id,
-            name: user.name,
+          name: user.name,
           email: user.email,
           userType: "user",
         };
@@ -55,7 +55,6 @@ export const authOptions = {
       },
 
       async authorize(credentials) {
-
         if (!credentials?.email || !credentials?.password) return null;
 
         const admin = await prisma.admin.findUnique({
@@ -71,14 +70,12 @@ export const authOptions = {
 
         if (!ok) return null;
 
-          console.log("LOGIN ATTEMPT:", credentials);
-
         return {
           id: admin.id,
           email: admin.email,
           userType: admin.role === "advisor" ? "advisor" : "admin",
           adminRole: admin.role,
-            mustChangePassword: admin.mustChangePassword
+          mustChangePassword: admin.mustChangePassword,
         };
       },
     }),
@@ -103,84 +100,102 @@ export const authOptions = {
     maxAge: 30 * 60, // 30 minutes
   },
 
-    callbacks: {
-
-        // async jwt({ token, user }) {
-        //     if (user) {
-        //         token.id = user.id;
-        //         token.userType = user.userType;
-        //         token.name = user.name;
-        //         token.adminRole = user.adminRole ?? null;
-        //         token.mustChangePassword = user.mustChangePassword ?? false;
-        //     }
-        //
-        //     if (!token.userType) token.userType = "user";
-        //
-        //     return token;
-        // },
-        //
-        // async session({ session, token }) {
-        //     session.user.id = token.id;
-        //     session.user.userType = token.userType;
-        //     session.user.name = token.name;
-        //     session.user.adminRole = token.adminRole;
-        //     session.user.mustChangePassword = token.mustChangePassword;
-        //     return session;
-        // },
-        //
-        // async redirect({ url, baseUrl }) {
-        //     return process.env.BASEURL;
-        // },
-
-        async jwt({ token, user,account }) {
-
-            if (user) {
-                token.id = user.id;
-                token.name = user.name;
-                token.adminRole = user.adminRole ?? null;
-
-                // 🔥 KEY FIX
-                if (account?.provider === "google" || account?.provider === "github") {
-                    token.userType = "user"; // ✅ assign role for OAuth users
-                } else {
-                    token.userType = user.userType ?? "user";
-                }
-            }
-
-            // 🔥 ALWAYS GET LATEST VALUE FROM DB
-            if (token.userType === "advisor" || token.userType === "admin") {
-                const admin = await prisma.admin.findUnique({
-                    where: { id: token.id },
-                });
-
-                if (admin) {
-                    token.mustChangePassword = admin.mustChangePassword;
-                    token.name = admin.name;
-                    token.email = admin.email;
-                }
-            }
-
-            return token;
-        },
-
-        async session({ session, token }) {
-            session.user.id = token.id;
-            session.user.userType = token.userType ?? "user";
-            session.user.name = token.name;
-            session.user.adminRole = token.adminRole;
-            session.user.mustChangePassword = token.mustChangePassword;
-            session.user.email = token.email; // ✅ IMPORTANT
-            return session;
-        },
-
-        async redirect({ url, baseUrl }) {
-            if (url.startsWith("/")) return baseUrl + url;
-            if (url.startsWith(baseUrl)) return url;
-            return baseUrl;
+  callbacks: {
+    // async jwt({ token, user }) {
+    //     if (user) {
+    //         token.id = user.id;
+    //         token.userType = user.userType;
+    //         token.name = user.name;
+    //         token.adminRole = user.adminRole ?? null;
+    //         token.mustChangePassword = user.mustChangePassword ?? false;
+    //     }
+    //
+    //     if (!token.userType) token.userType = "user";
+    //
+    //     return token;
+    // },
+    //
+    // async session({ session, token }) {
+    //     session.user.id = token.id;
+    //     session.user.userType = token.userType;
+    //     session.user.name = token.name;
+    //     session.user.adminRole = token.adminRole;
+    //     session.user.mustChangePassword = token.mustChangePassword;
+    //     return session;
+    // },
+    //
+    // async redirect({ url, baseUrl }) {
+    //     return process.env.BASEURL;
+    // },
+
+    async jwt({ token, user, account, trigger, session }) {
+      if (user) {
+        token.id = user.id;
+        token.name = user.name;
+        token.email = user.email;
+        token.adminRole = user.adminRole ?? null;
+
+        // 🔥 KEY FIX
+        if (account?.provider === "google" || account?.provider === "github") {
+          token.userType = "user"; // ✅ assign role for OAuth users
+        } else {
+          token.userType = user.userType ?? "user";
+        }
+      }
+
+      // Apply client-side session.update(...) payload immediately.
+      // Only allow updating display name — never trust client-provided email.
+      if (trigger === "update" && session) {
+        if (typeof session.name === "string") {
+          token.name = session.name;
+        }
+      }
+
+      // 🔥 ALWAYS GET LATEST VALUE FROM DB
+      if (token.userType === "advisor" || token.userType === "admin") {
+        const admin = await prisma.admin.findUnique({
+          where: { id: token.id },
+        });
+
+        if (admin) {
+          token.mustChangePassword = admin.mustChangePassword;
+          token.name = admin.name;
+          token.email = admin.email;
         }
+      } else if (token.userType === "user" && token.id) {
+        const user = await prisma.user.findUnique({
+          where: { id: token.id },
+          select: { email: true },
+        });
+
+        if (user) {
+          token.email = user.email;
+        } else {
+          console.warn(`JWT: no user found for id=${token.id}; token may be stale`);
+        }
+      }
+
+      return token;
     },
 
-  debug: true,
+    async session({ session, token }) {
+      session.user.id = token.id;
+      session.user.userType = token.userType ?? "user";
+      session.user.name = token.name;
+      session.user.adminRole = token.adminRole;
+      session.user.mustChangePassword = token.mustChangePassword;
+      session.user.email = token.email; // ✅ IMPORTANT
+      return session;
+    },
+
+    async redirect({ url, baseUrl }) {
+      if (url.startsWith("/")) return baseUrl + url;
+      if (url.startsWith(baseUrl)) return url;
+      return baseUrl;
+    },
+  },
+
+  debug: process.env.NODE_ENV === "development",
 
   secret: process.env.NEXTAUTH_SECRET,
 };
diff --git a/app/api/user/profile/route.ts b/app/api/user/profile/route.ts
index 5862e7c..93cfba0 100644
--- a/app/api/user/profile/route.ts
+++ b/app/api/user/profile/route.ts
@@ -6,12 +6,12 @@ export async function GET(req: Request) {
   try {
     const session = await getServerSession(authOptions);
 
-    if (!session) {
+    if (!session || !session.user?.id) {
       return new Response("Unauthorized", { status: 401 });
     }
 
     const user = await prisma.user.findUnique({
-      where: { email: session.user?.email || undefined },
+      where: { id: session.user.id },
       select: {
         name: true,
         email: true,
@@ -39,30 +39,36 @@ export async function PATCH(request: Request) {
   try {
     const session = await getServerSession(authOptions);
 
-    if (!session) {
+    if (!session || !session.user?.id) {
       return new Response("Unauthorized", { status: 401 });
     }
 
     const body = await request.json();
 
     const user = await prisma.user.findUnique({
-      where: { email: session.user?.email || undefined },
+      where: { id: session.user.id },
     });
 
     if (!user) {
       return new Response("User not found", { status: 404 });
     }
 
-    await prisma.user.update({
-      where: { email: session.user?.email || undefined },
+    const updatedUser = await prisma.user.update({
+      where: { id: session.user.id },
       data: {
         name: body.name,
         phone: body.phone,
       },
+      select: {
+        name: true,
+        email: true,
+        phone: true,
+        createdAt: true,
+      },
     });
     return Response.json({
       success: true,
-      data: user,
+      data: updatedUser,
     });
   } catch (error) {
     return new Response("An error occurred while updating the profile", {
@@ -70,4 +76,3 @@ export async function PATCH(request: Request) {
     });
   }
 }
-
diff --git a/components/ChatBot.jsx b/components/ChatBot.jsx
index a3d51b8..b51407a 100644
--- a/components/ChatBot.jsx
+++ b/components/ChatBot.jsx
@@ -1,11 +1,17 @@
 "use client";
 
+import { Loader2, Send, X } from "lucide-react";
 import { useState, useRef, useEffect } from "react";
-import { FaRobot, FaTimes, FaPaperPlane } from "react-icons/fa";
 
 export default function ChatBot() {
   const [open, setOpen] = useState(false);
-  const [messages, setMessages] = useState([]);
+  const [messages, setMessages] = useState([
+    {
+      role: "assistant",
+      content:
+        "Hello! I'm the Sameera Auto Advisor. How can I help you find your perfect vehicle today?",
+    },
+  ]);
   const [input, setInput] = useState("");
   const [loading, setLoading] = useState(false);
 
@@ -16,51 +22,51 @@ export default function ChatBot() {
     messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
   }, [messages, loading]);
 
-    const handleSend = async (e) => {
-        e.preventDefault();
-        if (!input.trim() || loading) return;
-
-        const userMessage = {
-            role: "user",
-            content: input,
-        };
-
-        setMessages((prev) => [...prev, userMessage]);
-        setInput("");
-        setLoading(true);
-
-        try {
-            const res = await fetch("/api/Chatbot", {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                body: JSON.stringify({
-                    question: input,
-                }),
-            });
-
-            const data = await res.json();
-
-            const botMessage = {
-                role: "assistant",
-                content: data.answer || "No response from AI.",
-            };
-
-            setMessages((prev) => [...prev, botMessage]);
-        } catch (error) {
-             const errorMessage = {
-                 role: "assistant",
-                 content: "⚠️ AI server is currently unavailable.",
-             };
-
-             setMessages((prev) => [...prev, errorMessage]);
-            console.log(error);
-        }
-
-        setLoading(false);
+  const handleSend = async (e) => {
+    e.preventDefault();
+    if (!input.trim() || loading) return;
+
+    const userMessage = {
+      role: "user",
+      content: input,
     };
 
+    setMessages((prev) => [...prev, userMessage]);
+    setInput("");
+    setLoading(true);
+
+    try {
+      const res = await fetch("/api/Chatbot", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          question: input,
+        }),
+      });
+
+      const data = await res.json();
+
+      const botMessage = {
+        role: "assistant",
+        content: data.answer || "No response from AI.",
+      };
+
+      setMessages((prev) => [...prev, botMessage]);
+    } catch (error) {
+      const errorMessage = {
+        role: "assistant",
+        content: "⚠️ AI server is currently unavailable.",
+      };
+
+      setMessages((prev) => [...prev, errorMessage]);
+      console.log(error);
+    }
+
+    setLoading(false);
+  };
+
   return (
     <>
       {/* CHATBOT BUTTON */}
@@ -130,35 +136,56 @@ export default function ChatBot() {
 
       {/* CHAT WINDOW */}
       {open && (
-        <div className="fixed bottom-20 right-6 z-50 w-[360px] h-[600px] bg-white rounded-2xl shadow-2xl flex flex-col border">
+        <div className="fixed bottom-6 right-6 z-50 w-[400px] h-[600px] bg-card rounded-2xl shadow-2xl flex flex-col border border-cyan-400/20 backdrop-blur-sm animate-slide-in-up-1 overflow-hidden">
+          <div className="pointer-events-none absolute inset-0 bg-gradient-to-b from-purple-500/10 via-blue-500/5 to-cyan-500/10" />
           {/* HEADER */}
-          <div className="flex items-center justify-between p-4 border-b">
-            <div className="flex items-center gap-2 font-semibold text-black">
-              <FaRobot />
-              Smart Auto Hub AI Assistant
+          <div className="relative flex items-center justify-between px-6 py-4 border-b border-cyan-300/20 bg-gradient-to-r from-purple-500/15 via-blue-500/10 to-cyan-500/15">
+            <div className="flex items-center gap-3">
+              <div className="w-10 h-10 rounded-full bg-gradient-to-br from-purple-600 via-blue-600 to-cyan-600 text-white shadow-lg shadow-cyan-500/30 flex items-center justify-center">
+                <svg
+                  className="w-5 h-5"
+                  fill="none"
+                  stroke="currentColor"
+                  strokeWidth="2"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  viewBox="0 0 24 24"
+                >
+                  <path d="M12 3v3m0 12v3m9-9h-3M6 12H3m15.364-6.364l-2.121 2.121M8.757 15.243l-2.121 2.121m12.728 0l-2.121-2.121M8.757 8.757l-2.121-2.121" />
+                  <circle cx="12" cy="12" r="3" fill="currentColor" />
+                </svg>
+              </div>
+
+              <div>
+                <p className="font-semibold text-foreground text-sm">
+                  Sameera Auto Advisor
+                </p>
+                <p className="text-xs text-muted-foreground">
+                  Always here to help
+                </p>
+              </div>
             </div>
             <button
               onClick={() => setOpen(false)}
-              className="bg-black text-white p-2 rounded-full hover:opacity-90 transition"
+              className="p-2 hover:bg-muted rounded-lg transition-colors"
+              aria-label="Close chat"
             >
-              <FaTimes size={14} />
+              <X className="w-5 h-5 text-muted-foreground hover:text-foreground" />
             </button>
           </div>
 
           {/* MESSAGES */}
-          <div className="flex-1 overflow-y-auto p-4 space-y-3">
+          <div className="relative flex-1 overflow-y-auto p-4 space-y-4 bg-gradient-to-b from-background/70 via-background/60 to-background/80">
             {messages.map((msg, index) => (
               <div
                 key={index}
-                className={`flex ${
-                  msg.role === "user" ? "justify-end" : "justify-start"
-                }`}
+                className={`flex ${msg.role === "user" ? "justify-end" : "justify-start"} animate-fade-in-up`}
               >
                 <div
-                  className={`max-w-[80%] px-4 py-2 rounded-2xl text-sm ${
+                  className={`max-w-xs px-4 py-3 rounded-2xl text-sm leading-relaxed ${
                     msg.role === "user"
-                      ? "bg-black text-white rounded-br-none"
-                      : "bg-gray-100 text-gray-800 rounded-bl-none"
+                      ? "bg-gradient-to-r from-purple-600 via-blue-600 to-cyan-600 text-white rounded-br-none shadow-md shadow-cyan-500/30"
+                      : "bg-muted/90 text-foreground rounded-bl-none shadow-sm border border-cyan-400/20"
                   }`}
                 >
                   {msg.content}
@@ -166,13 +193,14 @@ export default function ChatBot() {
               </div>
             ))}
 
-            {/* LOADING (animated for 5s) */}
+            {/* LOADING INDICATOR */}
             {loading && (
               <div className="flex justify-start">
-                <div className="flex items-center gap-2 bg-gray-100 px-4 py-2 rounded-2xl text-sm">
-                  <span className="w-2 h-2 bg-gray-400 rounded-full animate-bounce [animation-delay:0ms]" />
-                  <span className="w-2 h-2 bg-gray-400 rounded-full animate-bounce [animation-delay:150ms]" />
-                  <span className="w-2 h-2 bg-gray-400 rounded-full animate-bounce [animation-delay:300ms]" />
+                <div className="flex items-center gap-2 bg-muted px-4 py-3 rounded-2xl rounded-bl-none">
+                  <Loader2 className="w-4 h-4 text-primary animate-spin" />
+                  <span className="text-xs text-muted-foreground">
+                    AI is thinking...
+                  </span>
                 </div>
               </div>
             )}
@@ -180,28 +208,35 @@ export default function ChatBot() {
             <div ref={messagesEndRef} />
           </div>
 
-          {/* INPUT */}
+          {/* INPUT AREA */}
           <form
             onSubmit={handleSend}
-            className="border-t p-3 flex items-center gap-2"
+            className="relative border-t border-cyan-300/20 p-4 bg-gradient-to-t from-card via-card/95 to-card/70 space-y-3"
           >
-
-            <input
-              type="text"
-              placeholder="Ask something..."
-              className="flex-1 border rounded-xl px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-black text-black"
-              value={input}
-              onChange={(e) => setInput(e.target.value)}
-            />
-
-            {/* SEND BUTTON */}
-            <button
-              type="submit"
-              disabled={loading}
-              className="bg-black text-white p-3 rounded-xl hover:opacity-90 transition disabled:opacity-50"
-            >
-              <FaPaperPlane size={14} />
-            </button>
+            <div className="flex items-center gap-2">
+              <input
+                type="text"
+                aria-label="Chat message input"
+                placeholder="Ask about vehicles, booking, or features..."
+                className="flex-1 bg-input/90 border border-cyan-300/30 rounded-xl px-4 py-3 text-sm text-foreground placeholder:text-muted-foreground focus:outline-none focus:border-cyan-400 focus:ring-2 focus:ring-cyan-400/30 transition-all"
+                value={input}
+                onChange={(e) => setInput(e.target.value)}
+                disabled={loading}
+              />
+
+              {/* SEND BUTTON */}
+              <button
+                type="submit"
+                disabled={loading || !input.trim()}
+                className="bg-gradient-to-r from-purple-600 via-blue-600 to-cyan-600 hover:brightness-110 disabled:opacity-60 text-white p-3 rounded-xl transition-all duration-200 flex items-center justify-center shadow-md shadow-cyan-500/20"
+                aria-label="Send message"
+              >
+                <Send className="w-4 h-4" />
+              </button>
+            </div>
+            <p className="text-xs text-muted-foreground text-center">
+              Powered by AI • Available 24/7
+            </p>
           </form>
         </div>
       )}
diff --git a/components/auth/login-form.tsx b/components/auth/login-form.tsx
deleted file mode 100644
index 2148445..0000000
--- a/components/auth/login-form.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { signIn } from "next-auth/react";
-import Link from "next/link";
-import { FcGoogle } from "react-icons/fc";
-import { FaEye, FaEyeSlash, FaGithub } from "react-icons/fa";
-
-export default function LoginForm() {
-    const [email, setEmail] = useState("");
-    const [password, setPassword] = useState("");
-    const [loading, setLoading] = useState(false);
-    const [error, setError] = useState("");
-    const [showPassword, setShowPassword] = useState(false);
-
-    const handleSubmit = async (e: React.FormEvent) => {
-        e.preventDefault();
-        setLoading(true);
-        setError("");
-
-        try {
-            await signIn("user-credentials", {
-                email,
-                password,
-                redirect: true,
-                callbackUrl: "/dashboard",
-            });
-        } catch (err) {
-            setError("Invalid email or password");
-        } finally {
-            setLoading(false);
-        }
-    };
-
-    return (
-        <>
-            <h1 className="text-3xl font-bold text-center mb-2 dark:text-black">Welcome Back</h1>
-            <p className="text-center text-gray-500 mb-6 dark:text-black">
-                Enter your credentials to continue
-            </p>
-
-            <form className="space-y-4" onSubmit={handleSubmit}>
-                <div>
-                    <label className="text-sm font-medium dark:text-black">Email</label>
-                    <input
-                        type="email"
-                        className="w-full h-11 rounded-lg border px-3 dark:text-black"
-                        placeholder="name@example.com"
-                        value={email}
-                        onChange={(e) => setEmail(e.target.value)}
-                        required
-                    />
-                </div>
-
-                <div>
-                    <div className="flex justify-between items-center">
-                        <label className="text-sm font-medium dark:text-black">Password</label>
-                        <Link
-                            href="#"
-                            className="text-xs text-primary hover:underline dark:text-black"
-                            onClick={(e) => e.preventDefault()}
-                        >
-                            Forgot password?
-                        </Link>
-                    </div>
-
-                    <div className="relative">
-                        <input
-                            type={showPassword ? "text" : "password"}
-                            className="w-full h-11 rounded-lg border px-3 pr-10 dark:text-black"
-                            placeholder="Enter your password"
-                            value={password}
-                            onChange={(e) => setPassword(e.target.value)}
-                            required
-                        />
-                        <button
-                            type="button"
-                            className="absolute right-3 top-1/2 -translate-y-1/2"
-                            onClick={() => setShowPassword(!showPassword)}
-                        >
-                            {showPassword ? <FaEyeSlash /> : <FaEye />}
-                        </button>
-                    </div>
-                </div>
-
-                {error && (
-                    <p className="text-sm text-red-500 text-center">{error}</p>
-                )}
-
-                <button
-                    disabled={loading}
-                    className="w-full h-11 rounded-lg bg-black text-white hover:bg-gray-800 transition"
-                >
-                    {loading ? "Logging in..." : "Login"}
-                </button>
-            </form>
-
-            <div className="relative my-6">
-                <div className="absolute inset-0 flex items-center">
-                    <span className="w-full border-t" />
-                </div>
-                <div className="relative flex justify-center text-xs uppercase">
-                    <span className="bg-white px-2 text-gray-500 dark:text-black">
-                        Or continue with
-                    </span>
-                </div>
-            </div>
-
-            <div className="grid grid-cols-1 gap-3">
-                <button
-                    onClick={() => signIn("google")}
-                    className="flex items-center justify-center gap-2 h-10 border rounded-lg hover:bg-gray-100 dark:text-black"
-                >
-                    <FcGoogle size={20} />
-                    Google
-                </button>
-            </div>
-
-            <p className="mt-6 text-center text-sm text-gray-600">
-                Don&apos;t have an account?{" "}
-                <Link href="/register" className="font-semibold text-primary">
-                    Register
-                </Link>
-            </p>
-
-            <p className="mt-6 text-center text-sm text-gray-600">
-                If you are an admin or an advisor
-                <Link href="/admin/login" className="font-semibold text-primary">
-                    Go to admin Portal Login
-                </Link>
-            </p>
-        </>
-    );
-}
diff --git a/components/auth/register-form.tsx b/components/auth/register-form.tsx
deleted file mode 100644
index f5408f6..0000000
--- a/components/auth/register-form.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { useRouter } from "next/navigation";
-import { FcGoogle } from "react-icons/fc";
-
-export default function RegisterForm() {
-    const router = useRouter();
-
-    const [username, setUsername] = useState("");
-    const [email, setEmail] = useState("");
-    const [countryCode, setCountryCode] = useState("+94");
-    const [phone, setPhone] = useState("");
-    const [password, setPassword] = useState("");
-    const [loading, setLoading] = useState(false);
-    const [err, setErr] = useState("");
-
-    const handleRegister = async (e: any) => {
-        e.preventDefault();
-        setLoading(true);
-        setErr("");
-
-        const res = await fetch("/api/auth/register", {
-            method: "POST",
-            body: JSON.stringify({
-                email,
-                username,
-                password,
-                phone: `${countryCode}${phone}`,
-            }),
-        });
-
-        setLoading(false);
-
-        if (!res.ok) {
-            setErr("Account already exists");
-            return;
-        }
-
-        router.push("/login");
-    };
-
-    const loginWithGoogle = () => {
-        window.location.href = "/api/auth/google";
-    };
-
-    return (
-        <>
-            <h1 className="text-3xl font-bold text-center dark:text-black">Create Account</h1>
-            <button
-                onClick={loginWithGoogle}
-                className="w-full flex items-center justify-center gap-3 border py-3 rounded-xl hover:bg-gray-600 dark:text-black transition font-medium"
-            >
-                <FcGoogle size={22} />
-                Continue with Google
-            </button>
-
-            <div className="flex items-center gap-4">
-                <div className="flex-1 h-px bg-gray-300" />
-                <span className="text-gray-400 text-sm dark:text-black">OR</span>
-                <div className="flex-1 h-px bg-gray-300" />
-            </div>
-
-            <form className="space-y-4" onSubmit={handleRegister}>
-                <div>
-                    <label className="font-medium dark:text-black">Username</label>
-                    <input
-                        type="text"
-                        placeholder="johndoe123"
-                        className="w-full border rounded-xl px-4 py-2.5 mt-1 dark:text-black"
-                        onChange={(e) => setUsername(e.target.value)}
-                        required
-                    />
-                </div>
-
-                <div>
-                    <label className="font-medium dark:text-black">Email</label>
-                    <input
-                        type="email"
-                        placeholder="example@gmail.com"
-                        className="w-full border rounded-xl px-4 py-2.5 mt-1 dark:text-black"
-                        onChange={(e) => setEmail(e.target.value)}
-                        required
-                    />
-                </div>
-
-                <div>
-                    <label className="font-medium dark:text-black">Phone Number</label>
-                    <div className="flex gap-2 mt-1">
-                        <select
-                            value={countryCode}
-                            onChange={(e) => setCountryCode(e.target.value)}
-                            className="border rounded-xl px-2 py-2 dark:text-black"
-                        >
-                            <option value="+94"> +94</option>
-                            <option value="+91"> +91</option>
-                            <option value="+1">+1</option>
-                            <option value="+44"> +44</option>
-                            <option value="+61"> +61</option>
-                        </select>
-
-                        <input
-                            type="number"
-                            placeholder="7xxxxxxx"
-                            className="border rounded-xl px-4 py-2 dark:text-black"
-                            onChange={(e) => setPhone(e.target.value)}
-                            required
-                        />
-                    </div>
-                </div>
-
-                <div>
-                    <label className="font-medium dark:text-black">Password</label>
-                    <input
-                        type="password"
-                        placeholder="Minimum 6 characters"
-                        className="w-full border rounded-xl px-4 py-2.5 mt-1 dark:text-black"
-                        onChange={(e) => setPassword(e.target.value)}
-                        required
-                    />
-                </div>
-
-                {err && (
-                    <p className="text-red-500 text-center text-sm dark:text-black">{err}</p>
-                )}
-
-                <button
-                    type="submit"
-                    disabled={loading}
-                    className="w-full bg-black text-white py-2.5 rounded-xl hover:bg-gray-900 transition font-semibold shadow"
-                >
-                    {loading ? "Creating..." : "Register"}
-                </button>
-            </form>
-
-            <p className="text-center text-gray-500 text-sm pt-2">
-                Already have an account?
-                <span
-                    onClick={() => router.push("/login")}
-                    className="text-blue-600 cursor-pointer font-medium pl-1 hover:underline"
-                >
-                    Login
-                </span>
-            </p>
-        </>
-    );
-}
diff --git a/components/contact/FeedbackPopup.tsx b/components/contact/FeedbackPopup.tsx
index 1788d48..df85cb1 100644
--- a/components/contact/FeedbackPopup.tsx
+++ b/components/contact/FeedbackPopup.tsx
@@ -7,8 +7,8 @@ import {
   DialogContent,
   DialogDescription,
   DialogHeader,
+  DialogTitle,
 } from "../ui/dialog";
-import { DialogTitle } from "@radix-ui/react-dialog";
 import { Button } from "../ui/button";
 import { useRouter } from "next/navigation";
 
@@ -53,53 +53,58 @@ export default function FeedbackPopup() {
         <div className="bg-linear-to-br from-primary/15 via-background to-background p-6 sm:p-8">
           <DialogHeader className="space-y-3 text-left">
             <DialogTitle className="max-w-xl text-2xl font-bold tracking-tight text-foreground sm:text-3xl">
-              <h2>Contact Sameera Auto Traders Today !</h2>
+              Contact Sameera Auto Traders Today!
             </DialogTitle>
             <DialogDescription className="max-w-xl text-base leading-7 text-muted-foreground">
-              <h3 className="text-lg font-semibold text-muted-foreground mb-4">
-                Looking for your dream car or need more information about our
-                vehicles?
-              </h3>
-              <p className="text-sm font-semibold text-foreground">
-                Our team is ready to help you with car inquiries, vehicle
-                availability, pricing, and consultation services.
-              </p>
-
-              <ul className="mt-3 space-y-3 text-sm text-muted-foreground">
-                <li className="flex items-start gap-3">
-                  <span className="mt-0.5 inline-flex size-5 items-center justify-center rounded-full bg-primary/15 text-xs font-bold text-primary">
-                    📞
-                  </span>{" "}
-                  Friendly customer support
-                </li>
-                <li className="flex items-start gap-3">
-                  <span className="mt-0.5 inline-flex size-5 items-center justify-center rounded-full bg-primary/15 text-xs font-bold text-primary">
-                    🚗
-                  </span>{" "}
-                  Expert advice on buying vehicles
-                </li>
-                <li className="flex items-start gap-3">
-                  <span className="mt-0.5 inline-flex size-5 items-center justify-center rounded-full bg-primary/15 text-xs font-bold text-primary">
-                    🤝
-                  </span>{" "}
-                  Trusted car dealers
-                </li>
-                <li className="flex items-start gap-3">
-                  <span className="mt-0.5 inline-flex size-5 items-center justify-center rounded-full bg-primary/15 text-xs font-bold text-primary">
-                    💬
-                  </span>{" "}
-                  Quick responses to your questions
-                </li>
-              </ul>
-              <p className="p-2">
-                Reach out to us anytime and let us help you drive away with
-                confidence.
-              </p>
+              Looking for your dream car or need more information about our
+              vehicles?
             </DialogDescription>
           </DialogHeader>
+          <div className="mt-4">
+            <h3 className="text-lg font-semibold text-muted-foreground mb-4">
+              How we can help you
+            </h3>
+            <p className="text-sm font-semibold text-foreground">
+              Our team is ready to help you with car inquiries, vehicle
+              availability, pricing, and consultation services.
+            </p>
+
+            <ul className="mt-3 space-y-3 text-sm text-muted-foreground">
+              <li className="flex items-start gap-3">
+                <span className="mt-0.5 inline-flex size-5 items-center justify-center rounded-full bg-primary/15 text-xs font-bold text-primary">
+                  📞
+                </span>{" "}
+                Friendly customer support
+              </li>
+              <li className="flex items-start gap-3">
+                <span className="mt-0.5 inline-flex size-5 items-center justify-center rounded-full bg-primary/15 text-xs font-bold text-primary">
+                  🚗
+                </span>{" "}
+                Expert advice on buying vehicles
+              </li>
+              <li className="flex items-start gap-3">
+                <span className="mt-0.5 inline-flex size-5 items-center justify-center rounded-full bg-primary/15 text-xs font-bold text-primary">
+                  🤝
+                </span>{" "}
+                Trusted car dealers
+              </li>
+              <li className="flex items-start gap-3">
+                <span className="mt-0.5 inline-flex size-5 items-center justify-center rounded-full bg-primary/15 text-xs font-bold text-primary">
+                  💬
+                </span>{" "}
+                Quick responses to your questions
+              </li>
+            </ul>
+            <p className="p-2">
+              Reach out to us anytime and let us help you drive away with
+              confidence.
+            </p>
+          </div>
           <div className="mt-6 grid gap-4 sm:grid-cols-2">
             <DialogClose asChild>
-              <Button variant="outline" className="cursor-pointer">Close</Button>
+              <Button variant="outline" className="cursor-pointer">
+                Close
+              </Button>
             </DialogClose>
             <Button
               onClick={handleExploreCars}
diff --git a/components/dashboard/dashboard-client.tsx b/components/dashboard/dashboard-client.tsx
index f4fde04..5741078 100644
--- a/components/dashboard/dashboard-client.tsx
+++ b/components/dashboard/dashboard-client.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useState, useCallback } from "react";
 import Link from "next/link";
 import type { Session } from "next-auth";
-import { signOut } from "next-auth/react";
+import { signOut, useSession } from "next-auth/react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import {
@@ -31,6 +31,7 @@ import { localStorageAPI } from "@/lib/storage/localStorage";
 import { cancelBookings } from "@/app/APITriggers/cancelBookings.js";
 import { rescheduleBooking } from "@/app/APITriggers/rescheduleBooking.js";
 import { toast } from "sonner";
+import { Avatar, AvatarFallback, AvatarImage } from "../ui/avatar";
 
 type Appointment = {
   id: string | number;
@@ -40,6 +41,7 @@ type Appointment = {
   preferredTime?: string;
   branch?: string;
   vehicleType?: string;
+  adminMessage?: string;
   advisorMessage?: string;
   message?: string;
 };
@@ -87,6 +89,8 @@ export default function DashboardClient({
   initialUpcoming,
   initialHistory,
 }: DashboardClientProps) {
+  const { data: liveSession, update: updateSession } = useSession();
+  const displaySession = liveSession ?? session;
   const [activeTab, setActiveTab] = useState("appointments");
   const [isEditingProfile, setIsEditingProfile] = useState(false);
   const [upcomingAppointments, setUpcomingAppointments] = useState<
@@ -245,11 +249,16 @@ export default function DashboardClient({
     }
   };
 
-  const handleSaveProfileChanges = () => {
+  const handleSaveProfileChanges = async () => {
+    if (!userProfile) {
+      toast.error("Profile data is not loaded yet");
+      return;
+    }
+
     try {
       console.log("Saving profile changes:", userProfile);
 
-      const res = fetch("/api/user/profile", {
+      const res = await fetch("/api/user/profile", {
         method: "PATCH",
         headers: {
           "Content-Type": "application/json",
@@ -257,22 +266,24 @@ export default function DashboardClient({
         body: JSON.stringify(userProfile),
       });
 
-      const data = res.then((r) => r.json());
+      const data = await res.json();
 
-      data.then((d) => {
-        if (d.success) {
-          toast.success("Profile updated successfully");
-          fetchUserProfileDetails();
-          setUserProfile(d.data);
-        } else {
-          toast.error("Failed to update profile");
-        }
-      });
+      if (data.success) {
+        setUserProfile(data.data);
+
+        await updateSession({
+          name: data.data?.name,
+        });
+
+        toast.success("Profile updated successfully");
+        setIsEditingProfile(false);
+      } else {
+        toast.error(data.message || "Failed to update profile");
+      }
     } catch (error) {
       console.error("Error saving profile changes:", error);
       toast.error("An error occurred while saving profile changes");
     }
-    setIsEditingProfile(false);
   };
 
   return (
@@ -281,16 +292,26 @@ export default function DashboardClient({
         {/* User Welcome Section */}
         <div className="flex flex-col md:flex-row items-start md:items-center justify-between mb-8 gap-4 animate-slide-in-down">
           <div className="flex items-center gap-4">
-            <div className="h-16 w-16 rounded-full bg-primary flex items-center justify-center text-primary-foreground text-2xl font-bold">
+            {/* <div className="h-16 w-16 rounded-full bg-primary flex items-center justify-center text-primary-foreground text-2xl font-bold">
               {session?.user?.name
                 ?.split(" ")
                 .map((n) => n[0])
                 .join("")
                 .toUpperCase() || "U"}
-            </div>
+            </div> */}
+            <Avatar className="h-16 w-16">
+              <AvatarImage src={displaySession?.user?.image || undefined} />
+              <AvatarFallback>
+                {displaySession?.user?.name
+                  ?.split(" ")
+                  .map((n) => n[0])
+                  .join("")
+                  .toUpperCase() || "U"}
+              </AvatarFallback>
+            </Avatar>
             <div>
               <h1 className="text-3xl font-bold animate-text-reveal">
-                Welcome back, {session?.user?.name || "User"}!
+                Welcome back, {displaySession?.user?.name || "User"}!
               </h1>
 
               <p className="text-muted-foreground animate-text-reveal stagger-1">
@@ -496,9 +517,11 @@ export default function DashboardClient({
                                 disabled={apt.status !== "PENDING"}
                                 onClick={() => {
                                   setNewDate(
-                                    new Date(apt.preferredDate)
-                                      .toISOString()
-                                      .split("T")[0] || "",
+                                    apt.preferredDate
+                                      ? new Date(apt.preferredDate)
+                                          .toISOString()
+                                          .split("T")[0]
+                                      : "",
                                   );
                                   setNewTime(apt.preferredTime || "");
                                   setRescheduleApt(apt);
@@ -527,6 +550,7 @@ export default function DashboardClient({
                                     />
 
                                     <select
+                                      aria-label="Reschedule time slot"
                                       className="w-full border border-border rounded px-3 py-2 dark:bg-secondary/90 dark:border-secondary/50"
                                       value={newTime}
                                       onChange={(e) =>
@@ -852,13 +876,23 @@ export default function DashboardClient({
 
                 <div className="space-y-6">
                   <div className="flex items-center gap-4 mb-6">
-                    <div className="h-24 w-24 rounded-full bg-primary flex items-center justify-center text-primary-foreground text-3xl font-bold">
+                    {/* <div className="h-24 w-24 rounded-full bg-primary flex items-center justify-center text-primary-foreground text-3xl font-bold">
                       {session?.user?.name
                         ?.split(" ")
                         .map((n) => n[0])
                         .join("")
                         .toUpperCase() || "U"}
-                    </div>
+                    </div> */}
+                    <Avatar className="h-24 w-24">
+                      <AvatarImage src={displaySession?.user?.image || undefined} />
+                      <AvatarFallback>
+                        {displaySession?.user?.name
+                          ?.split(" ")
+                          .map((n) => n[0])
+                          .join("")
+                          .toUpperCase() || "U"}
+                      </AvatarFallback>
+                    </Avatar>
                     {isEditingProfile && (
                       <Button variant="outline" size="sm">
                         Change Photo
@@ -875,13 +909,11 @@ export default function DashboardClient({
                       <Input
                         type="text"
                         value={userProfile?.name || ""}
-                        onChange={(e) =>
-                          setUserProfile({
-                            ...userProfile,
-                            name: e.target.value,
-                          })
-                        }
-                        defaultValue="John Doe"
+                        onChange={(e) => {
+                          setUserProfile((prev) =>
+                            prev ? { ...prev, name: e.target.value } : prev,
+                          );
+                        }}
                         disabled={!isEditingProfile}
                       />
                     </div>
@@ -893,12 +925,11 @@ export default function DashboardClient({
                       <Input
                         type="email"
                         value={userProfile?.email || ""}
-                        onChange={(e) =>
-                          setUserProfile({
-                            ...userProfile,
-                            email: e.target.value,
-                          })
-                        }
+                        onChange={(e) => {
+                          setUserProfile((prev) =>
+                            prev ? { ...prev, email: e.target.value } : prev,
+                          );
+                        }}
                         disabled={true}
                       />
                     </div>
@@ -910,13 +941,16 @@ export default function DashboardClient({
                       <Input
                         type="tel"
                         value={userProfile?.phone || ""}
-                        onChange={(e) =>
-                          setUserProfile({
-                            ...userProfile,
-                            phone: e.target.value || undefined,
-                          })
-                        }
-                        defaultValue="+94 77 123 4567"
+                        onChange={(e) => {
+                          setUserProfile((prev) =>
+                            prev
+                              ? {
+                                  ...prev,
+                                  phone: e.target.value || undefined,
+                                }
+                              : prev,
+                          );
+                        }}
                         disabled={!isEditingProfile}
                       />
                     </div>
diff --git a/package-lock.json b/package-lock.json
index a723dc2..38f031f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2265,13 +2265,15 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "16.1.6",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-16.2.0.tgz",
+      "integrity": "sha512-OZIbODWWAi0epQRCRjNe1VO45LOFBzgiyqmTLzIqWq6u1wrxKnAyz1HH6tgY/Mc81YzIjRPoYsPAEr4QV4l9TA==",
       "license": "MIT"
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "16.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.6.tgz",
-      "integrity": "sha512-wTzYulosJr/6nFnqGW7FrG3jfUUlEf8UjGA0/pyypJl42ExdVgC6xJgcXQ+V8QFn6niSG2Pb8+MIG1mZr2vczw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.0.tgz",
+      "integrity": "sha512-/JZsqKzKt01IFoiLLAzlNqys7qk2F3JkcUhj50zuRhKDQkZNOz9E5N6wAQWprXdsvjRP4lTFj+/+36NSv5AwhQ==",
       "cpu": [
         "arm64"
       ],
@@ -2285,9 +2287,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "16.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.6.tgz",
-      "integrity": "sha512-BLFPYPDO+MNJsiDWbeVzqvYd4NyuRrEYVB5k2N3JfWncuHAy2IVwMAOlVQDFjj+krkWzhY2apvmekMkfQR0CUQ==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.0.tgz",
+      "integrity": "sha512-/hV8erWq4SNlVgglUiW5UmQ5Hwy5EW/AbbXlJCn6zkfKxTy/E/U3V8U1Ocm2YCTUoFgQdoMxRyRMOW5jYy4ygg==",
       "cpu": [
         "x64"
       ],
@@ -2301,9 +2303,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "16.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.6.tgz",
-      "integrity": "sha512-OJYkCd5pj/QloBvoEcJ2XiMnlJkRv9idWA/j0ugSuA34gMT6f5b7vOiCQHVRpvStoZUknhl6/UxOXL4OwtdaBw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.0.tgz",
+      "integrity": "sha512-GkjL/Q7MWOwqWR9zoxu1TIHzkOI2l2BHCf7FzeQG87zPgs+6WDh+oC9Sw9ARuuL/FUk6JNCgKRkA6rEQYadUaw==",
       "cpu": [
         "arm64"
       ],
@@ -2317,9 +2319,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "16.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.6.tgz",
-      "integrity": "sha512-S4J2v+8tT3NIO9u2q+S0G5KdvNDjXfAv06OhfOzNDaBn5rw84DGXWndOEB7d5/x852A20sW1M56vhC/tRVbccQ==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.0.tgz",
+      "integrity": "sha512-1ffhC6KY5qWLg5miMlKJp3dZbXelEfjuXt1qcp5WzSCQy36CV3y+JT7OC1WSFKizGQCDOcQbfkH/IjZP3cdRNA==",
       "cpu": [
         "arm64"
       ],
@@ -2333,9 +2335,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "16.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.1.6.tgz",
-      "integrity": "sha512-2eEBDkFlMMNQnkTyPBhQOAyn2qMxyG2eE7GPH2WIDGEpEILcBPI/jdSv4t6xupSP+ot/jkfrCShLAa7+ZUPcJQ==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.2.0.tgz",
+      "integrity": "sha512-FmbDcZQ8yJRq93EJSL6xaE0KK/Rslraf8fj1uViGxg7K4CKBCRYSubILJPEhjSgZurpcPQq12QNOJQ0DRJl6Hg==",
       "cpu": [
         "x64"
       ],
@@ -2349,9 +2351,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "16.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.1.6.tgz",
-      "integrity": "sha512-oicJwRlyOoZXVlxmIMaTq7f8pN9QNbdes0q2FXfRsPhfCi8n8JmOZJm5oo1pwDaFbnnD421rVU409M3evFbIqg==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.2.0.tgz",
+      "integrity": "sha512-HzjIHVkmGAwRbh/vzvoBWWEbb8BBZPxBvVbDQDvzHSf3D8RP/4vjw7MNLDXFF9Q1WEzeQyEj2zdxBtVAHu5Oyw==",
       "cpu": [
         "x64"
       ],
@@ -2365,9 +2367,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "16.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.6.tgz",
-      "integrity": "sha512-gQmm8izDTPgs+DCWH22kcDmuUp7NyiJgEl18bcr8irXA5N2m2O+JQIr6f3ct42GOs9c0h8QF3L5SzIxcYAAXXw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.0.tgz",
+      "integrity": "sha512-UMiFNQf5H7+1ZsZPxEsA064WEuFbRNq/kEXyepbCnSErp4f5iut75dBA8UeerFIG3vDaQNOfCpevnERPp2V+nA==",
       "cpu": [
         "arm64"
       ],
@@ -2381,7 +2383,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "16.1.6",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.0.tgz",
+      "integrity": "sha512-DRrNJKW+/eimrZgdhVN1uvkN1OI4j6Lpefwr44jKQ0YQzztlmOBUUzHuV5GxOMPK3nmodAYElUVCY8ZXo/IWeA==",
       "cpu": [
         "x64"
       ],
@@ -4073,25 +4077,6 @@
         "tailwindcss": "4.2.1"
       }
     },
-    "node_modules/@testing-library/dom": {
-      "version": "10.4.1",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^5.0.1",
-        "aria-query": "5.3.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.5.0",
-        "picocolors": "1.1.1",
-        "pretty-format": "^27.0.2"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@testing-library/jest-dom": {
       "version": "6.9.1",
       "dev": true,
@@ -4182,12 +4167,6 @@
         "tslib": "^2.4.0"
       }
     },
-    "node_modules/@types/aria-query": {
-      "version": "5.0.4",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
       "dev": true,
@@ -4330,7 +4309,7 @@
     },
     "node_modules/@types/react": {
       "version": "19.2.14",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "csstype": "^3.2.2"
@@ -4338,7 +4317,7 @@
     },
     "node_modules/@types/react-dom": {
       "version": "19.2.3",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "^19.2.0"
@@ -5729,12 +5708,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/dom-accessibility-api": {
-      "version": "0.5.16",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/dom-helpers": {
       "version": "5.2.1",
       "license": "MIT",
@@ -5803,11 +5776,6 @@
       "version": "1.5.313",
       "license": "ISC"
     },
-    "node_modules/embla-carousel": {
-      "version": "8.6.0",
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/embla-carousel-autoplay": {
       "version": "8.6.0",
       "license": "MIT",
@@ -8034,15 +8002,6 @@
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc"
       }
     },
-    "node_modules/lz-string": {
-      "version": "1.5.0",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "bin": {
-        "lz-string": "bin/bin.js"
-      }
-    },
     "node_modules/magic-string": {
       "version": "0.30.21",
       "dev": true,
@@ -8198,12 +8157,14 @@
       }
     },
     "node_modules/next": {
-      "version": "16.1.6",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/next/-/next-16.2.0.tgz",
+      "integrity": "sha512-NLBVrJy1pbV1Yn00L5sU4vFyAHt5XuSjzrNyFnxo6Com0M0KrL6hHM5B99dbqXb2bE9pm4Ow3Zl1xp6HVY9edQ==",
       "license": "MIT",
       "dependencies": {
-        "@next/env": "16.1.6",
+        "@next/env": "16.2.0",
         "@swc/helpers": "0.5.15",
-        "baseline-browser-mapping": "^2.8.3",
+        "baseline-browser-mapping": "^2.9.19",
         "caniuse-lite": "^1.0.30001579",
         "postcss": "8.4.31",
         "styled-jsx": "5.1.6"
@@ -8215,15 +8176,15 @@
         "node": ">=20.9.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "16.1.6",
-        "@next/swc-darwin-x64": "16.1.6",
-        "@next/swc-linux-arm64-gnu": "16.1.6",
-        "@next/swc-linux-arm64-musl": "16.1.6",
-        "@next/swc-linux-x64-gnu": "16.1.6",
-        "@next/swc-linux-x64-musl": "16.1.6",
-        "@next/swc-win32-arm64-msvc": "16.1.6",
-        "@next/swc-win32-x64-msvc": "16.1.6",
-        "sharp": "^0.34.4"
+        "@next/swc-darwin-arm64": "16.2.0",
+        "@next/swc-darwin-x64": "16.2.0",
+        "@next/swc-linux-arm64-gnu": "16.2.0",
+        "@next/swc-linux-arm64-musl": "16.2.0",
+        "@next/swc-linux-x64-gnu": "16.2.0",
+        "@next/swc-linux-x64-musl": "16.2.0",
+        "@next/swc-win32-arm64-msvc": "16.2.0",
+        "@next/swc-win32-x64-msvc": "16.2.0",
+        "sharp": "^0.34.5"
       },
       "peerDependencies": {
         "@opentelemetry/api": "^1.1.0",
@@ -8776,6 +8737,7 @@
     },
     "node_modules/postcss": {
       "version": "8.5.8",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -8806,6 +8768,7 @@
     },
     "node_modules/postcss/node_modules/nanoid": {
       "version": "3.3.11",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -8877,32 +8840,6 @@
       "version": "3.8.0",
       "license": "MIT"
     },
-    "node_modules/pretty-format": {
-      "version": "27.5.1",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/prisma": {
       "version": "6.19.2",
       "hasInstallScript": true,
@@ -9031,12 +8968,6 @@
         "react": "*"
       }
     },
-    "node_modules/react-is": {
-      "version": "17.0.2",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/react-remove-scroll": {
       "version": "2.7.2",
       "license": "MIT",
@@ -9680,6 +9611,7 @@
     },
     "node_modules/tailwindcss": {
       "version": "4.2.1",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/tailwindcss-animate": {
@@ -9959,7 +9891,7 @@
     },
     "node_modules/typescript": {
       "version": "5.9.3",
-      "devOptional": true,
+      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",