diff --git a/package.json b/package.json
index d32c0d4..26bc52e 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
 	"version": "0.1.0",
 	"private": true,
 	"scripts": {
-		"dev": "next dev -p 4000",
+		"dev": "next dev --turbopack -p 4000",
 		"build": "next build",
 		"build:docker": "docker build -t toogether/webapp .",
 		"start": "next start -p 4000",
diff --git a/src/app/admin/layout.tsx b/src/app/admin/layout.tsx
index 15678e0..e85e057 100644
--- a/src/app/admin/layout.tsx
+++ b/src/app/admin/layout.tsx
@@ -6,6 +6,7 @@ import { FaDoorClosed, FaRegUser } from "react-icons/fa";
 import { FiSettings } from "react-icons/fi";
 import { IoMdStats } from "react-icons/io";
 import { MdInbox } from "react-icons/md";
+import { SidebarItemProps } from "../components/Sidebar/item";
 
 export default function Layout({ children }: { children: React.ReactNode }) {
 	const pathName = usePathname();
@@ -17,8 +18,14 @@ export default function Layout({ children }: { children: React.ReactNode }) {
 			{ href: "/admin/classes", title: "Classes", icon: <MdInbox /> },
 			{ href: "/admin/rooms", title: "Rooms", icon: <FaDoorClosed /> },
 		],
-		[{ href: "/admin/settings", title: "Settings", icon: <FiSettings /> }],
-	];
+		[
+			{
+				href: "/admin/settings",
+				title: "Settings",
+				icon: <FiSettings />,
+			},
+		],
+	] as SidebarItemProps[][];
 
 	return (
 		<div className="flex">
diff --git a/src/app/components/Sidebar/index.tsx b/src/app/components/Sidebar/index.tsx
index 87ee3c1..76e6577 100644
--- a/src/app/components/Sidebar/index.tsx
+++ b/src/app/components/Sidebar/index.tsx
@@ -1,9 +1,10 @@
-"use client";
-
 import { Divider, Link } from "@nextui-org/react";
 import { usePathname, useRouter } from "next/navigation";
-import { useEffect, useRef, useState } from "react";
-import { BsChevronDoubleRight } from "react-icons/bs";
+import { useEffect, useState } from "react";
+import {
+	BsLayoutSidebarInset,
+	BsReverseLayoutSidebarInsetReverse,
+} from "react-icons/bs";
 import { ThemeSwitcher } from "../ThemeSwitcher/ThemeSwitcher";
 import { SidebarItem } from "./item";
 
@@ -18,141 +19,99 @@ export const Sidebar = ({
 }) => {
 	const router = useRouter();
 	const pathName = usePathname();
-	const sidebarRef = useRef<HTMLDivElement | null>(null);
 
 	// State to manage menu openness
-	const [open, setOpen] = useState(false);
-	const [startX, setStartX] = useState(0);
-	const [isSwiping, setIsSwiping] = useState(false);
+	const [open, setOpen] = useState(true);
+	const [isMobile, setIsMobile] = useState(false);
 
-	// Effect to manage responsiveness
 	useEffect(() => {
 		const handleResize = () => {
-			if (window.innerWidth >= 1024) {
-				setOpen(true); // Menu always open on larger screens
-			} else {
-				setOpen(false); // Menu closed by default on smaller screens
+			if (window.innerWidth <= 1024 && !isMobile) {
+				setIsMobile(true);
+			} else if (window.innerWidth > 1024 && isMobile) {
+				setIsMobile(false);
 			}
 		};
 
-		handleResize(); // Set initial state based on current window size
+		handleResize();
 		window.addEventListener("resize", handleResize);
-
 		return () => window.removeEventListener("resize", handleResize);
-	}, []);
+	});
 
-	// Effect to close the menu when clicking outside
 	useEffect(() => {
-		const handleClickOutside = (event: MouseEvent) => {
-			if (sidebarRef.current && !sidebarRef.current.contains(event.target as Node)) {
-				setOpen(false); // Close the menu if clicked outside
-			}
-		};
-
-		document.addEventListener("click", handleClickOutside);
-
-		// Cleanup the event listener when component unmounts
-		return () => {
-			document.removeEventListener("click", handleClickOutside);
-		};
-	}, []);
-
-	// Handle swipe start (touchstart event)
-	const handleTouchStart = (e: React.TouchEvent) => {
-		const touchStart = e.touches[0].clientX;
-		setStartX(touchStart);
-		setIsSwiping(true);
-	};
-
-	// Handle swipe move (touchmove event)
-	const handleTouchMove = (e: React.TouchEvent) => {
-		if (!isSwiping) return;
-		const touchMove = e.touches[0].clientX;
-		const distance = touchMove - startX;
-
-		if (distance > 50 && !open) {
-			setOpen(true); // Open the menu if swiping right
-		} else if (distance < -50 && open) {
-			setOpen(false); // Close the menu if swiping left
+		if (isMobile) {
+			setOpen(false);
 		}
-	};
-
-	// Handle swipe end (touchend event)
-	const handleTouchEnd = () => {
-		setIsSwiping(false);
-	};
+	}, [isMobile]);
 
 	return (
 		<aside
-			ref={sidebarRef}
 			className={`
-                ${open ? "translate-x-0" : "-translate-x-full"}
-                fixed top-0 left-0 z-40 w-64 h-screen transition-transform
-                lg:translate-x-0 lg:static
+                ${open ? "w-96" : "w-20"}
+                top-0 left-0 z-40 h-screen transition-all bg-foreground-100
             `}
-			onTouchStart={handleTouchStart}
-			onTouchMove={handleTouchMove}
-			onTouchEnd={handleTouchEnd}
 		>
-			<div className="flex flex-col h-full px-3 py-4 overflow-y-auto bg-foreground-100 scrollbar-hide">
-				{/* Toggle Button - Hidden on large screens */}
-				<button
-					className={`
-						lg:hidden flex items-center justify-center w-12 h-12
-						fixed left-64 transform bg-foreground-200 rounded-full shadow-lg
-						transition-transform duration-500 z-50
-						-translate-x-1/2 top-1/2 -translate-y-1/2
-						${open ? "rotate-180" : "rotate-0"}
-					`}
-					onClick={() => setOpen(!open)}
+			{/* items-center lg:items-start */}
+			<div
+				className={`flex flex-col h-full px-3 py-4 overflow-y-auto scrollbar-hide ${open ? "items-start" : "items-center"}`}
+			>
+				<div
+					className={`flex flex-col gap-2 p-2 mb-4 w-full ${!open ? "items-center" : ""}`}
 				>
-					<span className="text-xl font-bold">
-						<BsChevronDoubleRight className="text-gray-900 dark:text-white" />
-					</span>
-				</button>
+					{open ? (
+						<div className="flex items-center justify-between w-full">
+							<Link
+								className="text-2xl font-semibold text-gray-900 dark:text-white rounded-lg cursor-pointer"
+								onPress={() => router.push("/")}
+							>
+								Toogether
+							</Link>
+							<button onClick={() => setOpen(!open)}>
+								<BsLayoutSidebarInset className="text-xl" />
+							</button>
+						</div>
+					) : (
+						<button onClick={() => setOpen(!open)}>
+							<BsReverseLayoutSidebarInsetReverse className="text-xl" />
+						</button>
+					)}
 
-				<div className="flex flex-col gap-2 p-2">
-					<Link
-						className="text-2xl font-semibold text-gray-900 dark:text-white rounded-lg cursor-pointer"
-						onPress={() => router.push("/")}
-					>
-						Toogether
-					</Link>
-					<p className="text-sm text-foreground-400 dark:text-gray-400">
-						Manage classes, rooms, and users
-					</p>
+					{open && (
+						<p className="text-sm text-foreground-400 dark:text-gray-400">
+							Manage classes, rooms, and users
+						</p>
+					)}
 				</div>
 				{items.map((group, index) => (
-					<div key={index}>
+					<div key={index} className={open ? "w-full" : ""}>
 						<section className="flex flex-col">
-							<ul className="flex flex-col gap-2">
+							<ul className={`flex flex-col gap-2 w-full`}>
 								{group.map((item, index) => (
 									<li
 										key={index}
-										className={`
-                                            ${
-												pathName === item.href
-													? "bg-foreground-300"
-													: "hover:bg-foreground-200"
-											} rounded-md cursor-pointer
-                                        `}
+										className={`${
+											pathName === item.href
+												? "bg-foreground-300"
+												: "hover:bg-foreground-200"
+										} rounded-md cursor-pointer w-full flex `}
 									>
 										<SidebarItem
 											href={item.href}
 											title={item.title}
 											icon={item.icon}
 											setOpen={setOpen}
+											showTitle={open}
 										/>
 									</li>
 								))}
 							</ul>
 						</section>
 						{index < items.length - 1 && (
-							<Divider className="bg-foreground-300 mt-4" />
+							<Divider className="bg-foreground-300 my-4" />
 						)}
 					</div>
 				))}
-				<section className="mt-auto flex justify-between">
+				<section className={`mt-auto ${!open && "justify-center"}`}>
 					<ThemeSwitcher />
 				</section>
 			</div>
diff --git a/src/app/components/Sidebar/item.tsx b/src/app/components/Sidebar/item.tsx
index 2856c8c..d88b619 100644
--- a/src/app/components/Sidebar/item.tsx
+++ b/src/app/components/Sidebar/item.tsx
@@ -2,17 +2,21 @@
 import { Link } from "@nextui-org/react";
 import { useRouter } from "next/navigation";
 
+export type SidebarItemProps = {
+	title: string;
+	icon: React.ReactNode;
+	href: string;
+	setOpen: (open: boolean) => void;
+	showTitle: boolean;
+};
+
 export const SidebarItem = ({
 	title,
 	icon,
 	href,
 	setOpen,
-}: {
-	title: string;
-	icon: React.ReactNode;
-	href: string;
-	setOpen: (open: boolean) => void;
-}) => {
+	showTitle = true,
+}: SidebarItemProps) => {
 	const router = useRouter();
 
 	return (
@@ -25,7 +29,7 @@ export const SidebarItem = ({
 			className="w-full p-2 gap-3 text-md"
 		>
 			<span className="text-xl">{icon}</span>
-			{title}
+			{showTitle && <span className="text-sm">{title}</span>}
 		</Link>
 	);
 };