diff --git a/backend/src/__tests__/driver.test.ts b/backend/src/__tests__/driver.test.ts
index 9919475..f054e8b 100644
--- a/backend/src/__tests__/driver.test.ts
+++ b/backend/src/__tests__/driver.test.ts
@@ -72,7 +72,7 @@ describe("Drivers API", () => {
       });
 
       expect(response.status).toBe(500);
-      expect(response.body.title).toBe("Server Error");
+      expect(response.body.title).toBe("Unknown Error");
     });
   });
 
@@ -160,7 +160,7 @@ describe("Drivers API", () => {
       });
 
       expect(response.status).toBe(500);
-      expect(response.body.title).toBe("Server Error");
+      expect(response.body.title).toBe("Unknown Error");
     });
   });
 
diff --git a/backend/src/__tests__/profile.test.ts b/backend/src/__tests__/profile.test.ts
index 245dbd4..4dd438d 100644
--- a/backend/src/__tests__/profile.test.ts
+++ b/backend/src/__tests__/profile.test.ts
@@ -20,32 +20,60 @@ describe("GET /profile/get/:id", () => {
       id: 1,
       first_name: "John",
       last_name: "Doe",
-      user_id: "123"
+      user_id: "123",
     };
 
     const mockViolations = [
-      { 
-        violation_id: 1, 
-        description: "Speeding" 
+      {
+        violation_id: 1,
+        description: "Speeding",
       },
-      { 
+      {
         violation_id: 2,
-        description: "Red Light" 
-      }
+        description: "Red Light",
+      },
+    ];
+
+    const mockCars = [
+      {
+        id: "123",
+        driver_id: "1233",
+        car_model: "Civic",
+        color: "Blue",
+        license_plate: "123-123",
+        license_number: "123-123-123",
+        brand: "Honda",
+      },
+      {
+        id: "124",
+        driver_id: "1244",
+        car_model: "Civic",
+        color: "Red",
+        license_plate: "123-1232",
+        license_number: "123-123-1232",
+        brand: "Honda",
+      },
     ];
 
     // Mocking database responses
     pool.query = vi
       .fn()
       .mockResolvedValueOnce({ rows: [mockDriver] }) // Mock driver query
-      .mockResolvedValueOnce({ rows: mockViolations }); // Mock violations query
+      .mockResolvedValueOnce({ rows: mockViolations })
+      .mockResolvedValueOnce({ rows: mockCars }); // Mock violations query
 
     const response = await request(app).get("/profile/get/123");
 
     expect(response.status).toBe(200);
     expect(response.body.first_name).toBe(mockDriver.first_name);
     expect(response.body.violations.length).toBe(2);
-    expect(response.body.violations[0].description).toBe(mockViolations[0].description);
+    expect(response.body.cars.length).toBe(2);
+    expect(response.body.violations[0].description).toBe(
+      mockViolations[0].description
+    );
+    expect(response.body.cars[0].car_model).toBe(
+      mockCars[0].car_model
+    );
   });
 
   it("should return 404 if driver is not found", async () => {
diff --git a/backend/src/routes/registration.ts b/backend/src/routes/registration.ts
index 7232e08..65476b6 100644
--- a/backend/src/routes/registration.ts
+++ b/backend/src/routes/registration.ts
@@ -46,6 +46,7 @@ router.post("/add", async (req: Request, res: Response) => {
       driver_type,
     } = req.body as Registration;
 
+    console.log(req.body);
     if (
       ![
         license_number,
@@ -53,7 +54,6 @@ router.post("/add", async (req: Request, res: Response) => {
         first_name,
         sex,
         last_name,
-        middle_name,
         date_of_birth,
         driver_type,
       ].every(Boolean)
@@ -65,7 +65,6 @@ router.post("/add", async (req: Request, res: Response) => {
       return;
     }
 
-    console.log(user_id);
     await pool.query(
       `
       INSERT INTO registrations (user_id, license_number, school_email, first_name, last_name, middle_name, date_of_birth, driver_type, sex) 
diff --git a/frontend/src/components/AdminHeader.tsx b/frontend/src/components/AdminHeader.tsx
index f5bb6d9..8d9fcfc 100644
--- a/frontend/src/components/AdminHeader.tsx
+++ b/frontend/src/components/AdminHeader.tsx
@@ -61,7 +61,9 @@ const AdminHeader = () => {
             alt="Logo"
             className="z-50 object-contain md:w-16 md:h-16 w-12 h-12 transition-transform duration-300 hover:scale-105"
           />
-          <h1 className="text-md z-50 text-left md:text-xl hover:text-textgreen text-white">
+          <h1
+            onClick={handleHomePage}
+            className="text-md z-50 text-left md:text-xl hover:text-textgreen text-white">
             CodeGreen Gateway
           </h1>
         </div>
diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx
index 865447d..94b5407 100644
--- a/frontend/src/components/Header.tsx
+++ b/frontend/src/components/Header.tsx
@@ -89,25 +89,86 @@ const Header = () => {
   }, []);
 
   return (
-    <div>
-    <header className="flex items-center space-x-[15rem] font-syke-medium justify-start w-full p-4">
-    <div className="flex items-center">
-          <button
+    <div className="flex w-screen">
+      <header className="flex relative items-center md:justify-evenly font-syke-medium w-full p-4 z-50">
+        <div className="flex items-center md:w-auto w-full">
+          <img
             onClick={handleHomePage}
-            className="flex items-center w-[3rem] gap-4 text-white sm:text-xl"
-          >
-            <img
-              src="../assets/5.png"
-              alt="Logo"
-              className="w-15 h-15 object-contain md:w-[4rem] md:h-[4rem] transition-transform duration-300 hover:scale-105"
-            />
-            <h1 className="text-md text-left md:text-xl hover:text-textgreen">CodeGreen Gateway</h1>
-          </button>
+            src="../assets/5.png"
+            alt="Logo"
+            className="z-50 object-contain md:w-16 md:h-16 w-12 h-12 transition-transform duration-300 hover:scale-105"
+          />
+          <h1
+            onClick={handleHomePage}
+            className="text-md z-50 text-left md:text-xl hover:text-textgreen text-white">
+            CodeGreen Gateway
+          </h1>
         </div>
 
-        {!isWideScreen && (
+        {isWideScreen ? (
+          <nav className="flex flex-row space-x-20 text-white font-syke-medium z-50">
+            <Link
+              to="/about"
+              className="hover:text-textgreen transition-colors">
+              About
+            </Link>
+
+            <div
+              className="relative"
+              ref={droopdownRefPolicies}>
+              <button
+                onClick={toggleDropdownPolicies}
+                className="hover:text-textgreen transition-colors z-50">
+                Policies
+              </button>
+              {isDropdownOpenPolicies && (
+                <div className="absolute mt-2 w-48 bg-hoverbutton text-white rounded-md shadow-lg">
+                  <span
+                    onClick={handleProtocols}
+                    className="z-50 block px-4 py-2 hover:bg-buttongreen rounded-t-md cursor-pointer">
+                    Protocols
+                  </span>
+                  <span
+                    onClick={handleRules}
+                    className="z-50 block px-4 py-2 hover:bg-buttongreen rounded-b-md cursor-pointer">
+                    Rules and Regulations
+                  </span>
+                </div>
+              )}
+            </div>
+
+            <div
+              className="relative z-50"
+              ref={dropdownRef}>
+              <button
+                onClick={toggleDropdown}
+                className="hover:text-textgreen transition-colors">
+                Account
+              </button>
+              {isDropdownOpen && (
+                <div className="absolute mt-2 w-48 bg-hoverbutton text-white rounded-md shadow-lg">
+                  <span
+                    onClick={handleProfile}
+                    className="block px-4 py-2 hover:bg-buttongreen rounded-t-md cursor-pointer transition-colors">
+                    Profile
+                  </span>
+                  <span
+                    onClick={handleChangePassword}
+                    className="block px-4 py-2 hover:bg-buttongreen cursor-pointer transition-colors">
+                    Change Password
+                  </span>
+                  <span
+                    onClick={handleLogOut}
+                    className="block px-4 py-2 hover:bg-buttongreen rounded-b-md cursor-pointer transition-colors">
+                    Log Out
+                  </span>
+                </div>
+              )}
+            </div>
+          </nav>
+        ) : (
           <button
-            title="button"
+            title="menu"
             onClick={toggleMobileMenu}
             className="text-white md:hidden focus:outline-none block z-50"
           >
@@ -116,8 +177,7 @@ const Header = () => {
               className="h-6 w-6"
               fill="none"
               viewBox="0 0 24 24"
-              stroke="currentColor"
-            >
+              stroke="currentColor">
               <path
                 strokeLinecap="round"
                 strokeLinejoin="round"
@@ -127,121 +187,54 @@ const Header = () => {
             </svg>
           </button>
         )}
-
-        <nav className="hidden md:flex flex-row items-center space-x-[5rem] text-white">
-          <Link to="/homepagedriver" className="hover:text-textgreen transition-colors">
-            Inbox
-          </Link>
-          <Link to="/about" className="hover:text-textgreen transition-colors">
-            About
-          </Link>
-
-          <div className="relative z-50" ref={droopdownRefPolicies}>
-            <button
-              onClick={toggleDropdownPolicies}
-              className="hover:text-textgreen transition-colors z-50"
-            >
-              Policies
-            </button>
-            {isDropdownOpenPolicies && (
-              <div className="z-50 absolute mt-2 w-48 bg-hoverbutton text-white rounded-md shadow-lg">
-                <span
-                  onClick={handleProtocols}
-                  className="block px-4 py-2 hover:bg-buttongreen rounded-t-md cursor-pointer"
-                >
-                  Protocols
-                </span>
-                <span
-                  onClick={handleRules}
-                  className="z-50 block px-4 py-2 hover:bg-buttongreen rounded-b-md cursor-pointer"
-                >
-                  Rules and Regulations
-                </span>
-              </div>
-            )}
-          </div>
-
-          <div className="relative" ref={dropdownRef}>
-            <button onClick={toggleDropdown} className="z-50 hover:text-textgreen transition-colors">
-              Account
-            </button>
-            {isDropdownOpen && (
-              <div className="absolute mt-2 w-48 z-50 bg-hoverbutton text-white rounded-md shadow-lg">
-                <span
-                  onClick={handleProfile}
-                  className="block px-4 py-2 z-50 hover:bg-buttongreen rounded-t-md cursor-pointer transition-colors"
-                >
-                  Profile
-                </span>
-                <span
-                  onClick={handleChangePassword}
-                  className="block px-4 py-2 z-50 hover:bg-buttongreen cursor-pointer transition-colors"
-                >
-                  Change Password
-                </span>
-                <span
-                  onClick={handleLogOut}
-                  className="block px-4 py-2 z-50 hover:bg-buttongreen rounded-b-md cursor-pointer transition-colors"
-                >
-                  Log Out
-                </span>
-              </div>
-            )}
-          </div>
-        </nav>
       </header>
 
-      {isMobileMenuOpen && !isWideScreen && (
-        <nav className="flex flex-col font-syke-medium items-center space-y-5 text-white bg-hoverbutton p-4 rounded">
-          <Link to="/homepagedriver" className="hover:text-textgreen transition-colors">
-            Inbox
-          </Link>
-          <Link to="/about" className="hover:text-textgreen transition-colors">
+      {!isWideScreen && isMobileMenuOpen && (
+        <nav className="flex flex-col absolute font-syke-medium items-center space-y-5 text-white bg-hoverbutton p-4 rounded right-2 top-16 z-50">
+          <Link
+            to="/about"
+            className="hover:text-textgreen transition-colors">
             About
           </Link>
           <button
             onClick={toggleDropdownPolicies}
-            className="hover:text-textgreen transition-colors"
-          >
+            className="hover:text-textgreen transition-colors">
             Policies
           </button>
           {isDropdownOpenPolicies && (
             <div className="w-full bg-hoverbutton text-white rounded-md shadow-lg">
               <span
                 onClick={handleProtocols}
-                className="block px-4 py-2 z-50 hover:bg-buttongreen cursor-pointer transition-colors"
-              >
+                className="block px-4 py-2 hover:bg-buttongreen cursor-pointer transition-colors">
                 Protocols
               </span>
               <span
                 onClick={handleRules}
-                className="block px-4 py-2 z-50 hover:bg-buttongreen cursor-pointer transition-colors"
-              >
+                className="block px-4 py-2 hover:bg-buttongreen cursor-pointer transition-colors">
                 Rules and Regulations
               </span>
             </div>
           )}
-          <button onClick={toggleDropdown} className=" z-50 hover:text-textgreen">
+          <button
+            onClick={toggleDropdown}
+            className="hover:text-textgreen">
             Account
           </button>
           {isDropdownOpen && (
-                <div className="absolute right-0 mt-4 w-48 bg-hoverbutton text-white rounded-md shadow-lg z-10">
+            <div className="absolute right-0 mt-4 w-48 bg-hoverbutton text-white rounded-md shadow-lg z-10">
               <span
                 onClick={handleProfile}
-                className="block px-4 py-2 z-50 hover:bg-buttongreen cursor-pointer transition-colors"
-              >
+                className="block px-4 py-2 hover:bg-buttongreen cursor-pointer transition-colors">
                 Profile
               </span>
               <span
                 onClick={handleChangePassword}
-                className="block px-4 py-2 z-50 hover:bg-buttongreen cursor-pointer transition-colors"
-              >
+                className="block px-4 py-2 hover:bg-buttongreen cursor-pointer transition-colors">
                 Change Password
               </span>
               <span
                 onClick={handleLogOut}
-                className="block px-4 py-2 z-50 hover:bg-buttongreen cursor-pointer"
-              >
+                className="block px-4 py-2 hover:bg-buttongreen cursor-pointer">
                 Log Out
               </span>
             </div>
diff --git a/frontend/src/hooks/driver-hooks/useGetDriver.ts b/frontend/src/hooks/driver-hooks/useGetDriver.ts
index db21430..8e123d1 100644
--- a/frontend/src/hooks/driver-hooks/useGetDriver.ts
+++ b/frontend/src/hooks/driver-hooks/useGetDriver.ts
@@ -18,7 +18,7 @@ const useGetDriver = (id: string) => {
           navigate,
           refresh,
           auth,
-          auth?.isAdmin ? `/driver/get/${id}` : `/profile/get/${id}`,
+          auth?.isAdmin ? `/driver/get/${id}` : `/profile/get/${auth?.id}`,
           "get"
         );
 
diff --git a/frontend/src/pages/LoginPage.tsx b/frontend/src/pages/LoginPage.tsx
index 8dc04cf..17fe761 100644
--- a/frontend/src/pages/LoginPage.tsx
+++ b/frontend/src/pages/LoginPage.tsx
@@ -49,7 +49,7 @@ const LoginPage = () => {
                 id="email"
                 value={email}
                 onChange={(e) => {
-                  if (e.target.value.length <= 20) {
+                  if (e.target.value.length <= 50) {
                       setEmail(e.target.value);
                     }
                   }}                 
diff --git a/frontend/src/pages/RegisterDriver.tsx b/frontend/src/pages/RegisterDriver.tsx
index 7543f9d..f81b89d 100644
--- a/frontend/src/pages/RegisterDriver.tsx
+++ b/frontend/src/pages/RegisterDriver.tsx
@@ -100,8 +100,9 @@ const RegisterDriver = () => {
 
     try {
       await postRegistration(formData); // Send the form data to the backend
-      validateForm(); // Validate the form
-      navigate("/homepage"); // Redirect to the homepage
+      console.log(formData)
+      const isValid = validateForm(); // Validate the form
+      if (isValid) navigate("/homepage"); // Redirect to the homepage
     } catch (error) {
       console.error("Error submitting the form:", error);
     }
@@ -307,7 +308,7 @@ const RegisterDriver = () => {
                         name="school_email"
                         value={formData.school_email}
                         onChange={(e) => {
-                          if (e.target.value.length <= 20) {
+                          if (e.target.value.length <= 50) {
                             handleChange(e);
                           }
                         }}                           
diff --git a/frontend/src/pages/RegistrationList.tsx b/frontend/src/pages/RegistrationList.tsx
index ca04ccd..5e91ebc 100644
--- a/frontend/src/pages/RegistrationList.tsx
+++ b/frontend/src/pages/RegistrationList.tsx
@@ -7,9 +7,8 @@ import RegistrationListCard from "../components/RegistrationListCard";
 import { Registration } from "../types/datatypes";
 import { useApproveRegistration } from "../hooks/registration-hooks/useApproveRegistration";
 
-
 const RegistrationList = () => {
-  const { registration: registrations, loading} = useGetRegistration();
+  const { registration: registrations, loading } = useGetRegistration();
   const [selectedRegistration, setSelectedRegistration] =
     useState<Registration>();
   const { approveRegistration, processLoading } = useApproveRegistration();
@@ -27,15 +26,11 @@ const RegistrationList = () => {
     await approveRegistration(selectedRegistration.license_number);
     setTimeout(() => {
       window.location.reload();
-    }, 500); 
+    }, 500);
   };
 
   if (loading) return <Loading loading={loading} />;
 
-  if (!registrations || registrations.length === 0) {
-    return <div>No registrations found.</div>;
-  }
-
   return (
     <div className="flex flex-col items-center bg-adminlanding-bg min-h-screen">
       <div>
@@ -124,8 +119,7 @@ const RegistrationList = () => {
                         <button
                           onClick={handleAccept}
                           disabled={processLoading}
-                          className="p-2 px-4 m-2 bg-hoverbutton hover:bg-buttongreen transition-colors rounded-sm text-white font-syke-bold"
-                        >
+                          className="p-2 px-4 m-2 bg-hoverbutton hover:bg-buttongreen transition-colors rounded-sm text-white font-syke-bold">
                           {processLoading ? "Processing..." : "Accept"}
                         </button>
                         <button className="p-2 px-5  m-2 bg-hoverbutton hover:bg-red-900 transition-colors rounded-sm text-white font-syke-bold">
@@ -154,16 +148,14 @@ const RegistrationList = () => {
               </div>
               <div
                 className="w-full h-[20rem] overflow-y-auto"
-                id="listcontainer"
-              >
+                id="listcontainer">
                 <div className="flex flex-col overflow-y-auto h-80 scrollbar-thin scrollbar text-white">
                   {registrations && registrations.length > 0 ? (
                     registrations.map((registration) => (
                       <div
                         key={registration.user_id}
                         className="cursor-pointer hover:bg-secondgrey"
-                        onClick={() => handleRegisterClick(registration)}
-                      >
+                        onClick={() => handleRegisterClick(registration)}>
                         <RegistrationListCard
                           key={registration.user_id}
                           user_id={registration.user_id!}
@@ -177,7 +169,9 @@ const RegistrationList = () => {
                       </div>
                     ))
                   ) : (
-                    <p className="text-white text-center">No drivers found.</p>
+                    <p className="text-white text-center">
+                      No registrations found.
+                    </p>
                   )}
                 </div>
               </div>