diff --git a/frontend/src/components/Auth/PasswordResetForm.tsx b/frontend/src/components/Auth/PasswordResetForm.tsx
index 9e2fed1..07af4b3 100644
--- a/frontend/src/components/Auth/PasswordResetForm.tsx
+++ b/frontend/src/components/Auth/PasswordResetForm.tsx
@@ -1,7 +1,6 @@
 import React, { useState } from "react";
 import Input from "../Input/Input";
 import Button from "../Input/Button";
-import { useAuth } from "../../context/AuthContext";
 
 interface ResetPasswordData {
   newPassword: string;
@@ -14,7 +13,7 @@ interface ResetPasswordErrors {
 }
 
 interface SubmitProps {
-  onSubmit: () => void;
+  onSubmit: (success: boolean) => void;
   token: string;
 }
 
@@ -56,7 +55,6 @@ const PasswordResetForm: React.FC<SubmitProps> = ({ onSubmit, token }) => {
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
-    onSubmit();
 
     if (validateResetForm()) {
       try {
@@ -74,6 +72,7 @@ const PasswordResetForm: React.FC<SubmitProps> = ({ onSubmit, token }) => {
 
         if (!response.ok) {
           const data = await response.json();
+          onSubmit(false);
           throw new Error(
             data.error || "An error has occurred while resetting"
           );
diff --git a/frontend/src/components/Layout/Logo.tsx b/frontend/src/components/Layout/Logo.tsx
index 9a30737..c693d38 100644
--- a/frontend/src/components/Layout/Logo.tsx
+++ b/frontend/src/components/Layout/Logo.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import { Link } from "react-router-dom";
 
 interface LogoProps {
   variant?: "home" | "default";
@@ -8,24 +7,25 @@ interface LogoProps {
 const Logo: React.FC<LogoProps> = ({ variant = "default" }) => {
   const gradient = "text-transparent group-hover:mx-1 transition-all";
   return (
-    <Link to="/" className="cursor-pointer">
-      <div
-        id="logo"
-        className={`group py-3 text-center font-bold hover:scale-110 transition-all ${variant === "home" ? "text-[12vh]" : "text-[4vh]"}`}
-      >
-        <h6 className="text-sm bg-gradient-to-br from-blue-400 via-green-500 to-indigo-500 font-black text-transparent bg-clip-text">
-          Go on, have a...
-        </h6>
-        <div className="flex w-fit min-w-[30vw] bg-logo bg-clip-text animate-moving_text_colour bg-[length:300%_300%] justify-center leading-none transition-all">
-          <span className={gradient}>G</span>
-          <span className={gradient}>A</span>
-          <span className={gradient}>N</span>
-          <span className={gradient}>D</span>
-          <span className={gradient}>E</span>
-          <span className={gradient}>R</span>
-        </div>
+    <div
+      id="logo"
+      className={`group py-3 cursor-pointer text-center font-bold hover:scale-110 transition-all ${
+        variant === "home" ? "text-[12vh]" : "text-[4vh]"
+      }`}
+      onClick={() => {window.location.href = "/";}}
+    >
+      <h6 className="text-sm bg-gradient-to-br from-blue-400 via-green-500 to-indigo-500 font-black text-transparent bg-clip-text">
+        Go on, have a...
+      </h6>
+      <div className="flex w-fit min-w-[30vw] bg-logo bg-clip-text animate-moving_text_colour bg-[length:300%_300%] justify-center leading-none transition-all">
+        <span className={gradient}>G</span>
+        <span className={gradient}>A</span>
+        <span className={gradient}>N</span>
+        <span className={gradient}>D</span>
+        <span className={gradient}>E</span>
+        <span className={gradient}>R</span>
       </div>
-    </Link>
+    </div>
   );
 };
 
diff --git a/frontend/src/components/Navigation/Navbar.tsx b/frontend/src/components/Navigation/Navbar.tsx
index 5ce42ca..f298f77 100644
--- a/frontend/src/components/Navigation/Navbar.tsx
+++ b/frontend/src/components/Navigation/Navbar.tsx
@@ -16,7 +16,6 @@ import { useAuth } from "../../context/AuthContext";
 import QuickSettings from "../Settings/QuickSettings";
 import { useSidebar } from "../../context/SidebarContext";
 import { useQuickSettings } from "../../context/QuickSettingsContext";
-import { useNavigate } from "react-router-dom";
 
 interface NavbarProps {
   variant?: "home" | "default";
@@ -27,7 +26,6 @@ const Navbar: React.FC<NavbarProps> = ({ variant = "default" }) => {
   const { showAuthModal, setShowAuthModal } = useAuthModal();
   const { showSideBar, setShowSideBar } = useSidebar();
   const { showQuickSettings, setShowQuickSettings } = useQuickSettings();
-  const navigate = useNavigate();
 
   const handleLogout = () => {
     console.log("Logging out...");
@@ -152,7 +150,7 @@ const Navbar: React.FC<NavbarProps> = ({ variant = "default" }) => {
           extraClasses={`${
             variant === "home" ? "absolute top-[2vh] right-[10vw]" : ""
           } flex flex-row items-center`}
-          onClick={() => navigate("/go-live")}
+          onClick={() => window.location.href = "/go-live"}
         >
           <LiveIcon className="h-15 w-15 mr-2" />
           Go Live
diff --git a/frontend/src/components/Stream/ChatPanel.tsx b/frontend/src/components/Stream/ChatPanel.tsx
index f3caaf6..21f2ea7 100644
--- a/frontend/src/components/Stream/ChatPanel.tsx
+++ b/frontend/src/components/Stream/ChatPanel.tsx
@@ -5,7 +5,6 @@ import AuthModal from "../Auth/AuthModal";
 import { useAuthModal } from "../../hooks/useAuthModal";
 import { useAuth } from "../../context/AuthContext";
 import { useSocket } from "../../context/SocketContext";
-import { useNavigate } from "react-router-dom";
 
 interface ChatMessage {
   chatter_username: string;
@@ -28,7 +27,6 @@ const ChatPanel: React.FC<ChatPanelProps> = ({
   const [messages, setMessages] = useState<ChatMessage[]>([]);
   const [inputMessage, setInputMessage] = useState("");
   const chatContainerRef = useRef<HTMLDivElement>(null);
-  const navigate = useNavigate();
 
   // Join chat room when component mounts
   useEffect(() => {
@@ -147,7 +145,7 @@ const ChatPanel: React.FC<ChatPanelProps> = ({
               onClick={() =>
                 msg.chatter_username === username
                   ? null
-                  : navigate(`/user/${msg.chatter_username}`)
+                  : window.location.href = `/user/${msg.chatter_username}`
               }
             >
               <img
@@ -170,7 +168,7 @@ const ChatPanel: React.FC<ChatPanelProps> = ({
                   onClick={() =>
                     msg.chatter_username === username
                       ? null
-                      : navigate(`/user/${msg.chatter_username}`)
+                      : window.location.href = `/user/${msg.chatter_username}`
                   }
                 >
                   {msg.chatter_username}
diff --git a/frontend/src/pages/CategoryPage.tsx b/frontend/src/pages/CategoryPage.tsx
index 704c990..88b50cc 100644
--- a/frontend/src/pages/CategoryPage.tsx
+++ b/frontend/src/pages/CategoryPage.tsx
@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { useParams } from "react-router-dom";
 import ListRow from "../components/Layout/ListRow";
-import { useNavigate } from "react-router-dom";
 import DynamicPageContent from "../components/Layout/DynamicPageContent";
 
 interface StreamData {
@@ -18,7 +17,6 @@ const CategoryPage: React.FC = () => {
   const { category_name } = useParams<{ category_name: string }>();
   const [streams, setStreams] = useState<StreamData[]>([]);
   const [isLoading, setIsLoading] = useState(true);
-  const navigate = useNavigate();
 
   useEffect(() => {
     const fetchCategoryStreams = async () => {
@@ -54,7 +52,7 @@ const CategoryPage: React.FC = () => {
   }, [category_name]);
 
   const handleStreamClick = (streamerName: string) => {
-    navigate(`/${streamerName}`);
+    window.location.href = `/${streamerName}`;
   };
 
   if (isLoading) {
diff --git a/frontend/src/pages/HomePage.tsx b/frontend/src/pages/HomePage.tsx
index 7e681b3..fcee1a2 100644
--- a/frontend/src/pages/HomePage.tsx
+++ b/frontend/src/pages/HomePage.tsx
@@ -15,11 +15,11 @@ const HomePage: React.FC<HomePageProps> = ({ variant = "default" }) => {
   const navigate = useNavigate();
 
   const handleStreamClick = (streamerName: string) => {
-    navigate(`/${streamerName}`);
+    window.location.href = `/${streamerName}`;
   };
 
   const handleCategoryClick = (categoryName: string) => {
-    navigate(`category/${categoryName}`);
+    navigate(`/category/${categoryName}`);
   };
 
   return (
diff --git a/frontend/src/pages/NotFoundPage.tsx b/frontend/src/pages/NotFoundPage.tsx
index 8a9599f..0507af4 100644
--- a/frontend/src/pages/NotFoundPage.tsx
+++ b/frontend/src/pages/NotFoundPage.tsx
@@ -1,11 +1,9 @@
 import React, { useState, useEffect } from "react";
-import { useNavigate } from "react-router-dom";
 import Button from "../components/Input/Button";
 // @ts-ignore
 import ChromeDinoGame from "react-chrome-dino";
 
 const NotFoundPage: React.FC = () => {
-  const navigate = useNavigate();
   const [stars, setStars] = useState<{ x: number; y: number }[]>([]);
   const starSize = 20;
 
@@ -59,7 +57,7 @@ const NotFoundPage: React.FC = () => {
           <h1 className="text-6xl font-bold mb-4">404</h1>
           <p className="text-2xl mb-8">Page Not Found</p>
           <ChromeDinoGame />
-          <Button extraClasses="z-[100]" onClick={() => navigate("/")}>
+          <Button extraClasses="z-[100]" onClick={() => window.location.href = "/"}>
             Go Home
           </Button>
         </div>
diff --git a/frontend/src/pages/ResetPasswordPage.tsx b/frontend/src/pages/ResetPasswordPage.tsx
index f7e83cc..f14d21d 100644
--- a/frontend/src/pages/ResetPasswordPage.tsx
+++ b/frontend/src/pages/ResetPasswordPage.tsx
@@ -1,16 +1,18 @@
 import React from "react";
 import PasswordResetForm from "../components/Auth/PasswordResetForm";
-import { useParams, useNavigate } from "react-router-dom";
+import { useParams } from "react-router-dom";
 
 const ResetPasswordPage: React.FC = () => {
     const { token } = useParams<{ token: string }>();
-    const navigate = useNavigate();
 
     const handlePasswordReset = (success: boolean) => {
         if (success) {
             alert("Password reset successful!");
-            navigate("/");
-        } 
+            window.location.href = "/";
+        }
+        else {
+            alert("Password reset failed.");
+        }
     };
 
     if (!token) {
diff --git a/frontend/src/pages/ResultsPage.tsx b/frontend/src/pages/ResultsPage.tsx
index cbad4d7..07fc38e 100644
--- a/frontend/src/pages/ResultsPage.tsx
+++ b/frontend/src/pages/ResultsPage.tsx
@@ -48,7 +48,7 @@ const ResultsPage: React.FC = ({}) => {
             <li
               key={index}
               className="border p-2 rounded my-2 cursor-pointer"
-              onClick={() => navigate(`/user/${user.username}`)}
+              onClick={() => window.location.href = `/user/${user.username}`}
             >
               {user.is_live ? "🔴" : ""} {user.username}
             </li>
@@ -63,7 +63,7 @@ const ResultsPage: React.FC = ({}) => {
             <li
               key={index}
               className="border p-2 rounded my-2 cursor-pointer"
-              onClick={() => navigate(`/${stream.username}`)}
+              onClick={() => window.location.href = `/${stream.username}`}
             >
               {stream.title} - {stream.username} - {stream.num_viewers} viewers
             </li>