diff --git a/.DS_Store b/.DS_Store
index 208423c..7862d48 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.vscode/settings.json b/.vscode/settings.json
index cf93286..9329ffb 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,7 @@
 {
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     },
-    "editor.formatOnSave": false,
-}
+    "editor.formatOnSave":false,
+    "css.lint.unknownAtRules":"ignore",
+}
\ No newline at end of file
diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
deleted file mode 100644
index a2ee21e..0000000
--- a/backend/.eslintrc.js
+++ /dev/null
@@ -1,27 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    commonjs: true,
-    es2021: true,
-  },
-  extends: 'google',
-  overrides: [
-    {
-      env: {
-        node: true,
-      },
-      files: [
-        '.eslintrc.{js,cjs}',
-      ],
-      parserOptions: {
-        sourceType: 'script',
-      },
-    },
-  ],
-  parserOptions: {
-    ecmaVersion: 'latest',
-  },
-  rules: {
-    'require-jsdoc': 0,
-  },
-};
diff --git a/backend/controllers/AdminController.js b/backend/controllers/AdminController.js
index 904f083..2c7284a 100644
--- a/backend/controllers/AdminController.js
+++ b/backend/controllers/AdminController.js
@@ -1,6 +1,9 @@
 const express = require('express');
 const db = require('../database');
 
+const bcrypt = require('bcryptjs');
+const {hash, genSalt} = require('bcryptjs');
+
 const getEventRequests = async (req, res, next) => {
     try {
         const requests = await db.manyOrNone(
@@ -112,6 +115,62 @@ const processEventRequest = async (req, res, next) => {
     }
 }
 
+// Middleware given an email in the body, retireves the given admin
+// account or returns an error
+const getAdminByEmail = async (req, res, next) => {
+  try {
+    const data = await db.oneOrNone('SELECT * FROM Admins WHERE email = $1', [
+      req.body.email,
+    ]);
+
+    if (data) {
+      res.locals.admin = data;
+
+      next();
+    } else {
+      res.status(401).json({message: 'Email not found.'});
+    }
+  } catch (err) {
+    console.error(err);
+    res.status(500).json({error: 'Internal Server Error'});
+  }
+};
+
+// Middleware to create a new admin account.
+// If used, should be an admin route. i.e. allow Lluvia
+// to create a new admin account if wanted.
+const createAdmin = async (name, email, password) => {
+  const salt = await genSalt(10);
+  const hashed = await hash(password, salt);
+
+  return await db.one(
+      'INSERT INTO Admins (name, email, password) VALUES ($1, $2, $3) RETURNING *',
+      [name, email, hashed],
+  );
+};
+
+const createAdminMiddleware = async (req, res, next) => {
+  try {
+    const {name, email, password} = req.body;
+
+    if (name === undefined || email === undefined || password === undefined) {
+      console.log(req.body);
+      res.status(400).json({error: 'Missing required fields'});
+      return;
+    }
+
+    const data = await createAdmin(name, email, password);
+
+    res.locals.data = data;
+
+    next();
+  } catch (err) {
+    console.error(err);
+    res.status(500).json({error: 'Internal Server Error'});
+    return;
+  }
+};
+
 module.exports = {
     getEventRequests,
     getAllEventRequests,
@@ -120,4 +179,6 @@ module.exports = {
     createVendorViolation,
     deleteVendorViolation,
     processEventRequest,
+    getAdminByEmail,
+    createAdminMiddleware,
 };
\ No newline at end of file
diff --git a/backend/controllers/AuthController.js b/backend/controllers/AuthController.js
index c77cdfe..9c39a1c 100644
--- a/backend/controllers/AuthController.js
+++ b/backend/controllers/AuthController.js
@@ -1,16 +1,24 @@
 const jwt = require('jsonwebtoken');
 
-// This middleware will be used to sign the token after a user logs in
+const db = require('../database');
+
+// TODO: Set cookies to secure when https is ready?
+
+// This middleware will be used to sign the token after a vendor logs in
 const signToken = async (req, res, next) => {
+  if (res.locals.vendor === undefined) {
+    return res.status(401).json({message: 'Unauthorized'});
+  }
+
   // Sign the token with JWT_SECRET
-  const token = jwt.sign(res.locals.vendor, process.env.JWT_SECRET);
+  const token = await jwt.sign(res.locals.vendor, process.env.JWT_SECRET);
   // Return the token in a cookie
   res.cookie('auth', token, {httpOnly: true, secure: false});
 
   next();
 };
 
-// This middleware will be used to verify the token sent by the client
+// This middleware will be used to verify the token sent by the vendor
 const verifyToken = async (req, res, next) => {
   // Retrieve the token from the cookie
   const token = req.cookies.auth;
@@ -20,11 +28,84 @@ const verifyToken = async (req, res, next) => {
     if (err) {
       res.status(401).json({message: 'Unauthorized'});
     } else {
-      // Add the decoded object to res.locals
-      res.locals.vendor = decoded;
-      next();
+      // Update cookie data from database
+      db.oneOrNone('SELECT * FROM vendors WHERE vendor_id = $1', [decoded.vendor_id], (result, err) => {
+        if (err) {
+          res.status(500).json({message: 'Internal Server Error'});
+        } else if (result === null) {
+          res.status(401).json({message: 'Unauthorized'});
+        }
+
+        res.locals.vendor = result;
+        // Remove the password - isn't needed for any other processes.
+        delete res.locals.vendor['password'];
+
+        // Sign new token and continue
+        signToken(req, res, next);
+      });
+    }
+  });
+};
+
+// This middleware will be used to sign the token after an admin logs in
+const signAdminToken = async (req, res, next) => {
+  if (res.locals.admin === undefined) {
+    return res.status(401).json({message: 'Unauthorized'});
+  }
+
+  // Sign the token with JWT_SECRET
+  const token = await jwt.sign(res.locals.admin, process.env.JWT_SECRET);
+
+  // Return the token in a cookie
+  res.cookie('auth_pim', token, {httpOnly: true, secure: false});
+
+  next();
+};
+
+const verifyAdminToken = async (req, res, next) => {
+  // Retrieve the token from the cookie
+  const token = req.cookies.auth_pim;
+
+  // Verify the token with JWT_SECRET
+  jwt.verify(token, process.env.JWT_SECRET, (err, decoded) => {
+    if (err) {
+      return res.status(401).json({message: 'Unauthorized'});
+    } else {
+      // Keep the cookie up to date with the database
+      db.oneOrNone('SELECT * FROM admins WHERE admin_id = $1', [decoded.admin_id], (result, err) => {
+        if (err) {
+          console.log(err);
+          return res.status(500).json({message: 'Internal Server Error'});
+        } else if (result === undefined) {
+          return res.status(401).json({message: 'Unauthorized'});
+        }
+
+        console.log(result);
+
+        res.locals.admin = result;
+        delete res.locals.admin['password'];
+
+        // Sign new token and continue
+        signAdminToken(req, res, next);
+      });
     }
   });
 };
 
-module.exports = {signToken, verifyToken};
+// Returns a middleware to verify the user has the correct permissions.
+// Setting a route that only admins can access.
+// USAGE: router.get('/route', verify('admin'), controller.method);
+const verify = (privilege) => {
+  if (privilege === 'admin') {
+    // Check the admin token
+    return verifyAdminToken;
+  } else if (privilege === 'vendor') {
+    // Check the vendor token
+    return verifyToken;
+  } else {
+    // You shouldn't need to set privilege for any other use case.
+    throw new Error('Privilege should be either vendor or admin.');
+  }
+};
+
+module.exports = {signToken, verifyToken, verifyAdminToken, signAdminToken, verify};
diff --git a/backend/controllers/EventController.js b/backend/controllers/EventController.js
index 2f55026..daeca2a 100644
--- a/backend/controllers/EventController.js
+++ b/backend/controllers/EventController.js
@@ -37,12 +37,15 @@ const getEventById = async (req, res, next) => {
 const createEvent = async (req, res, next) => {
   const {name, location, datetime, description, capacity} = req.body;
   try {
-    await db.none(`
+    const event = await db.one(`
       INSERT INTO Events (name, location, datetime, description, vendor_capacity)
       VALUES ($1, $2, $3, $4, $5)
       RETURNING *;
     `, [name, location, datetime, description, capacity]);
 
+    // Returns the created event
+    res.locals.data = event;
+
     next();
   } catch (error) {
     console.error('Error creating event:', error);
diff --git a/backend/controllers/VendorController.js b/backend/controllers/VendorController.js
index 60d1add..67cb0dd 100644
--- a/backend/controllers/VendorController.js
+++ b/backend/controllers/VendorController.js
@@ -92,7 +92,7 @@ const getVendorById = async (req, res, next) => {
 // Registers the vendor in the database
 const createVendor = async (req, res, next) => {
   // Get the values from the request body
-  const {name, email, phone_number, password, website} = req.body;
+  const {name, email, phoneNumber, password, website} = req.body;
 
   // Checks if the required fields are present
   if (!password || !email || !name) {
@@ -107,7 +107,7 @@ const createVendor = async (req, res, next) => {
     passwordHash = await hash(password, salt);
   } catch (err) {
     console.log(err);
-    res.status(500).json({error: err});
+    res.status(495).json({error: err});
     return;
   }
 
@@ -121,7 +121,7 @@ const createVendor = async (req, res, next) => {
                 password, \
                 website\
             ) VALUES ($1, $2, $3, $4, $5)',
-        [name, email, phone_number, passwordHash, website],
+        [name, email, phoneNumber, passwordHash, website],
     );
   } catch (err) {
     // Duplicate emails are not allowed
diff --git a/backend/index.js b/backend/index.js
index f3873df..09d28bf 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -28,6 +28,7 @@ app.use(cookieParser());
 const VendorRouter = require('./routes/VendorRouter');
 const AdminRouter = require('./routes/AdminRouter');
 const EventRouter = require('./routes/EventRouter');
+const AdminRouter = require('./routes/AdminRouter');
 
 app.use('/vendors', VendorRouter);
 app.use('/events', EventRouter);
diff --git a/backend/middleware/successResponse.js b/backend/middleware/successResponse.js
index 4426179..80188ab 100644
--- a/backend/middleware/successResponse.js
+++ b/backend/middleware/successResponse.js
@@ -1,6 +1,7 @@
 // successResponse.js
 function sendSuccessResponse(req, res) {
   if (res.locals.data) {
+    // console.log('Data in res.locals', res.locals.data);
     res.status(200).json(res.locals.data);
   } else {
     // Fallback if no data is set in res.locals, but middleware is called
diff --git a/backend/routes/AdminRouter.js b/backend/routes/AdminRouter.js
index 3aadf1d..1a5168a 100644
--- a/backend/routes/AdminRouter.js
+++ b/backend/routes/AdminRouter.js
@@ -1,6 +1,14 @@
 const express = require('express');
 const router = express.Router();
 
+// Auth Controller Imports
+const {
+  verifyAdminToken,
+  signAdminToken,
+  verify,
+} = require('../controllers/AuthController');
+
+// Admin Controller Imports
 const {
     getEventRequests,
     getAllEventRequests,
@@ -9,6 +17,8 @@ const {
     createVendorViolation,
     deleteVendorViolation,
     processEventRequest,
+    getAdminByEmail,
+    createAdminMiddleware,
 } = require('../controllers/AdminController');
 
 const sendSuccessResponse = require('../middleware/successResponse');
@@ -27,4 +37,14 @@ router.post('/violations/:vendorId', createVendorViolation, sendSuccessResponse)
 
 router.delete('/violations/:violationId', deleteVendorViolation, sendSuccessResponse);
 
-module.exports = router;
\ No newline at end of file
+router.post('/login', getAdminByEmail, signAdminToken, (req, res) => {
+  res.status(200).json({status: 'success'});
+});
+
+// UNFINISHED: Create an admin account
+// Useful for creating an admin account for testing purposes. Password in database needs to be hashed for login to work properly.
+// router.post('/', createAdminMiddleware, (req, res) => {
+//   res.status(200).json({status: 'success', admin: res.locals.data});
+// });
+
+module.exports = router;
diff --git a/backend/routes/EventRouter.js b/backend/routes/EventRouter.js
index d0b306e..09f3cb2 100644
--- a/backend/routes/EventRouter.js
+++ b/backend/routes/EventRouter.js
@@ -7,6 +7,7 @@ const {
   updateEvent,
 } = require('../controllers/EventController');
 const sendSuccessResponse = require('../middleware/successResponse');
+const {verify} = require('../controllers/AuthController');
 
 // Get all events
 router.get('/', getAllEvents, sendSuccessResponse);
@@ -15,9 +16,9 @@ router.get('/', getAllEvents, sendSuccessResponse);
 router.get('/:event_id', getEventById, sendSuccessResponse);
 
 // Create a new event
-router.post('/', createEvent, sendSuccessResponse);
+router.post('/', verify('admin'), createEvent, sendSuccessResponse);
 
 // Update an existing event
-router.put('/:event_id', updateEvent, sendSuccessResponse);
+router.put('/:event_id', verify('admin'), updateEvent, sendSuccessResponse);
 
 module.exports = router;
diff --git a/backend/routes/VendorRouter.js b/backend/routes/VendorRouter.js
index d7f0aad..8bc39b1 100644
--- a/backend/routes/VendorRouter.js
+++ b/backend/routes/VendorRouter.js
@@ -13,8 +13,8 @@ const {
 } = require('../controllers/VendorController');
 const sendSuccessResponse = require('../middleware/successResponse');
 const {
-  verifyToken,
   signToken,
+  verify,
 } = require('../controllers/AuthController');
 
 // Logs in vendor
@@ -32,16 +32,16 @@ router.post('/', createVendor, (req, res) => {
 });
 
 // Create Vendor event request
-router.post('/events/request', createEventRequest, sendSuccessResponse);
+router.post('/events/request', verify('vendor'), createEventRequest, sendSuccessResponse);
 
 // Get Vendor event request
-router.get('/events/request', getEventRequest, sendSuccessResponse);
+router.get('/events/request', verify('admin'), getEventRequest, sendSuccessResponse);
 
 // Edit vendor by id
 // This probably should be an admin-protected route. How does that work?
-router.put('/:vendorId', verifyToken, updateVendor, sendSuccessResponse);
+router.put('/:vendorId', verify('admin'), updateVendor, sendSuccessResponse);
 
 // Route for vendor to update themself. ID is retrieved from the token.
-router.put('/', verifyToken, updateAuthenticatedVendor, sendSuccessResponse);
+router.put('/', verify('vendor'), updateAuthenticatedVendor, sendSuccessResponse);
 
 module.exports = router;
diff --git a/frontend/README.md b/frontend/README.md
deleted file mode 100644
index 58beeac..0000000
--- a/frontend/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
-
-The page will reload when you make changes.\
-You may also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can't go back!**
-
-If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
-
-You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
-
-### Analyzing the Bundle Size
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
-
-### Making a Progressive Web App
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
-
-### Advanced Configuration
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
-
-### Deployment
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
-
-### `npm run build` fails to minify
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index da95cfb..eebdd78 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -23,6 +23,7 @@
         "react-router": "^6.17.0",
         "react-router-dom": "^6.17.0",
         "react-scripts": "^5.0.1",
+        "schema-utils": "^4.2.0",
         "web-vitals": "^2.1.4"
       },
       "devDependencies": {
@@ -3330,6 +3331,23 @@
         }
       }
     },
+    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/@remix-run/router": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.10.0.tgz",
@@ -6480,55 +6498,6 @@
         }
       }
     },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/css-minimizer-webpack-plugin/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -7831,32 +7800,6 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/eslint-webpack-plugin/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
     "node_modules/eslint-webpack-plugin/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -7878,29 +7821,6 @@
         "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/eslint-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/eslint-webpack-plugin/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -8324,6 +8244,23 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
+    "node_modules/file-loader/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/filelist": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@@ -12480,55 +12417,6 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -15493,22 +15381,54 @@
       }
     },
     "node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/schema-utils/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
     "node_modules/select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@@ -16567,6 +16487,23 @@
         }
       }
     },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -17214,55 +17151,6 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/webpack-dev-middleware/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/webpack-dev-server": {
       "version": "4.15.1",
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
@@ -17321,55 +17209,6 @@
         }
       }
     },
-    "node_modules/webpack-dev-server/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/ws": {
       "version": "8.14.2",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
@@ -17453,6 +17292,23 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/websocket-driver": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 62d37ed..8fa73fb 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -18,6 +18,7 @@
     "react-router": "^6.17.0",
     "react-router-dom": "^6.17.0",
     "react-scripts": "^5.0.1",
+    "schema-utils": "^4.2.0",
     "web-vitals": "^2.1.4"
   },
   "scripts": {
diff --git a/frontend/src/App.css b/frontend/src/App.css
index 5d09417..bd6213e 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -1,8 +1,3 @@
 @tailwind base;
 @tailwind components;
-@tailwind utilities;
-
-
-
-
-
+@tailwind utilities;
\ No newline at end of file
diff --git a/frontend/src/alert.jsx b/frontend/src/alert.jsx
index 1817625..532a35e 100644
--- a/frontend/src/alert.jsx
+++ b/frontend/src/alert.jsx
@@ -18,8 +18,8 @@ export const Alert = ({content, bad}) => {
   return (
     <>
       { bad ?
-        <div className="bg-red-500 text-white text-center">{content}</div>:
-        <div className="bg-green-500 text-white text-center">{content}</div>
+        <div className="bg-red text-white text-center">{content}</div>:
+        <div className="bg-green text-white text-center">{content}</div>
       }
     </>
 
diff --git a/frontend/src/components/footer.jsx b/frontend/src/components/footer.jsx
index de03e95..4feb9a1 100644
--- a/frontend/src/components/footer.jsx
+++ b/frontend/src/components/footer.jsx
@@ -7,7 +7,7 @@ import {faSquareInstagram} from '@fortawesome/free-brands-svg-icons';
 
 export default function Footer() {
   return (
-    <div className='bg-teal' id="Footer">
+    <div className='bg-teal fixed bottom-0' id="Footer">
       <div id="Footer-content">
         <a
           className="social-links"
diff --git a/frontend/src/components/headervendor.jsx b/frontend/src/components/headervendor.jsx
index 92a7869..5c0bdfe 100644
--- a/frontend/src/components/headervendor.jsx
+++ b/frontend/src/components/headervendor.jsx
@@ -10,13 +10,13 @@ export default function Header({admin}) {
   };
 
   return (
-    <div className="flex justify-end bg-blue ">
-      <div className="max-w-screen-xlflex flex-wrap p-4 ml-auto">
+    <div className="flex bg-blue ">
+      <div className="flex-wrap p-4 ml-auto">
         <div className="flex md:order-2">
           <button
             type="button"
             onClick={toggleMenu}
-            className="inline-flex ml-20 p-2 w-10 h-10 text-sm text-gray-500 rounded-lg  bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600"
+            className="inline-flex ml-20 p-2 w-10 h-10 text-sm rounded-lg md:hidden lg:hidden"
           >
             <span className="sr-only">Open main menu</span>
             <svg
@@ -40,17 +40,17 @@ export default function Header({admin}) {
           className={`justify-between w-full md:flex md:w-auto md:order-1 ${menuOpen ? '' : 'hidden'}`}
           id="navbar-user"
         >
-          <ul className="flex flex-col font-medium p-4 md:p-0 mt-4 border border-gray-100 rounded-lg bg-gray-50 md:flex-row md:space-x-8 md:mt-0 md:border-0 md:bg-white dark:bg-gray-800 md:dark:bg-gray-900 dark:border-gray-700">
+          <ul className="flex flex-col md:flex-row lg:flex-row font-lg p-2  mt-4   rounded-lg ">
             <li>
-              <Link to='/profile' className="block py-2 pl-3 pr-4 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Profile</Link>
+              <Link to='/profile' className="block py-2 pl-3 pr-4  rounded hover:bg-gray-100 ">Profile</Link>
             </li>
             <li>
-              <Link to='/events' className="block py-2 pl-3 pr-4 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Events</Link>
+              <Link to='/events' className="block py-2 pl-3 pr-4 text-gray-900 rounded">Events</Link>
             </li>
             <li>
-              <Link to='/login' className="block py-2 pl-3 pr-4 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Login</Link>
+              <Link to='/login' className="block py-2 pl-3 pr-4 text-gray-900 rounded ">Login</Link>
             </li>
-            {admin ? <li><Link to='/vendors' className="block py-2 pl-3 pr-4 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Vendors</Link></li> : null}
+            {admin ? <li><Link to='/vendors' className="block py-2 pl-3 pr-4 text-gray-900 rounded ">Vendors</Link></li> : null}
           </ul>
         </div>
       </div>
diff --git a/frontend/src/index.js b/frontend/src/index.js
index f6a64b7..69ce6a5 100644
--- a/frontend/src/index.js
+++ b/frontend/src/index.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import Login from './routes/login';
 import Vendor from './routes/vendor';
-import Events from './routes/events';
+import Event from './routes/event.jsx';
+import Events from './routes/events.jsx';
 import Profile from './routes/profile';
 import Root from './routes/root';
 import ReactDOM from 'react-dom/client';
@@ -13,7 +14,10 @@ import {createBrowserRouter, Navigate, RouterProvider} from 'react-router-dom';
 import Register from './routes/register';
 import ResetPassword from './routes/reset_password';
 import MockVendorService from './services/MockServices/MockVendorService.js';
-import MockLoginService from './services/MockServices/MockLoginService';
+import MockEventService from './services/MockServices/MockEventService.js';
+// import MockLoginService from './services/MockServices/MockLoginService';
+import handleRegister from './services/handleRegister.js';
+import {handleLoginVendor} from './services/handleLogin.js';
 
 
 import config from './config.js';
@@ -22,9 +26,11 @@ import {MessageProvider} from './alert.jsx';
 const isadmin = true;
 const session = true;
 
+
 // Setup the mock vendor service
 if (config.environment === 'dev') {
   MockVendorService.init();
+  MockEventService.init();
 }
 
 const router = createBrowserRouter([
@@ -35,15 +41,15 @@ const router = createBrowserRouter([
     children: [
       {
         path: '/vendors/:vendorId',
-        element: session? <Vendor /> : <Navigate to="/login" />,
+        element: session? <Vendor vendorService={MockVendorService}/> : <Navigate to="/login" />,
       },
       {
         path: '/login',
-        element: <Login loginService = {MockLoginService.login} admin={isadmin}/>,
+        element: <Login loginService = {handleLoginVendor} admin={isadmin}/>,
       },
       {
         path: '/register',
-        element: <Register registerService = {MockLoginService.register}/>,
+        element: <Register registerService = {handleRegister}/>,
       },
       {
         path: '/reset_password',
@@ -53,9 +59,13 @@ const router = createBrowserRouter([
         path: '/profile',
         element: session ? <Profile/> : <Navigate to="/login" />,
       },
+      {
+        path: '/events/:eventId',
+        element: session ? <Event EventService = {MockEventService} /> : <Navigate to="/login" />,
+      },
       {
         path: '/events',
-        element: session ? <Events/> : <Navigate to="/login" />,
+        element: session ? <Events EventService={MockEventService}/> : <Navigate to="/login" />,
       },
       {
         path: '/vendors',
@@ -72,8 +82,8 @@ export default root.render(
       </MessageProvider>
     </React.StrictMode>,
 );
-
 // If you want to start measuring performance in your app, pass a function
 // to log results (for example: reportWebVitals(console.log))
 // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
 reportWebVitals(console.log);
+
diff --git a/frontend/src/objects/Event.js b/frontend/src/objects/Event.js
new file mode 100644
index 0000000..694d877
--- /dev/null
+++ b/frontend/src/objects/Event.js
@@ -0,0 +1,25 @@
+/*
+Storage mechanism for a vendor object
+*/
+class Event {
+  constructor(eventId, name, location, datetime, description, vendorCapacity, durationHours = 2) {
+    this.eventId = eventId;
+    this.name = name;
+    this.location = location;
+    this.date = datetime.toLocaleDateString();
+    this.startTime = datetime.toLocaleTimeString();
+
+    // Create a new Date object for the end time
+    const endTime = new Date(datetime.getTime() + durationHours * 60 * 60 * 1000);
+    this.endTime = endTime.toLocaleTimeString();
+
+    this.description = description;
+    this.vendorCapacity = vendorCapacity;
+  }
+
+  get json() {
+    return JSON.stringify(this);
+  }
+}
+
+module.exports = Event;
\ No newline at end of file
diff --git a/frontend/src/routes/event.jsx b/frontend/src/routes/event.jsx
new file mode 100644
index 0000000..4bd87df
--- /dev/null
+++ b/frontend/src/routes/event.jsx
@@ -0,0 +1,78 @@
+import React, {useEffect} from 'react';
+import {useNavigate, useParams} from 'react-router-dom';
+import logo from '../assets/PIM_logo_white.png';
+import bLogo from '../assets/PIM_logo_black.png';
+import {useState} from 'react';
+import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
+import {faCaretDown, faLeftRight} from '@fortawesome/free-solid-svg-icons';
+import {faAnglesLeft} from '@fortawesome/free-solid-svg-icons';
+import PropTypes from 'prop-types';
+
+// eventually have EventService.getEventById(useParams())
+// use params will get the params from the url
+export default function Event({EventService}) {
+  const [about, setAbout] = useState(false);
+  const [vendorOpen, setVendorOpen] = useState(false);
+  const navigate = useNavigate();
+  const {eventId} = useParams();
+
+  // const [register, setRegistered] = useState(false);
+  // wondering if I could use object destructuring here
+  // e.g const [location, setLocation] = useState({getEvent})
+  // b/c getEvent realistically has a prop location
+  const e = EventService.getEvent(parseInt(eventId));
+  console.log(EventService.getEvent(0));
+  if (e === undefined) {
+    useEffect(()=>{
+      navigate('/events');
+    });
+  }
+  const {name, location, date, startTime, endTime, description, vendorCapacity} = e !== undefined ? e : {name: 'Loading...', location: 'Loading...', date: 'Loading...', startTime: 'Loading...', endTime: 'Loading...', description: 'Loading...', vendorCapacity: 'Loading...'};
+  // const vendorList = RegisterEventService[id].getVendors();
+  const vendorImages = [logo, bLogo, logo, bLogo, logo, bLogo, logo, bLogo, logo, bLogo, logo, bLogo];
+
+  const toggleVendor = () => {
+    setVendorOpen(!vendorOpen);
+  };
+
+  async function handleRegister() {
+    // handle the user registering for the event
+    return;
+  }
+  return (
+    <div id="Event-content" className='overflow-scroll w-full h-full flex flex-col items-center mt-2'>
+      <button alt='back-arrow' className='self-start ml-2 fixed ' onClick={() => navigate(-1)}><FontAwesomeIcon icon={faAnglesLeft}/></button>
+      <img src={bLogo} className='w-2/3 py-0 bg-clip-padding bg-white drop-shadow-xl rounded-xl'/>
+      <div className="text-2xl mt-2 font-bold tracking-wide">{name}</div>
+      <div className='flex flex-row mt-2'>
+        <div className="mr-2">About</div>
+        <button onClick={() => setAbout(!about)}><FontAwesomeIcon icon={faCaretDown}/></button>
+      </div>
+      <div className={`${about ? 'relative text-gray-800 m-1 bg-opacity-100 bg-white drop-shadow-xl rounded-md p-2 w-2/3' : 'hidden'}`}>
+        {description}
+      </div>
+      <div className='mr-1 mt-2'>{location}</div>
+      <div className='mr-2 mt-2'>{date} | {startTime}</div>
+      <button
+        className="mt-3 text-gray-800 font-semibold py-2 px-1 drop-shadow-xl rounded-md bg-white w-24 click:text-white"
+        onClick={() => handleRegister()}
+      >Register</button>
+      <hr className='mt-3 mb-2 border-t-2 border-gray-600 w-3/4'/>
+      <div alt='Attending Vendors' className='mt-1 text-xl font-bold italic tracking-wide'>Attending Vendors</div>
+      <div alt='vendorImages' className='grid grid-cols-4 gap-3 w-2/3 mt-2 rounded-md '>
+        {vendorImages.map((vendorImg) => (
+          <img key={vendorImg} src={vendorImg} alt={vendorImg} onClick={toggleVendor} className='w-18 h-14 bg-white rounded-md drop-shadow-xl'/>
+        ))}
+      </div>
+    </div>
+  );
+}
+
+// <button alt="attendance" onClick={toggleVendor} className="mt-4 text-gray-800 font-semibold py-2 px-1 border border-gray-600 rounded w-24">See attending vendors</button>
+// put the images into a container, try to make it sideways scrollable where images are cutoff by border of div
+// resize images
+
+Event.propTypes = {
+  EventService: PropTypes.func.isRequired,
+};
+
diff --git a/frontend/src/routes/events.jsx b/frontend/src/routes/events.jsx
index f384ba1..a1d3183 100644
--- a/frontend/src/routes/events.jsx
+++ b/frontend/src/routes/events.jsx
@@ -1,6 +1,43 @@
 import React from 'react';
-export default function Events() {
+
+import {useState} from 'react';
+import PropTypes from 'prop-types';
+
+export default function Events({EventService}) {
+  const [events] = useState(EventService.getEvents());
+
+  const eventDisplay = (event) => (
+    // event name, date, starttime, endtime, description, location in a single row
+    <div className="bg-white shadow-lg rounded-lg p-4 max-w-sm mx-auto bm-4">
+      <div className="mt-2">
+        <div className="text-lg font-semibold text-gray-900">{event.name}</div>
+        <div className="text-grey-5">{event.description}</div>
+        <div className="mt-3 text-grey-5">{event.date} • {event.startTime} - {event.endTime}</div>
+        <div className="mt-1 text-sm text-grey-5">
+          <svg xmlns="http://www.w3.org/2000/svg" className="h-4 w-4 inline-block mr-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 2C8.13401 2 5 5.13401 5 9C5 14.25 12 22 12 22C12 22 19 14.25 19 9C19 5.13401 15.866 2 12 2ZM12 11C10.3431 11 9 9.65685 9 8C9 6.34315 10.3431 5 12 5C13.6569 5 15 6.34315 15 8C15 9.65685 13.6569 11 12 11Z" />
+          </svg>
+          {event.location}
+        </div>
+      </div>
+    </div>
+  );
+
   return (
-    <div>You are on the events route</div>
+    // display in a single column
+    <div className='w-full mx-auto flex flex-col justify-center pb-16'>
+      <h1 className='color-white text-2xl text-center my-3 font-semibold'>Events</h1>
+      <div className='flex flex-col space-y-4'>
+        {
+          events && (Array.isArray(events) ? events.map((event, i) => (
+            <li className='[list-style:none]' key={i}>{eventDisplay(event)}</li>
+          )) : eventDisplay(events))
+        }
+      </div>
+    </div>
   );
 }
+
+Events.propTypes = {
+  EventService: PropTypes.func.isRequired,
+};
diff --git a/frontend/src/routes/login.jsx b/frontend/src/routes/login.jsx
index 28365e4..939c2ab 100644
--- a/frontend/src/routes/login.jsx
+++ b/frontend/src/routes/login.jsx
@@ -16,19 +16,20 @@ export default function Login({loginService, admin}) {
 
   async function handleLogin() {
     const data = {username: user, password: pass};
-    if (loginService(data)) {
+    if (await loginService(data)) {
+      setBad(false);
       setMessage('Logged in succesfully');
             admin ? navigate('/events') : navigate('/vendor');
             console.log('Logged in!');
     } else {
-      setMessage('Failed to login');
       setBad(true);
+      setMessage('Failed to login');
     }
     // axios.post("/login", data).then(() => redirect('/events')).catch(err => setMessage('There was an error: ' + err), setErr(true))
   }
 
   return (
-    <div className="content-centerh-[80vh] overflow-scroll">
+    <div className="content-center my-auto overflow-scroll">
 
       <div className="flex flex-col m-auto w-max px-4 text-center justify-start ">
 
@@ -40,14 +41,14 @@ export default function Login({loginService, admin}) {
 
         <div className="m-2">
           <input
-            className="rounded-lg w-3/4"
+            className="p-1 rounded-lg w-3/4 drop-shadow-md"
             placeholder="Username"
             onChange={(e) => setUser(e.target.value)}>
           </input>
         </div>
         <div className="m-2">
           <input
-            className="rounded-lg w-3/4"
+            className="p-1 rounded-lg w-3/4 drop-shadow-md"
             placeholder="Password" type="password"
             onChange={(e) => setPass(e.target.value)}>
           </input>
@@ -55,17 +56,17 @@ export default function Login({loginService, admin}) {
 
         <div className="m-2 ">
           <button
-            className="bg-blue-300 w-3/4 rounded click:bg-blue-600"
+            className="p-1 bg-blue w-3/4 rounded click:bg-black drop-shadow-md"
             onClick={() => handleLogin()}>
                 Submit
           </button>
         </div>
 
-        <div className="m-2 text-blue-400 underline">
+        <div className="m-2 text-blue underline">
           <Link to='/reset_password'>Forgot Password?</Link>
         </div>
 
-        <div className="m-2 text-blue-400 underline">
+        <div className="m-2 text-blue underline">
           <Link to='/register'>Don&apos;t have an account? Register</Link>
         </div>
       </div>
diff --git a/frontend/src/routes/register.jsx b/frontend/src/routes/register.jsx
index 697e311..b193d5c 100644
--- a/frontend/src/routes/register.jsx
+++ b/frontend/src/routes/register.jsx
@@ -19,19 +19,20 @@ export default function Register({registerService}) {
   const {setMessage, setBad} = useContext(MessageContext);
   const navigate = useNavigate();
   async function handleRegister() {
-    const data = {name: name, email: email, password: pass, website, phone_number: phone};
+    const data = {name: name, email: email, password: pass, website, phoneNumber: phone};
     if (registerService(data)) {
+      setBad(false);
       setMessage('Registered succesfully');
       console.log('Registered!');
       navigate('/login');
     } else {
-      setMessage('Failed to register');
       setBad(true);
+      setMessage('Failed to register');
     }
   }
 
   return (
-    <div className="content-center h-[80vh] overflow-scroll">
+    <div className="content-center my-auto overflow-scroll">
 
 
       <div className="flex flex-col m-auto w-max px-4 text-center justify-start">
@@ -42,32 +43,32 @@ export default function Register({registerService}) {
                     Register
         </div>
         <div className="m-2">
-          <input className="rounded-lg w-3/4" placeholder="Name" onChange={(e) => setName(e.target.value)}></input>
+          <input className="p-1 rounded-lg w-3/4" placeholder="Name" onChange={(e) => setName(e.target.value)}></input>
         </div>
         <div className="m-2">
-          <input className="rounded-lg w-3/4" placeholder="Email" onChange={(e) => setEmail(e.target.value)}></input>
+          <input className="p-1 rounded-lg w-3/4" placeholder="Email" onChange={(e) => setEmail(e.target.value)}></input>
         </div>
         <div className="m-2">
-          <input className="rounded-lg w-3/4" placeholder="Website" onChange={(e) => setWebsite(e.target.value)}></input>
+          <input className="p-1 rounded-lg w-3/4" placeholder="Website" onChange={(e) => setWebsite(e.target.value)}></input>
         </div>
         <div className="m-2">
-          <input className="rounded-lg w-3/4" placeholder="Phone Number" onChange={(e) => setPhone(e.target.value)}></input>
+          <input className="p-1 rounded-lg w-3/4" placeholder="Phone Number" onChange={(e) => setPhone(e.target.value)}></input>
         </div>
         <div className="m-2">
-          <input className="rounded-lg w-3/4" placeholder="Password" type="password" onChange={(e) => setPass(e.target.value)}></input>
+          <input className="p-1 rounded-lg w-3/4" placeholder="Password" type="password" onChange={(e) => setPass(e.target.value)}></input>
         </div>
 
         <div className="m-2">
-          <input className="rounded-lg w-3/4" placeholder="Reenter password" type="password" onChange={(e) => setPass2(e.target.value)}></input>
+          <input className="p-1 rounded-lg w-3/4" placeholder="Reenter password" type="password" onChange={(e) => setPass2(e.target.value)}></input>
         </div>
 
         {pass !== pass2 && <Alert content="Passwords match" bad ={true}/>}
 
         <div className="m-2 ">
-          <button className="bg-blue-300 w-3/4 rounded click:bg-blue-600" onClick={() => handleRegister()}>Submit</button>
+          <button className="bg-blue w-3/4 rounded click:bg-black" onClick={() => handleRegister()}>Submit</button>
         </div>
 
-        <div className="m-2 text-blue-400 underline">
+        <div className="m-2 text-blue underline">
           <Link to='/login'>Back to login</Link>
         </div>
       </div>
diff --git a/frontend/src/routes/root.jsx b/frontend/src/routes/root.jsx
index 7961bb3..4d0087c 100644
--- a/frontend/src/routes/root.jsx
+++ b/frontend/src/routes/root.jsx
@@ -11,8 +11,10 @@ import axios from 'axios';
 
 export default function Root({admin}) {
   // const data = useLoaderData()
-  const {message, setMessage, bad} = useContext(MessageContext);
-  setTimeout(() => setMessage(''), 5000);
+  const {message, setMessage, bad, setBad} = useContext(MessageContext);
+  setTimeout(() => {
+    setMessage(''); setBad(false);
+  }, 5000);
   const location = useLocation();
   console.log(location.pathname);
 
@@ -25,7 +27,7 @@ export default function Root({admin}) {
   }, []);
 
   return (
-    <div className="bg-grey-1 w-screen flex h-screen flex-col justify-between">
+    <div className="bg-grey-1 w-screen flex min-h-screen flex-col">
       {message && <Alert content = {message} bad ={bad}/>}
       <Header admin={admin}/>
       <Outlet/>
diff --git a/frontend/src/routes/vendors.jsx b/frontend/src/routes/vendors.jsx
index 7fe8000..1dc3d5a 100644
--- a/frontend/src/routes/vendors.jsx
+++ b/frontend/src/routes/vendors.jsx
@@ -1,9 +1,15 @@
 import React from 'react';
 import {useState} from 'react';
 import PropTypes from 'prop-types';
-import {Link} from 'react-router-dom';
-import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
-import {faArrowRight} from '@fortawesome/free-solid-svg-icons';
+// import {Link} from 'react-router-dom';
+// import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
+// import {faArrowRight} from '@fortawesome/free-solid-svg-icons';
+
+function VendorButton({content, onClick}) {
+  return (
+    <button className='bg-blue text-white m-1 p-2 rounded-lg' onClick={ () => onClick}> {content}</button>
+  );
+}
 
 export default function Vendors({VendorService}) {
   const [vendors, setVendors] = useState(VendorService.getVendors());
@@ -13,18 +19,19 @@ export default function Vendors({VendorService}) {
   };
 
   const vendorDisplay = (vendor) => (
-    <div className="flex flex-col p-2 bg-grey-2 my-2 rounded h-max ">
-      <div className='flex justify-between'>
-        <h2 className='text-black'>{vendor.name}</h2>
-        <Link className='text-salmon' to={`/vendors/:${vendor.id}`}><FontAwesomeIcon icon={faArrowRight} /></Link>
-      </div>
+    <div className="grid grid-cols-2 p-2 my-2 rounded h-max grid-rows-4 bg-white drop-shadow-md">
+      <img className='w-14 mx-auto my-auto row-span-2 rounded-full bg-white' src={vendor.image} alt='vendor image'/>
+      <h2 className='text-black mx-auto my-auto row-span-2 text-black font-bold'>{vendor.name}</h2>
+      <VendorButton onClick={() => handleInvite()} content='Invite'/>
+      <VendorButton onClick={() => handleMessage()} content='Message'/>
+      <VendorButton onClick={() => handleFlag()} content='Flag'/>
+      <VendorButton onClick={() => handlePromote()} content='Promote'/>
     </div>
   );
-
   return (
-    <div className='h-[80vh] w-screen p-2 flex flex-col items-left justify-between gap-2'>
+    <div className=' w-screen pl-2 pr-2 flex flex-col items-left justify-between gap-2'>
       <h1 className='color-white text-xl'>Vendors</h1>
-      <input type='text' placeholder='Search for a vendor' className='w-11/12 rounded p-2' onChange={ (e) => handleSearch(e.target.value)}></input>
+      <input type='text' placeholder='Search for a vendor' className='w-11/12 rounded p-2' onChange={(e) => handleSearch(e.target.value)}></input>
       <div className='grid grid-cols-2 gap-x-2 overflow-scroll h-full'>
         {
           vendors && (Array.isArray(vendors) ? vendors.map((vendor, i) => (
@@ -40,3 +47,8 @@ export default function Vendors({VendorService}) {
 Vendors.propTypes = {
   VendorService: PropTypes.func.isRequired,
 };
+
+VendorButton.propTypes = {
+  content: PropTypes.string.isRequired,
+  onClick: PropTypes.func.isRequired,
+};
diff --git a/frontend/src/services/MockServices/MockEventService.js b/frontend/src/services/MockServices/MockEventService.js
index e69de29..2153d14 100644
--- a/frontend/src/services/MockServices/MockEventService.js
+++ b/frontend/src/services/MockServices/MockEventService.js
@@ -0,0 +1,43 @@
+import Event from '../../objects/Event';
+
+export default class MockEventService {
+  static mockEvents = [];
+
+  static init() {
+    if (this.mockEvents === undefined || this.mockEvents.length === 0) {
+      this.mockEvents = [
+        new Event(1, 'Music Festival', 'Central Park, NY', new Date(2023, 5, 20, 16, 0), 'A festival of music and arts.', 50, 4),
+        new Event(2, 'Tech Conference', 'Convention Center, SF', new Date(2023, 6, 15, 9, 0), 'A conference for tech enthusiasts.', 100, 8),
+        new Event(3, 'Food Fair', 'Downtown, LA', new Date(2023, 7, 10, 11, 0), 'A fair showcasing local food vendors.', 30, 3),
+        new Event(4, 'Book Expo', 'Library, Boston', new Date(2023, 8, 5, 10, 0), 'An expo for book lovers.', 40, 5),
+        new Event(5, 'Film Festival', 'Cinema, Austin', new Date(2023, 9, 1, 13, 0), 'A festival showcasing independent films.', 60, 6),
+        new Event(6, 'Art Exhibition', 'Museum, Chicago', new Date(2023, 10, 25, 14, 0), 'An exhibition of contemporary art.', 20, 2),
+        new Event(7, 'Craft Market', 'Town Square, Portland', new Date(2023, 11, 20, 10, 0), 'A market for local crafts.', 35, 4),
+        new Event(8, 'Comedy Night', 'Theater, Seattle', new Date(2023, 0, 15, 20, 0), 'A night of stand-up comedy.', 15, 3),
+        new Event(9, 'Poetry Reading', 'Cafe, Denver', new Date(2023, 1, 10, 19, 0), 'A reading by local poets.', 10, 2),
+        new Event(10, 'Dance Workshop', 'Studio, Miami', new Date(2023, 2, 7, 18, 0), 'A workshop for dance enthusiasts.', 25, 3),
+      ];
+    }
+  }
+
+  static getEvents() {
+    return this.mockEvents;
+  }
+
+  static getEvent(id) {
+    const e = this.mockEvents.filter((event) => event.eventId === id);
+    return e.length > 0 ? e[0] : null;
+  }
+
+  static addEvent(event) {
+    this.mockEvents.push(event);
+  }
+
+  static deleteEvent(id) {
+    this.mockEvents = this.mockEvents.filter((event) => event.event_id !== id);
+  }
+
+  static updateEvent(event) {
+    this.mockEvents = this.mockEvents.map((e) => e.event_id === event.event_id ? event : e);
+  }
+}
diff --git a/frontend/src/services/handleLogin.js b/frontend/src/services/handleLogin.js
new file mode 100644
index 0000000..f6ca0f4
--- /dev/null
+++ b/frontend/src/services/handleLogin.js
@@ -0,0 +1,11 @@
+import axios from 'axios';
+
+export async function handleLoginVendor(data) {
+  const server = axios.create({
+    baseURL: 'http://localhost:3001',
+  });
+  let response;
+  await server.post('/vendors/login', data).then((res) => response = res.data).catch((err) => console.log('error:', err));
+  console.log('response:', response);
+  return response;
+}
diff --git a/frontend/src/services/handleRegister.js b/frontend/src/services/handleRegister.js
new file mode 100644
index 0000000..a794184
--- /dev/null
+++ b/frontend/src/services/handleRegister.js
@@ -0,0 +1,11 @@
+import axios from 'axios';
+// function that returns a boolean, true if the registration was successful, false otherwise.
+export default async function handleRegister(data) {
+  const server = axios.create({
+    baseURL: 'http://localhost:3001',
+    withCredentials: false,
+  });
+  let success;
+  await server.post('/vendors', data).then(() => success = true).catch(() => success = false);
+  return success;
+}
diff --git a/frontend/src/styles/footer.css b/frontend/src/styles/footer.css
index b802017..e7956be 100644
--- a/frontend/src/styles/footer.css
+++ b/frontend/src/styles/footer.css
@@ -1,80 +1,13 @@
-/* .Footer-links {
-    display:flex;
-    flex-direction:row;
-    width:100%;
-    height:8%;
-    bottom:0;
-    left:0;
-    position:fixed;
-    padding-top: 1%;
-    margin-top:auto;
-    border-top-style: solid;
-    border-top-color:#382E2D;
-}
-
-#footer-text {
-    display:flex;
-    flex-direction: column;
-    width: 20%;
-    font-size:.9rem;
-    margin-left: 3%;
-    margin-top:auto;
-    margin-bottom: auto;
-    text-decoration:underline;
-    font-weight:700;
-}
-.Socials{
-    height: min-content;
-    font-family:'FontAwesome';
-    display:flex;
-    width:max-content;
-    margin-top: 2%;
-    font-size: 40px;
-    margin-left: 1%;
-}
-
-#insta {
-    padding-right:8px; 
-    padding-left:6px;
-}
-#facebook{
-}
-
-.pim-link {
-    display: flex;
-    flex-direction: row;
-    height:max-content;
-    width:max-content;
-}
-#homepage-link {
-    font-size:1rem;
-    font-weight: 700;
-    margin-top:auto;
-    margin-bottom: auto;
-    margin-left:8%;
-    text-decoration:underline;
-}
-#pim-home {
-    font-size:38px;
-    margin-top:4%;
-    margin-left:8%;
-} */
-
 #Footer {
-    display:flexbox;
+    display: flex;
     flex-direction:row;
     width:100%;
     height:fit-content;
-    /* bottom:2rem; */
-    left:0;
-    /* position:absolute; */
-    /* padding-bottom:rem; */
-    /* background-color:#E8E3E2; */
     border-top-style: solid;
     border-top-color:#382E2D;
 }
 #Footer-content {
-    display:flexbox;
+    display: flex;
     flex-direction:row;
     width:fit-content;
     margin-left:auto;
@@ -85,4 +18,4 @@
    margin-left:.75rem;
    margin-right:.75rem;
    font-size:28px;
-}
+}
\ No newline at end of file
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
index b5cb75a..47a3dd5 100644
--- a/frontend/tailwind.config.js
+++ b/frontend/tailwind.config.js
@@ -12,6 +12,9 @@ module.exports = {
       'grey': {
         1: '#E8E3E2',
         2: '#C6BAB7',
+        3: '#A49A97',
+        4: '#827A78',
+        5: '#625B59',
       },
       'black': '#382E2D',
       'white': '#F8F6F6',
@@ -19,5 +22,4 @@ module.exports = {
     extend: {},
   },
   plugins: [],
-};
-
+};
\ No newline at end of file