diff --git a/Frontend/PROGRESS.md b/Frontend/PROGRESS.md
index b408e04..cbf7fca 100644
--- a/Frontend/PROGRESS.md
+++ b/Frontend/PROGRESS.md
@@ -12,7 +12,10 @@ Convention: `docs/01-DOC-GUIDE.md §6`. Update this file in the **same commit**
 - [ ] `ProblemDetails` normalizer + `code → message` map (`lib/`)
 
 ## 1. Auth
-- [ ] Login screen → `POST /auth/login`; store token; attach to client
+- [~] Login screen — UI built (`app/login`); not yet wired to `POST /auth/login` / token storage
+- [~] Forgot password — add email screen — UI built (`app/login/forgot`); not yet wired to API
+- [~] Forgot password — verify OTP screen — UI built (`app/login/forgot/otp`); not yet wired to API
+- [~] Forgot password — change password screen — UI built (`app/login/forgot/reset`); not yet wired to API
 
 ## 2. Master Data screens
 - [ ] Items (list + create/edit, ETag handling)
diff --git a/Frontend/erp-system/app/dashboard/layout.tsx b/Frontend/erp-system/app/dashboard/layout.tsx
index 19cae9e..3072700 100644
--- a/Frontend/erp-system/app/dashboard/layout.tsx
+++ b/Frontend/erp-system/app/dashboard/layout.tsx
@@ -1,5 +1,4 @@
 import { AppSidebar } from "@/components/Layouts/AppSidebar"
-import { Footer } from "@/components/Layouts/Footer"
 import { Header } from "@/components/Layouts/Header"
 import { Toaster } from "@/components/ui/toast"
 
@@ -9,20 +8,19 @@ export default function DashboardLayout({
   children: React.ReactNode
 }) {
   return (
-    <div className="flex min-h-screen bg-background">
+    <div className="flex h-screen overflow-hidden bg-background">
       <AppSidebar />
       <main className="flex flex-1 flex-col">
         <Header />
         <div className="flex-1 overflow-auto">
           <div className="p-6 lg:p-8">
-            <div className="rounded-xl bg-card border border-border shadow-sm">
+            <div className="rounded-xl bg-card border border-gray-200 shadow-sm">
               <div className="p-6">
                 {children}
               </div>
             </div>
           </div>
         </div>
-        <Footer className="border-t border-border mt-auto" />
       </main>
       <Toaster />
     </div>
diff --git a/Frontend/erp-system/app/dashboard/page.tsx b/Frontend/erp-system/app/dashboard/page.tsx
index 35b865c..45b9480 100644
--- a/Frontend/erp-system/app/dashboard/page.tsx
+++ b/Frontend/erp-system/app/dashboard/page.tsx
@@ -43,7 +43,7 @@ export default function DashboardPage() {
   const [range, setRange] = React.useState<{ from: Date | undefined; to?: Date | undefined }>()
   return (
     <div className="flex flex-col gap-6">
-      <div className="flex flex-col gap-5 rounded-xl bg-card p-6 shadow-sm border border-border">
+      <div className="flex flex-col gap-5 rounded-xl bg-card p-6 shadow-sm border border-gray-200">
         <div>
           <p className="mb-2 text-sm font-semibold text-muted-foreground">Breadcrumb</p>
           <div className="flex flex-col gap-3">
@@ -232,7 +232,7 @@ export default function DashboardPage() {
         </div>
       </div>
 
-      <div className="flex flex-col gap-5 rounded-xl bg-card p-6 shadow-sm border border-border">
+      <div className="flex flex-col gap-5 rounded-xl bg-card p-6 shadow-sm border border-gray-200">
         <div>
           <p className="mb-2 text-sm font-semibold text-muted-foreground">Alert Dialogs</p>
           <div className="flex flex-wrap gap-2">
@@ -294,7 +294,7 @@ export default function DashboardPage() {
       <RecentOrdersTable />
 
       <div className="mt-6 grid grid-cols-1 gap-4 lg:grid-cols-3">
-        <div className="rounded-xl bg-card p-6 shadow-sm border border-border">
+        <div className="rounded-xl bg-card p-6 shadow-sm border border-gray-200">
           <h3 className="mb-4 text-sm font-semibold text-foreground">Sales (Line)</h3>
           <div className="h-56">
             <LineChart
@@ -304,7 +304,7 @@ export default function DashboardPage() {
           </div>
         </div>
 
-        <div className="rounded-xl bg-card p-6 shadow-sm border border-border">
+        <div className="rounded-xl bg-card p-6 shadow-sm border border-gray-200">
           <h3 className="mb-4 text-sm font-semibold text-foreground">Revenue (Bar)</h3>
           <div className="h-56">
             <BarChart
@@ -314,7 +314,7 @@ export default function DashboardPage() {
           </div>
         </div>
 
-        <div className="rounded-xl bg-card p-6 shadow-sm border border-border">
+        <div className="rounded-xl bg-card p-6 shadow-sm border border-gray-200">
           <h3 className="mb-4 text-sm font-semibold text-foreground">Product Mix (Pie)</h3>
           <div className="h-56">
             <PieChart labels={["A","B","C"]} data={[45, 30, 25]} />
diff --git a/Frontend/erp-system/app/login/forgot/otp/page.tsx b/Frontend/erp-system/app/login/forgot/otp/page.tsx
index bb97e94..05c8cde 100644
--- a/Frontend/erp-system/app/login/forgot/otp/page.tsx
+++ b/Frontend/erp-system/app/login/forgot/otp/page.tsx
@@ -25,10 +25,10 @@ export default function ForgotOtpPage() {
 
   return (
     <div className="min-h-screen flex items-center justify-center bg-gradient-to-br from-background to-background/95 p-4">
-      <div className="w-full max-w-md rounded-xl bg-card p-8 shadow-lg border border-border">
+      <div className="w-full max-w-2xl rounded-xl bg-card p-8 shadow-lg border border-gray-200">
         <div className="flex flex-col items-center mb-8">
-          <div className="bg-primary/10 rounded-full p-4 mb-4">
-            <Mail className="text-primary size-6" />
+          <div className="bg-black/10 rounded-full p-4 mb-4">
+            <Mail className="text-black size-6" />
           </div>
           <h1 className="text-2xl font-bold text-foreground text-center">Verify your email</h1>
         </div>
@@ -46,7 +46,7 @@ export default function ForgotOtpPage() {
                   e.preventDefault()
                   handleResend()
                 }}
-                className="text-sm font-medium text-primary hover:text-primary/80 transition-colors"
+                className="text-sm font-medium text-black hover:text-black/80 transition-colors"
               >
                 Didn't receive the code? Resend
               </button>
@@ -57,10 +57,10 @@ export default function ForgotOtpPage() {
 
           <div className="flex gap-3">
             <Link href="/login" className="flex-1">
-              <Button variant="outline" className="w-full">Back</Button>
+              <Button variant="outline" className="w-full h-12 rounded-full border-gray-300 text-black hover:bg-black/5">Back</Button>
             </Link>
             <Link href="/login/forgot/reset" className="flex-1">
-              <Button className="w-full">Verify</Button>
+              <Button className="w-full h-12 rounded-full bg-black text-white hover:bg-black/90">Verify</Button>
             </Link>
           </div>
         </div>
diff --git a/Frontend/erp-system/app/login/forgot/page.tsx b/Frontend/erp-system/app/login/forgot/page.tsx
index 0f04115..1b02ea7 100644
--- a/Frontend/erp-system/app/login/forgot/page.tsx
+++ b/Frontend/erp-system/app/login/forgot/page.tsx
@@ -19,8 +19,8 @@ export default function ForgotEmailPage() {
 
   return (
     <div className="min-h-screen flex items-center justify-center bg-gradient-to-br from-background to-background/95 px-4 py-8">
-      <div className="w-full max-w-md rounded-xl bg-card p-8 shadow-lg border border-border">
-        <div className="mb-8">
+      <div className="w-full max-w-2xl rounded-xl bg-card p-8 pl-10 shadow-lg border border-gray-200">
+        <div className="mb-8 text-center">
           <h1 className="text-2xl font-bold text-foreground">Reset your password</h1>
           <p className="mt-2 text-sm text-muted-foreground">Enter the email address associated with your account and we'll send you a one-time code to verify your identity.</p>
         </div>
@@ -41,7 +41,7 @@ export default function ForgotEmailPage() {
           </div>
 
           <Button
-            className="w-full h-11 text-base font-medium"
+            className="w-full h-12 text-base font-medium rounded-full bg-black text-white hover:bg-black/90"
             disabled={emailError !== ""}
             onClick={() => {
               if (email.length === 0) {
@@ -53,16 +53,6 @@ export default function ForgotEmailPage() {
           >
             Send verification code
           </Button>
-
-          <div className="text-center">
-            <button
-              type="button"
-              onClick={() => router.push('/login')}
-              className="text-sm font-medium text-primary hover:text-primary/80 transition-colors"
-            >
-              Back to sign in
-            </button>
-          </div>
         </div>
       </div>
     </div>
diff --git a/Frontend/erp-system/app/login/forgot/reset/page.tsx b/Frontend/erp-system/app/login/forgot/reset/page.tsx
index 1e17948..d784d27 100644
--- a/Frontend/erp-system/app/login/forgot/reset/page.tsx
+++ b/Frontend/erp-system/app/login/forgot/reset/page.tsx
@@ -39,8 +39,8 @@ export default function ForgotResetPage() {
 
   return (
     <div className="min-h-screen flex items-center justify-center bg-gradient-to-br from-background to-background/95 p-4">
-      <div className="w-full max-w-md rounded-xl bg-card p-8 shadow-lg border border-border">
-        <div className="mb-8">
+      <div className="w-full max-w-xl rounded-xl bg-card p-8 shadow-lg border border-gray-200">
+        <div className="mb-8 text-center">
           <h1 className="text-2xl font-bold text-foreground">Create a new password</h1>
           <p className="mt-2 text-sm text-muted-foreground">Choose a strong password to secure your account.</p>
         </div>
@@ -55,7 +55,7 @@ export default function ForgotResetPage() {
                 value={password}
                 onChange={(e) => setPassword((e.target as HTMLInputElement).value)}
                 className="h-11 pr-11"
-                placeholder="••••••••"
+                placeholder="Enter your new password"
               />
               <button
                 type="button"
@@ -76,7 +76,7 @@ export default function ForgotResetPage() {
                 value={confirm}
                 onChange={(e) => setConfirm((e.target as HTMLInputElement).value)}
                 className="h-11 pr-11"
-                placeholder="••••••••"
+                placeholder="Confirm your new password"
               />
               <button
                 type="button"
@@ -104,14 +104,14 @@ export default function ForgotResetPage() {
             <Button
               variant="outline"
               onClick={() => router.back()}
-              className="flex-1 h-11"
+              className="flex-1 h-12 rounded-full border-gray-300 text-black hover:bg-black/5"
             >
               Back
             </Button>
             <Button
               disabled={!allValid}
               onClick={() => setShowSuccess(true)}
-              className="flex-1 h-11"
+              className="flex-1 h-12 rounded-full bg-black text-white hover:bg-black/90"
             >
               Change password
             </Button>
@@ -119,7 +119,7 @@ export default function ForgotResetPage() {
         </div>
 
         <Dialog open={showSuccess} onOpenChange={setShowSuccess}>
-          <DialogContent className="w-full max-w-sm">
+          <DialogContent className="w-full max-w-lg sm:max-w-lg">
             <DialogHeader className="text-center">
               <div className="flex flex-col items-center gap-4">
                 <div className="flex items-center justify-center w-12 h-12 rounded-full bg-success/10 text-success">
@@ -131,7 +131,7 @@ export default function ForgotResetPage() {
                 </div>
               </div>
             </DialogHeader>
-            <Button onClick={() => router.push('/login')} className="w-full mt-6">
+            <Button onClick={() => router.push('/login')} className="w-4/5 mx-auto h-12 mt-6 rounded-full bg-black text-white hover:bg-black/90">
               Return to sign in
             </Button>
           </DialogContent>
diff --git a/Frontend/erp-system/app/login/page.tsx b/Frontend/erp-system/app/login/page.tsx
index 5949830..59b6817 100644
--- a/Frontend/erp-system/app/login/page.tsx
+++ b/Frontend/erp-system/app/login/page.tsx
@@ -106,7 +106,7 @@ export default function LoginPage() {
                   type={showPassword ? "text" : "password"}
                   autoComplete="current-password"
                   className="h-11 rounded-lg px-4 pr-11 text-base"
-                  placeholder="••••••••"
+                  placeholder="Enter your password"
                   aria-invalid={!!form.formState.errors.password}
                   {...form.register("password")}
                 />
@@ -161,7 +161,7 @@ export default function LoginPage() {
 
         <Button
           type="button"
-          className="w-full h-11 text-base font-medium inline-flex items-center justify-center gap-3 bg-black text-white border-0 hover:opacity-90"
+          className="w-full h-11 text-base font-medium inline-flex items-center justify-center gap-3 rounded-full bg-transparent text-foreground border border-gray-300 hover:bg-black/5"
           onClick={() => {
             alert('Google OAuth flow placeholder')
           }}
@@ -173,7 +173,7 @@ export default function LoginPage() {
 
         <div className="mt-12 text-center">
           <p className="text-sm text-muted-foreground">
-            Don&apos;t have an account? <Link href="#" className="font-semibold text-primary hover:text-primary/80 transition-colors">Create an account</Link>
+            Don&apos;t have an account? <Link href="#" className="font-semibold text-black hover:text-black/80 transition-colors">Create an account</Link>
           </p>
         </div>
       </main>
diff --git a/Frontend/erp-system/components/Layouts/AppSidebar.tsx b/Frontend/erp-system/components/Layouts/AppSidebar.tsx
index 5bfe814..3d4666f 100644
--- a/Frontend/erp-system/components/Layouts/AppSidebar.tsx
+++ b/Frontend/erp-system/components/Layouts/AppSidebar.tsx
@@ -141,7 +141,7 @@ export function AppSidebar() {
   return (
     <>
       {/* ── Desktop sidebar ─────────────────────────────── */}
-      <div className="hidden lg:flex">
+      <div className="my-3 hidden lg:my-4 lg:flex">
         <SidebarContent
           collapsed={collapsed}
           onCollapse={() => setCollapsed((v) => !v)}
diff --git a/Frontend/erp-system/components/Layouts/Footer.tsx b/Frontend/erp-system/components/Layouts/Footer.tsx
index 2a21e1f..afa3849 100644
--- a/Frontend/erp-system/components/Layouts/Footer.tsx
+++ b/Frontend/erp-system/components/Layouts/Footer.tsx
@@ -6,11 +6,11 @@ export function Footer({ className }: { className?: string }) {
   return (
     <footer
       className={cn(
-        "w-full rounded-3xl bg-white shadow-sm ring-1 ring-black/5",
+        "mx-6 w-auto rounded-3xl bg-white shadow-sm ring-1 ring-black/5 lg:mx-8",
         className
       )}
     >
-      <div className="flex flex-col items-center gap-3 p-5">
+      <div className="flex flex-col items-center gap-1.5 p-3">
         {/* Logo + name */}
         <div className="flex items-center gap-2">
           <div className="flex size-7 items-center justify-center rounded-lg bg-indigo-600">
diff --git a/Frontend/erp-system/components/Layouts/Header.tsx b/Frontend/erp-system/components/Layouts/Header.tsx
index 296c586..bed8980 100644
--- a/Frontend/erp-system/components/Layouts/Header.tsx
+++ b/Frontend/erp-system/components/Layouts/Header.tsx
@@ -73,7 +73,7 @@ export function Header() {
     setNotifications((prev) => prev.map((n) => ({ ...n, unread: false })))
 
   return (
-    <header className="mb-6 flex items-center justify-between gap-2 rounded-3xl bg-white py-4 pr-4 pl-14 shadow-sm ring-1 ring-black/5 lg:gap-4 lg:p-4">
+    <header className="mx-6 mt-3 mb-6 flex items-center justify-between gap-2 rounded-3xl bg-white py-4 pr-4 pl-14 shadow-sm ring-1 ring-black/5 lg:mx-8 lg:mt-4 lg:gap-4 lg:p-4">
       <div className="flex items-center gap-3">
         {showBackButton && (
           <button
diff --git a/Frontend/erp-system/components/ui/avatar.tsx b/Frontend/erp-system/components/ui/avatar.tsx
index e4fed86..1cc0e44 100644
--- a/Frontend/erp-system/components/ui/avatar.tsx
+++ b/Frontend/erp-system/components/ui/avatar.tsx
@@ -17,7 +17,7 @@ function Avatar({
       data-slot="avatar"
       data-size={size}
       className={cn(
-        "group/avatar relative flex size-8 shrink-0 rounded-full select-none after:absolute after:inset-0 after:rounded-full after:border after:border-border after:mix-blend-darken data-[size=lg]:size-10 data-[size=sm]:size-6 dark:after:mix-blend-lighten",
+        "group/avatar relative flex size-8 shrink-0 rounded-full select-none after:absolute after:inset-0 after:rounded-full after:border after:border-gray-200 after:mix-blend-darken data-[size=lg]:size-10 data-[size=sm]:size-6 dark:after:mix-blend-lighten",
         className
       )}
       {...props}
diff --git a/Frontend/erp-system/components/ui/badge.tsx b/Frontend/erp-system/components/ui/badge.tsx
index b20959d..292b203 100644
--- a/Frontend/erp-system/components/ui/badge.tsx
+++ b/Frontend/erp-system/components/ui/badge.tsx
@@ -15,7 +15,7 @@ const badgeVariants = cva(
         destructive:
           "bg-destructive/10 text-destructive focus-visible:ring-destructive/20 dark:bg-destructive/20 dark:focus-visible:ring-destructive/40 [a]:hover:bg-destructive/20",
         outline:
-          "border-border text-foreground [a]:hover:bg-muted [a]:hover:text-muted-foreground",
+          "border-gray-200 text-foreground [a]:hover:bg-muted [a]:hover:text-muted-foreground",
         ghost:
           "hover:bg-muted hover:text-muted-foreground dark:hover:bg-muted/50",
         link: "text-primary underline-offset-4 hover:underline",
diff --git a/Frontend/erp-system/components/ui/button.tsx b/Frontend/erp-system/components/ui/button.tsx
index 9b69baf..63da813 100644
--- a/Frontend/erp-system/components/ui/button.tsx
+++ b/Frontend/erp-system/components/ui/button.tsx
@@ -4,13 +4,13 @@ import { cva, type VariantProps } from "class-variance-authority"
 import { cn } from "@/lib/utils"
 
 const buttonVariants = cva(
-  "group/button inline-flex shrink-0 items-center justify-center rounded-lg border border-transparent bg-clip-padding text-sm font-medium whitespace-nowrap transition-all outline-none select-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 active:not-aria-[haspopup]:translate-y-px disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-2 aria-invalid:ring-destructive/40 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/60 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 shadow-sm hover:shadow-md",
+  "group/button inline-flex shrink-0 items-center justify-center rounded-full border border-transparent bg-clip-padding text-sm font-medium whitespace-nowrap transition-all outline-none select-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 active:not-aria-[haspopup]:translate-y-px disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-2 aria-invalid:ring-destructive/40 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/60 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 shadow-sm hover:shadow-md",
   {
     variants: {
       variant: {
-        default: "bg-primary text-primary-foreground hover:bg-primary/90 active:bg-primary",
+        default: "bg-black text-white hover:bg-black/90 active:bg-black",
         outline:
-          "border-border bg-background hover:bg-muted hover:text-foreground aria-expanded:bg-muted aria-expanded:text-foreground dark:border-input dark:bg-input/20 dark:hover:bg-input/40",
+          "border-black bg-background hover:bg-muted hover:text-foreground aria-expanded:bg-muted aria-expanded:text-foreground dark:border-input dark:bg-input/20 dark:hover:bg-input/40",
         secondary:
           "bg-secondary text-secondary-foreground hover:bg-[color-mix(in_oklch,var(--secondary),var(--foreground)_8%)] aria-expanded:bg-secondary aria-expanded:text-secondary-foreground",
         ghost:
diff --git a/Frontend/erp-system/components/ui/toast.tsx b/Frontend/erp-system/components/ui/toast.tsx
index e256290..eba4d44 100644
--- a/Frontend/erp-system/components/ui/toast.tsx
+++ b/Frontend/erp-system/components/ui/toast.tsx
@@ -42,7 +42,7 @@ function ToastList() {
           <ToastPrimitive.Content className="flex items-start justify-between gap-3">
             <div className="flex flex-col gap-0.5">
               {toast.title && (
-                <ToastPrimitive.Title className="font-semibold leading-snug">
+                <ToastPrimitive.Title className="text-xs font-semibold leading-snug">
                   {toast.title}
                 </ToastPrimitive.Title>
               )}
diff --git a/Frontend/erp-system/lib/validations.ts b/Frontend/erp-system/lib/validations.ts
index 8de03f3..04304b7 100644
--- a/Frontend/erp-system/lib/validations.ts
+++ b/Frontend/erp-system/lib/validations.ts
@@ -1,14 +1,24 @@
 import { z } from "zod"
 
+// Treats null/undefined as missing so validation surfaces one clear
+// "required" message instead of a generic type error.
+function requiredString(message: string) {
+	return z.preprocess(
+		(val) => (val === null || val === undefined ? "" : val),
+		z.string().min(1, message)
+	)
+}
+
 // Email validation schema
-export const emailSchema = z.string().min(1, "Email is required").email("Enter a valid email")
+export const emailSchema = z.preprocess(
+	(val) => (val === null || val === undefined ? "" : val),
+	z.string().min(1, "Email is required").email("Enter a valid email")
+)
 
 // Login schema (email + password) for reuse across the app
 export const loginSchema = z.object({
 	email: emailSchema,
-	password: z
-		.string()
-		.min(1, "Password is required")
+	password: requiredString("Password is required")
 		.refine((val) => val.length >= 8, { message: "Password must be at least 8 characters" })
 		.refine((val) => /[A-Z]/.test(val), {
 			message: "Password must contain at least one uppercase letter",
diff --git a/Frontend/erp-system/next.config.ts b/Frontend/erp-system/next.config.ts
index e9ffa30..3428246 100644
--- a/Frontend/erp-system/next.config.ts
+++ b/Frontend/erp-system/next.config.ts
@@ -1,7 +1,10 @@
 import type { NextConfig } from "next";
+import path from "path";
 
 const nextConfig: NextConfig = {
-  /* config options here */
+  turbopack: {
+    root: path.join(__dirname),
+  },
 };
 
 export default nextConfig;
diff --git a/docs/20-FRONTEND.md b/docs/20-FRONTEND.md
index 767049c..54ac3c4 100644
--- a/docs/20-FRONTEND.md
+++ b/docs/20-FRONTEND.md
@@ -11,6 +11,7 @@
 | Concern | Rule |
 |---|---|
 | Framework | Next.js **App Router** + **TypeScript**. Work within the existing structure; do not restructure or introduce a competing router. |
+| Styling / UI | **Tailwind CSS** for all styling — no CSS modules, styled-components, or inline style objects. UI primitives come from **shadcn/ui** (`components/ui/`, built on `@base-ui/react` + `class-variance-authority`); use/extend existing components there before adding a new one, and generate new primitives via the shadcn CLI to keep the pattern consistent. |
 | State / forms | **Plain React hooks** (`useState`, `useReducer`, custom hooks). No form/state library. |
 | Validation | **Dependency-free** (hand-rolled helpers). See §3. |
 | API access | A single **typed fetch client** (`lib/`) against `NEXT_PUBLIC_API_BASE_URL`; all calls go through it. No scattered `fetch()` in components. |