diff --git a/backend_api/music_app/__pycache__/main.cpython-38.pyc b/backend_api/music_app/__pycache__/main.cpython-38.pyc
index 029e7e3..955f984 100644
Binary files a/backend_api/music_app/__pycache__/main.cpython-38.pyc and b/backend_api/music_app/__pycache__/main.cpython-38.pyc differ
diff --git a/backend_api/music_app/modules/__pycache__/__init__.cpython-38.pyc b/backend_api/music_app/modules/__pycache__/__init__.cpython-38.pyc
index 82cb1c3..7de50dd 100644
Binary files a/backend_api/music_app/modules/__pycache__/__init__.cpython-38.pyc and b/backend_api/music_app/modules/__pycache__/__init__.cpython-38.pyc differ
diff --git a/backend_api/music_app/modules/__pycache__/database.cpython-38.pyc b/backend_api/music_app/modules/__pycache__/database.cpython-38.pyc
index fb0fe71..b541eb2 100644
Binary files a/backend_api/music_app/modules/__pycache__/database.cpython-38.pyc and b/backend_api/music_app/modules/__pycache__/database.cpython-38.pyc differ
diff --git a/backend_api/music_app/modules/__pycache__/models.cpython-38.pyc b/backend_api/music_app/modules/__pycache__/models.cpython-38.pyc
index 62ba569..fcba921 100644
Binary files a/backend_api/music_app/modules/__pycache__/models.cpython-38.pyc and b/backend_api/music_app/modules/__pycache__/models.cpython-38.pyc differ
diff --git a/backend_api/music_app/modules/__pycache__/schemas.cpython-38.pyc b/backend_api/music_app/modules/__pycache__/schemas.cpython-38.pyc
index c2f8a32..003f9ba 100644
Binary files a/backend_api/music_app/modules/__pycache__/schemas.cpython-38.pyc and b/backend_api/music_app/modules/__pycache__/schemas.cpython-38.pyc differ
diff --git a/backend_api/music_app/music_club.db b/backend_api/music_app/music_club.db
new file mode 100644
index 0000000..0e0ed7e
Binary files /dev/null and b/backend_api/music_app/music_club.db differ
diff --git a/backend_api/music_app/routers/__pycache__/__init__.cpython-38.pyc b/backend_api/music_app/routers/__pycache__/__init__.cpython-38.pyc
index b6c118d..c5a4425 100644
Binary files a/backend_api/music_app/routers/__pycache__/__init__.cpython-38.pyc and b/backend_api/music_app/routers/__pycache__/__init__.cpython-38.pyc differ
diff --git a/backend_api/music_app/routers/__pycache__/admin.cpython-38.pyc b/backend_api/music_app/routers/__pycache__/admin.cpython-38.pyc
index af86bcf..1a38248 100644
Binary files a/backend_api/music_app/routers/__pycache__/admin.cpython-38.pyc and b/backend_api/music_app/routers/__pycache__/admin.cpython-38.pyc differ
diff --git a/backend_api/music_app/routers/__pycache__/adminevent.cpython-38.pyc b/backend_api/music_app/routers/__pycache__/adminevent.cpython-38.pyc
index ccd09cd..2365a4c 100644
Binary files a/backend_api/music_app/routers/__pycache__/adminevent.cpython-38.pyc and b/backend_api/music_app/routers/__pycache__/adminevent.cpython-38.pyc differ
diff --git a/backend_api/music_app/routers/__pycache__/adminphoto.cpython-38.pyc b/backend_api/music_app/routers/__pycache__/adminphoto.cpython-38.pyc
index edff909..f0ade7b 100644
Binary files a/backend_api/music_app/routers/__pycache__/adminphoto.cpython-38.pyc and b/backend_api/music_app/routers/__pycache__/adminphoto.cpython-38.pyc differ
diff --git a/backend_api/music_app/routers/__pycache__/adminuser.cpython-38.pyc b/backend_api/music_app/routers/__pycache__/adminuser.cpython-38.pyc
index 3245867..5858442 100644
Binary files a/backend_api/music_app/routers/__pycache__/adminuser.cpython-38.pyc and b/backend_api/music_app/routers/__pycache__/adminuser.cpython-38.pyc differ
diff --git a/backend_api/music_app/routers/__pycache__/landingPageEvents.cpython-38.pyc b/backend_api/music_app/routers/__pycache__/landingPageEvents.cpython-38.pyc
index 3bca40c..1fff7b9 100644
Binary files a/backend_api/music_app/routers/__pycache__/landingPageEvents.cpython-38.pyc and b/backend_api/music_app/routers/__pycache__/landingPageEvents.cpython-38.pyc differ
diff --git a/backend_api/requirements.txt b/backend_api/requirements.txt
index ef837e6..995212e 100644
--- a/backend_api/requirements.txt
+++ b/backend_api/requirements.txt
@@ -3,7 +3,6 @@ async-generator==1.10
 bcrypt==3.1.7
 cffi==1.14.0
 click==7.1.2
-dataclasses==0.7
 dnspython==1.16.0
 email-validator==1.1.1
 fastapi==0.55.1
diff --git a/music_club_website_base_template/src/App.js b/music_club_website_base_template/src/App.js
index 219e393..2e86952 100755
--- a/music_club_website_base_template/src/App.js
+++ b/music_club_website_base_template/src/App.js
@@ -47,30 +47,30 @@ class App extends Component {
       //the <Nav/> goes above the Switch if navbar is at top
       //add your component to this by Route path = "/{component name}"
       <SimpleReactLightbox>
-         <Navbar /> 
         <BrowserRouter>
+          <Navbar />
           <div>
             <Switch>
-              <Route path="/" component={Home} exact/>
-              <Route path="/timeline" component={Timeline} exact/>
-              <Route path="/event/:id" component={Event} exact/>
-              <Route path="/gallery" component={Gallery} exact/>
-              <Route path="/about-club" component={AboutClub} exact/>
-              <Route path="/about-team" component={AboutTeam} exact/>
-              <Route path="/login" component={Login} exact/>
-              <Route path="/logout" component={Logout} exact/>
-              <Route path="/admin" component={Admin} exact/>
-              <Route path="/admin/create_event" component={CreateEvent} exact/>
-              <Route path="/admin/change_event" component={UpdateEvent} exact/>
-              <Route path="/admin/delete_event" component={DeleteEvent} exact/>
-              <Route path="/admin/change_password" component={PassChange} exact/>
-              <Route path="/admin/lineup" component={Lineup} exact/>
-              <Route path="/admin/add_lineup" component={AddLineup} exact/>
-              <Route path="/admin/delete_photo" component={DeletePhoto} exact/>
-              <Route path="/admin/add_photo" component={AddPhoto} exact/>
-              <Route path="/admin/delete_photo/confirm_delete" component={ConfirmDelete} exact/>
-              <Route path="/admin/delete_photo/not_found" component={NotFound} exact/>
-              <Route path="/admin/regs" component={Register} exact/>
+              <Route path="/" component={Home} exact />
+              <Route path="/timeline" component={Timeline} exact />
+              <Route path="/event/:id" component={Event} exact />
+              <Route path="/gallery" component={Gallery} exact />
+              <Route path="/about-club" component={AboutClub} exact />
+              <Route path="/about-team" component={AboutTeam} exact />
+              <Route path="/login" component={Login} exact />
+              <Route path="/logout" component={Logout} exact />
+              <Route path="/admin" component={Admin} exact />
+              <Route path="/admin/create_event" component={CreateEvent} exact />
+              <Route path="/admin/change_event" component={UpdateEvent} exact />
+              <Route path="/admin/delete_event" component={DeleteEvent} exact />
+              <Route path="/admin/change_password" component={PassChange} exact />
+              <Route path="/admin/lineup" component={Lineup} exact />
+              <Route path="/admin/add_lineup" component={AddLineup} exact />
+              <Route path="/admin/delete_photo" component={DeletePhoto} exact />
+              <Route path="/admin/add_photo" component={AddPhoto} exact />
+              <Route path="/admin/delete_photo/confirm_delete" component={ConfirmDelete} exact />
+              <Route path="/admin/delete_photo/not_found" component={NotFound} exact />
+              <Route path="/admin/regs" component={Register} exact />
             </Switch>
           </div>
         </BrowserRouter>
diff --git a/music_club_website_base_template/src/components/Navbar/MenuItem.js b/music_club_website_base_template/src/components/Navbar/MenuItem.js
index b4bdc6b..fff6dc0 100644
--- a/music_club_website_base_template/src/components/Navbar/MenuItem.js
+++ b/music_club_website_base_template/src/components/Navbar/MenuItem.js
@@ -1,5 +1,6 @@
 import * as React from "react";
 import { motion } from "framer-motion";
+import { NavLink } from 'react-router-dom';
 
 const variants = {
   open: {
@@ -18,18 +19,40 @@ const variants = {
   }
 };
 
+
 const colors = ["#FF008C", "#D309E1", "#9C1AFF", "#7700FF", "#4400FF"];
+const items = [
+  {
+    "text": "Home",
+    "link": "/"
+  },
+  {
+    "text": "Timeline",
+    "link": "/timeline"
+  },
+  {
+    "text": "About Club",
+    "link": "/about-club"
+  },
+  {
+    "text": "About Team",
+    "link": "/about-team"
+  }]
 
+console.log(items)
 export const MenuItem = ({ i }) => {
-  const style = { border: `2px solid ${colors[i]}` };
+  // const style = { border: `2px solid ${colors[i]}` };
+  let text = items[i].text;
+  let link = items[i].link;
   return (
     <motion.li
       variants={variants}
       whileHover={{ scale: 1.1 }}
       whileTap={{ scale: 0.95 }}
     >
-      <div className="icon-placeholder" style={style} />
-      <div className="text-placeholder" style={style} />
+      <NavLink to={link} style={{ color: "black" }}>
+        <h2> {text} </h2>
+      </NavLink>
     </motion.li>
   );
 };
diff --git a/music_club_website_base_template/src/components/Navbar/Navigation.js b/music_club_website_base_template/src/components/Navbar/Navigation.js
index 6da7c29..e817dd2 100644
--- a/music_club_website_base_template/src/components/Navbar/Navigation.js
+++ b/music_club_website_base_template/src/components/Navbar/Navigation.js
@@ -1,6 +1,7 @@
 import * as React from "react";
 import { motion } from "framer-motion";
 import { MenuItem } from "./MenuItem";
+import {withRouter} from 'react-router-dom'
 
 const variants = {
   open: {
@@ -11,6 +12,8 @@ const variants = {
   }
 };
 
+
+
 export const Navigation = () => (
   <motion.ul variants={variants}>
     {itemIds.map(i => (
@@ -19,4 +22,4 @@ export const Navigation = () => (
   </motion.ul>
 );
 
-const itemIds = [0, 1, 2, 3, 4];
+const itemIds = [0, 1, 2, 3];