diff --git a/AceJobAgency.client/src/components/LoginView.tsx b/AceJobAgency.client/src/components/LoginView.tsx
new file mode 100644
index 0000000..a5a41fc
--- /dev/null
+++ b/AceJobAgency.client/src/components/LoginView.tsx
@@ -0,0 +1,48 @@
+import { Input, Checkbox, Button, Link } from "@heroui/react";
+import { IconMail, IconLock } from "@tabler/icons-react";
+
+export default function LoginView({ onSignup }: { onSignup: () => void }) {
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex flex-col">
+        <p className="text-3xl">Welcome back!</p>
+        <p className="text-md opacity-50">
+          Let us know who you are, and we will let you in.
+        </p>
+      </div>
+      <div className="flex flex-col gap-2">
+        <Input endContent={<IconMail />} label="Email" />
+        <Input endContent={<IconLock />} label="Password" type="password" />
+      </div>
+      <div className="flex py-2 px-1 justify-between">
+        <Checkbox
+          classNames={{
+            label: "text-small",
+          }}
+        >
+          Remember me
+        </Checkbox>
+        <Link color="primary" href="#" size="sm">
+          Forgot password?
+        </Link>
+      </div>
+      <div className="flex flex-col gap-4 w-full">
+        <Button color="primary" className="w-full">
+          Login
+        </Button>
+        <div className="flex flex-row gap-2 w-full justify-center *:my-auto">
+          <p className="text-sm">Don't have an account?</p>
+          <Link
+            color="primary"
+            onPress={() => {
+              onSignup();
+            }}
+            className="text-sm"
+          >
+            Sign up
+          </Link>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/AceJobAgency.client/src/components/NavigationBar.tsx b/AceJobAgency.client/src/components/NavigationBar.tsx
index 8ba3089..2cf572b 100644
--- a/AceJobAgency.client/src/components/NavigationBar.tsx
+++ b/AceJobAgency.client/src/components/NavigationBar.tsx
@@ -1,15 +1,26 @@
 import {
   Button,
   Link,
+  Modal,
+  ModalBody,
+  ModalContent,
+  ModalHeader,
+  ModalFooter,
   Navbar,
   NavbarBrand,
   NavbarContent,
   NavbarItem,
+  useDisclosure,
 } from "@heroui/react";
+import { useState } from "react";
 import { useNavigate } from "react-router-dom";
+import SignupView from "./SignupView";
+import LoginView from "./LoginView";
 
 export default function NavigationBar() {
   const navigate = useNavigate();
+  const { isOpen, onOpen, onOpenChange } = useDisclosure();
+  const [isSignup, setIsSignup] = useState(false);
 
   return (
     <Navbar className="border-b-[1px] border-neutral-500/25">
@@ -32,7 +43,8 @@ export default function NavigationBar() {
         <NavbarItem className="hidden lg:flex">
           <Button
             onPress={() => {
-              navigate("/login");
+              setIsSignup(false);
+              onOpen();
             }}
             variant="light"
           >
@@ -42,7 +54,8 @@ export default function NavigationBar() {
         <NavbarItem>
           <Button
             onPress={() => {
-              navigate("/signup");
+              setIsSignup(true);
+              onOpen();
             }}
             variant="bordered"
           >
@@ -50,6 +63,32 @@ export default function NavigationBar() {
           </Button>
         </NavbarItem>
       </NavbarContent>
+      <Modal isOpen={isOpen} onOpenChange={onOpenChange}>
+        <ModalContent>
+          {() => (
+            <>
+              <ModalHeader />
+              <ModalBody>
+                {isSignup ? (
+                  <SignupView
+                    onLogin={() => {
+                      setIsSignup(false);
+                    }}
+                    email=""
+                  />
+                ) : (
+                  <LoginView
+                    onSignup={() => {
+                      setIsSignup(true);
+                    }}
+                  />
+                )}
+              </ModalBody>
+              <ModalFooter />
+            </>
+          )}
+        </ModalContent>
+      </Modal>
     </Navbar>
   );
 }
diff --git a/AceJobAgency.client/src/components/SignupView.tsx b/AceJobAgency.client/src/components/SignupView.tsx
new file mode 100644
index 0000000..5c3843f
--- /dev/null
+++ b/AceJobAgency.client/src/components/SignupView.tsx
@@ -0,0 +1,72 @@
+import {
+  Input,
+  Button,
+  Link,
+  Select,
+  SelectItem,
+  DatePicker,
+} from "@heroui/react";
+import { IconMail, IconLock } from "@tabler/icons-react";
+import { useState } from "react";
+
+export default function SignupView({
+  onLogin,
+  email = "",
+}: {
+  onLogin: () => void;
+  email: string;
+}) {
+  const [emailValue, setEmailValue] = useState(email);
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex flex-col">
+        <p className="text-3xl">Welcome!</p>
+        <p className="text-md opacity-50">Become a membership today!</p>
+      </div>
+      <div className="flex flex-col gap-2">
+        <div className="flex flex-row gap-2">
+          <Input label="First name" />
+          <Input label="Last name" />
+        </div>
+        <Input
+          endContent={<IconMail />}
+          label="Email"
+          type="email"
+          value={emailValue}
+          onValueChange={setEmailValue}
+        />
+        <Input label="NRIC" />
+        <div className="flex flex-row gap-2">
+          <Select label="Gender">
+            <SelectItem>Male</SelectItem>
+            <SelectItem>Female</SelectItem>
+          </Select>
+          <DatePicker label="Date of birth" />
+        </div>
+        <Input endContent={<IconLock />} label="Password" type="password" />
+        <Input
+          endContent={<IconLock />}
+          label="Confirm password"
+          type="password"
+        />
+      </div>
+      <div className="flex flex-col gap-4 w-full">
+        <Button color="primary" className="w-full">
+          Sign up
+        </Button>
+        <div className="flex flex-row gap-2 w-full justify-center *:my-auto">
+          <p className="text-sm">Already have an account?</p>
+          <Link
+            color="primary"
+            onPress={() => {
+              onLogin();
+            }}
+            className="text-sm"
+          >
+            Login
+          </Link>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/AceJobAgency.client/src/pages/HomePage.tsx b/AceJobAgency.client/src/pages/HomePage.tsx
index 1fb337d..b4d6de1 100644
--- a/AceJobAgency.client/src/pages/HomePage.tsx
+++ b/AceJobAgency.client/src/pages/HomePage.tsx
@@ -1,6 +1,23 @@
-import { Button, Card, Input } from "@heroui/react";
+import {
+  Button,
+  Card,
+  Input,
+  Modal,
+  ModalBody,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  useDisclosure,
+} from "@heroui/react";
+import { useState } from "react";
+import LoginView from "../components/LoginView";
+import SignupView from "../components/SignupView";
 
 export default function HomePage() {
+  const { isOpen, onOpen, onOpenChange } = useDisclosure();
+  const [isSignup, setIsSignup] = useState(false);
+  const [emailValue, setEmailValue] = useState("");
+
   return (
     <div className="absolute inset-0 w-full h-full flex flex-col justify-center bg-indigo-500/10 dark:bg-indigo-500/20">
       <div className="relative m-auto w-max h-max flex flex-col gap-10 justify-center text-center *:mx-auto">
@@ -16,13 +33,51 @@ export default function HomePage() {
         </div>
         <div>
           <Card className="flex flex-row gap-2 p-2">
-            <Input placeholder="Enter your email" size="lg" />
-            <Button color="primary" size="lg">
+            <Input
+              placeholder="Enter your email"
+              size="lg"
+              value={emailValue}
+              onValueChange={setEmailValue}
+            />
+            <Button
+              color="primary"
+              size="lg"
+              onPress={() => {
+                setIsSignup(true);
+                onOpen();
+              }}
+            >
               Sign up
             </Button>
           </Card>
         </div>
       </div>
+      <Modal isOpen={isOpen} onOpenChange={onOpenChange}>
+        <ModalContent>
+          {() => (
+            <>
+              <ModalHeader />
+              <ModalBody>
+                {isSignup ? (
+                  <SignupView
+                    onLogin={() => {
+                      setIsSignup(false);
+                    }}
+                    email={emailValue}
+                  />
+                ) : (
+                  <LoginView
+                    onSignup={() => {
+                      setIsSignup(true);
+                    }}
+                  />
+                )}
+              </ModalBody>
+              <ModalFooter />
+            </>
+          )}
+        </ModalContent>
+      </Modal>
     </div>
   );
 }