diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 9beb0b5..16d88d8 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -10,11 +10,12 @@ import ResetPasswordPage from "./pages/ResetPasswordPage";
 import CategoryPage from "./pages/CategoryPage";
 import CategoriesPage from "./pages/AllCategoriesPage";
 import ResultsPage from "./pages/ResultsPage";
-import { SidebarProvider, useSidebar } from "./context/SidebarContext";
+import { SidebarProvider } from "./context/SidebarContext";
 import { QuickSettingsProvider } from "./context/QuickSettingsContext";
 import StreamDashboardPage from "./pages/StreamDashboardPage";
 import { Brightness } from "./context/BrightnessContext";
 import Sidebar from "./components/Navigation/Sidebar";
+import LoadingScreen from "./components/Layout/LoadingScreen";
 
 function App() {
   const [isLoggedIn, setIsLoggedIn] = useState(false);
@@ -40,7 +41,7 @@ function App() {
   }, []);
 
   if (isLoading) {
-    return <div className="flex w-full h-full">Loading...</div>;
+    return <LoadingScreen />;
   }
 
   return (
diff --git a/frontend/src/components/Layout/LoadingScreen.tsx b/frontend/src/components/Layout/LoadingScreen.tsx
new file mode 100644
index 0000000..20bee00
--- /dev/null
+++ b/frontend/src/components/Layout/LoadingScreen.tsx
@@ -0,0 +1,17 @@
+import React from "react";
+
+interface LoadingScreenProps {
+  children?: React.ReactNode;
+}
+
+const LoadingScreen: React.FC<LoadingScreenProps> = ({
+  children = "Loading...",
+}) => {
+  return (
+    <div className="h-screen w-screen flex items-center justify-center text-white">
+      {children}
+    </div>
+  );
+};
+
+export default LoadingScreen;
diff --git a/frontend/src/components/Navigation/Sidebar.tsx b/frontend/src/components/Navigation/Sidebar.tsx
index 19d60d4..67bc78d 100644
--- a/frontend/src/components/Navigation/Sidebar.tsx
+++ b/frontend/src/components/Navigation/Sidebar.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Sidebar as SidebarIcon } from "lucide-react";
 import { useNavigate } from "react-router-dom";
 import { useAuth } from "../../context/AuthContext";
diff --git a/frontend/src/components/Stream/StreamerRoute.tsx b/frontend/src/components/Stream/StreamerRoute.tsx
index f019152..bdcbe8e 100644
--- a/frontend/src/components/Stream/StreamerRoute.tsx
+++ b/frontend/src/components/Stream/StreamerRoute.tsx
@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 import VideoPage from "../../pages/VideoPage";
+import LoadingScreen from "../Layout/LoadingScreen";
 
 const StreamerRoute: React.FC = () => {
   const { streamerName } = useParams();
@@ -32,13 +33,7 @@ const StreamerRoute: React.FC = () => {
     return () => clearInterval(interval);
   }, [streamerName]);
 
-  if (isLoading) {
-    return (
-      <div className="h-screen w-screen flex text-6xl items-center justify-center">
-        Loading...
-      </div>
-    );
-  }
+  if (isLoading) return <LoadingScreen />;
 
   // streamId=0 is a special case for the streamer's latest stream
   if (isLive) {
diff --git a/frontend/src/context/ContentContext.tsx b/frontend/src/context/ContentContext.tsx
index 4e475e8..442245f 100644
--- a/frontend/src/context/ContentContext.tsx
+++ b/frontend/src/context/ContentContext.tsx
@@ -72,6 +72,7 @@ export function ContentProvider({ children }: { children: React.ReactNode }) {
     const categoriesUrl = isLoggedIn
       ? "/api/categories/recommended"
       : "/api/categories/popular/4";
+    console.log("Fetching categories from", categoriesUrl);
 
     fetch(categoriesUrl)
       .then((response) => response.json())
@@ -86,6 +87,7 @@ export function ContentProvider({ children }: { children: React.ReactNode }) {
             .replace(/ /g, "_")}.webp`,
         }));
         setCategories(processedCategories);
+        console.log("Categories fetched", processedCategories);
       });
   }, [isLoggedIn]);
 
diff --git a/frontend/src/context/SocketContext.tsx b/frontend/src/context/SocketContext.tsx
index 84708bb..a2a0108 100644
--- a/frontend/src/context/SocketContext.tsx
+++ b/frontend/src/context/SocketContext.tsx
@@ -6,6 +6,7 @@ import React, {
   useState,
 } from "react";
 import { io, Socket } from "socket.io-client";
+import LoadingScreen from "../components/Layout/LoadingScreen";
 
 interface SocketContextType {
   socket: Socket | null;
@@ -86,13 +87,7 @@ export const SocketProvider: React.FC<{ children: React.ReactNode }> = ({
     };
   }, []);
 
-  if (isLoading) {
-    return (
-      <div className="h-screen w-screen flex items-center justify-center">
-        <div className="text-4xl text-white">Connecting to socket...</div>
-      </div>
-    );
-  }
+  if (isLoading) return <LoadingScreen>Connecting to Socket...</LoadingScreen>;
 
   return (
     <SocketContext.Provider value={{ socket, isConnected }}>
diff --git a/frontend/src/pages/AllCategoriesPage.tsx b/frontend/src/pages/AllCategoriesPage.tsx
index c5bdc2c..3e05cd4 100644
--- a/frontend/src/pages/AllCategoriesPage.tsx
+++ b/frontend/src/pages/AllCategoriesPage.tsx
@@ -3,6 +3,7 @@ import { useNavigate } from "react-router-dom";
 import ListRow from "../components/Layout/ListRow";
 import DynamicPageContent from "../components/Layout/DynamicPageContent";
 import { fetchContentOnScroll } from "../hooks/fetchContentOnScroll";
+import LoadingScreen from "../components/Layout/LoadingScreen";
 
 interface categoryData {
   type: "category";
@@ -78,13 +79,7 @@ const AllCategoriesPage: React.FC = () => {
 
   fetchContentOnScroll(loadOnScroll, hasMoreData);
 
-  if (hasMoreData && !categories.length) {
-    return (
-      <div className="h-screen w-screen flex items-center justify-center text-white">
-        Loading...
-      </div>
-    );
-  }
+  if (hasMoreData && !categories.length) return <LoadingScreen />;
 
   const handleCategoryClick = (categoryName: string) => {
     console.log(categoryName);
diff --git a/frontend/src/pages/CategoryPage.tsx b/frontend/src/pages/CategoryPage.tsx
index 0481760..1925337 100644
--- a/frontend/src/pages/CategoryPage.tsx
+++ b/frontend/src/pages/CategoryPage.tsx
@@ -7,6 +7,7 @@ import Button from "../components/Input/Button";
 import { useAuth } from "../context/AuthContext";
 import { useCategoryFollow } from "../hooks/useCategoryFollow";
 import { ListItemProps as StreamData } from "../components/Layout/ListItem";
+import LoadingScreen from "../components/Layout/LoadingScreen";
 
 const CategoryPage: React.FC = () => {
   const { categoryName } = useParams<{ categoryName: string }>();
@@ -92,13 +93,7 @@ const CategoryPage: React.FC = () => {
     window.location.href = `/${streamerName}`;
   };
 
-  if (hasMoreData && !streams.length) {
-    return (
-      <div className="h-screen w-screen flex items-center justify-center text-white">
-        Loading...
-      </div>
-    );
-  }
+  if (hasMoreData && !streams.length) return <LoadingScreen />;
 
   return (
     <DynamicPageContent className="min-h-screen bg-gradient-radial from-[#ff00f1] via-[#0400ff] to-[#ff0000] bg-[url(/images/background-pattern.svg)]">
diff --git a/frontend/src/pages/HomePage.tsx b/frontend/src/pages/HomePage.tsx
index 598ed9b..d2ed15c 100644
--- a/frontend/src/pages/HomePage.tsx
+++ b/frontend/src/pages/HomePage.tsx
@@ -4,6 +4,7 @@ import { useNavigate } from "react-router-dom";
 import { useStreams, useCategories } from "../context/ContentContext";
 import Button from "../components/Input/Button";
 import DynamicPageContent from "../components/Layout/DynamicPageContent";
+import LoadingScreen from "../components/Layout/LoadingScreen";
 
 interface HomePageProps {
   variant?: "default" | "personalised";
@@ -23,7 +24,7 @@ const HomePage: React.FC<HomePageProps> = ({ variant = "default" }) => {
   };
 
   if (!categories || categories.length === 0) {
-    return <div>Loading categories...</div>;
+    return <LoadingScreen>Loading Categories...</LoadingScreen>;
   }
 
   return (
diff --git a/frontend/src/pages/UserPage.tsx b/frontend/src/pages/UserPage.tsx
index ba97963..4fd4ecb 100644
--- a/frontend/src/pages/UserPage.tsx
+++ b/frontend/src/pages/UserPage.tsx
@@ -8,6 +8,7 @@ import { useFollow } from "../hooks/useFollow";
 import { useNavigate } from "react-router-dom";
 import Button, { EditButton } from "../components/Input/Button";
 import DynamicPageContent from "../components/Layout/DynamicPageContent";
+import LoadingScreen from "../components/Layout/LoadingScreen";
 
 interface UserProfileData {
   id: number;
@@ -100,13 +101,8 @@ const UserPage: React.FC = () => {
     if (loggedInUsername && username) checkFollowStatus(username);
   }, [username]);
 
-  if (!profileData) {
-    return (
-      <div className="h-screen w-screen flex items-center justify-center text-white">
-        Loading...
-      </div>
-    );
-  }
+  if (!profileData) return <LoadingScreen />;
+
   return (
     <DynamicPageContent
       className={`min-h-screen ${
@@ -226,7 +222,7 @@ const UserPage: React.FC = () => {
                       id={profileData.id}
                       type="stream"
                       title={profileData.currentStreamTitle || ""}
-                      streamer=""
+                      username=""
                       viewers={profileData.currentStreamViewers || 0}
                       thumbnail={profileData.currentStreamThumbnail}
                       onItemClick={() => {
diff --git a/frontend/src/pages/VideoPage.tsx b/frontend/src/pages/VideoPage.tsx
index 92bc382..18c3bf3 100644
--- a/frontend/src/pages/VideoPage.tsx
+++ b/frontend/src/pages/VideoPage.tsx
@@ -37,7 +37,7 @@ const VideoPage: React.FC<VideoPageProps> = ({ streamerId }) => {
   const { showAuthModal, setShowAuthModal } = useAuthModal();
   const [isStripeReady, setIsStripeReady] = useState(false);
   const [showCheckout, setShowCheckout] = useState(false);
-  const showReturn = window.location.search.includes("session_id");
+  // const showReturn = window.location.search.includes("session_id"); //! Not used
   const navigate = useNavigate();
   const [isSubscribed, setIsSubscribed] = useState(false);
   const [timeStarted, setTimeStarted] = useState("");