diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e1241df..b76376c 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "react-router": "^6.22.3"
+        "react-router-dom": "^6.22.3"
       },
       "devDependencies": {
         "@types/react": "^18.2.64",
@@ -2396,6 +2396,22 @@
         "react": ">=16.8"
       }
     },
+    "node_modules/react-router-dom": {
+      "version": "6.22.3",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.3.tgz",
+      "integrity": "sha512-7ZILI7HjcE+p31oQvwbokjk6OA/bnFxrhJ19n82Ex9Ph8fNAq+Hm/7KchpMGlTgWhUxRHMMCut+vEtNpWpowKw==",
+      "dependencies": {
+        "@remix-run/router": "1.15.3",
+        "react-router": "6.22.3"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
+      }
+    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 7af203c..f3ae3f2 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router": "^6.22.3"
+    "react-router-dom": "^6.22.3"
   },
   "devDependencies": {
     "@types/react": "^18.2.64",
diff --git a/frontend/src/App.css b/frontend/src/App.css
deleted file mode 100644
index e69de29..0000000
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 9fdfa75..2dbe740 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,12 +1,21 @@
-import './App.css'
+import "./styles/App.css";
+import { Link } from 'react-router-dom';
 
-function App() {
+export default function App() {
 
   return (
     <>
+      <Navbar />
       <h1>PeerNotes</h1>
     </>
   )
 }
 
-export default App
+function Navbar() {
+  return (
+    <nav>
+      <Link to="/">Home</Link>
+      <Link to="/logout">Logout</Link>
+    </nav>
+  );
+}
\ No newline at end of file
diff --git a/frontend/src/assets/screens/Login.tsx b/frontend/src/assets/screens/Login.tsx
deleted file mode 100644
index 8dbca5e..0000000
--- a/frontend/src/assets/screens/Login.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function Login() {
-    return (
-        <div>
-            <h1>Login</h1>
-        </div>
-    );
-}
\ No newline at end of file
diff --git a/frontend/src/assets/screens/Signup.tsx b/frontend/src/assets/screens/Signup.tsx
deleted file mode 100644
index a0eafdf..0000000
--- a/frontend/src/assets/screens/Signup.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function Signup() {
-    return (
-        <div>
-            <h1>Signup</h1>
-        </div>
-    );
-}
\ No newline at end of file
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 3d7150d..14705c2 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -2,9 +2,33 @@ import React from 'react'
 import ReactDOM from 'react-dom/client'
 import App from './App.tsx'
 import './index.css'
+import {
+  createBrowserRouter,
+  RouterProvider,
+} from "react-router-dom";
+import Login from './screens/Login.tsx';
+import Signup from './screens/Signup.tsx';
+
+const router = createBrowserRouter([
+  {
+    path: "/",
+    element: <App />,
+    children: [
+      // add more routes here
+    ]
+  },
+  {
+    path: "/login",
+    element: <Login />,
+  },
+  {
+    path: "/signup",
+    element: <Signup />,
+  },
+]);
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
-    <App />
+    <RouterProvider router={router} />
   </React.StrictMode>,
 )
diff --git a/frontend/src/screens/Login.tsx b/frontend/src/screens/Login.tsx
new file mode 100644
index 0000000..2d9011f
--- /dev/null
+++ b/frontend/src/screens/Login.tsx
@@ -0,0 +1,19 @@
+import { Link } from "react-router-dom"
+import "../styles/Login.css"
+export default function Login() {
+    return (
+        <main>
+            <form>
+                <h1>Login</h1>
+                <div className="form-inputs">
+                    <label htmlFor="username">Username</label>
+                    <input type="text" name="username" id="username" />
+                    <label htmlFor="password">Password</label>
+                    <input type="password" name="password" id="password" />
+                </div>
+                <button>Login</button>
+                <p>or <Link to="/signup">Sign up</Link></p>
+            </form>
+        </main>
+    );
+}
\ No newline at end of file
diff --git a/frontend/src/screens/Signup.tsx b/frontend/src/screens/Signup.tsx
new file mode 100644
index 0000000..e674985
--- /dev/null
+++ b/frontend/src/screens/Signup.tsx
@@ -0,0 +1,19 @@
+import { Link } from "react-router-dom";
+import "../styles/Login.css"
+export default function Signup() {
+    return (
+        <main>
+            <form>
+                <h1>Sign Up</h1>
+                <div className="form-inputs">
+                    <label htmlFor="username">Username</label>
+                    <input type="text" name="username" id="username" />
+                    <label htmlFor="password">Password</label>
+                    <input type="password" name="password" id="password" />
+                </div>  
+                <button>Sign up</button>
+                <p>or <Link to="/login">Login</Link></p>
+            </form>
+        </main>
+    );
+}
\ No newline at end of file
diff --git a/frontend/src/styles/App.css b/frontend/src/styles/App.css
new file mode 100644
index 0000000..da7d9e9
--- /dev/null
+++ b/frontend/src/styles/App.css
@@ -0,0 +1,9 @@
+nav {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 1rem 2rem;
+    border: 3px solid #f1f1f1;
+    border-radius: 5px;
+    color: white;
+}
\ No newline at end of file
diff --git a/frontend/src/styles/Login.css b/frontend/src/styles/Login.css
new file mode 100644
index 0000000..f50e3da
--- /dev/null
+++ b/frontend/src/styles/Login.css
@@ -0,0 +1,20 @@
+form {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    gap: 0.5rem;
+}
+main {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100vh;
+}
+h1 {
+    text-align: center;
+}
+
+.form-inputs {
+    display: flex;
+    flex-direction: column;
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..283f7d0
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "peernotes",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/package.json
@@ -0,0 +1 @@
+{}