diff --git a/apps/next/src/app/_components/bus-schedule.tsx b/apps/next/src/app/_components/bus-schedule.tsx
deleted file mode 100644
index b369777..0000000
--- a/apps/next/src/app/_components/bus-schedule.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-
-export const BusSchedule: React.FC = () => {
-  const stations = Array(10).fill({
-    station: "Malibagh Railgate",
-    time: "06:40 AM",
-    bus: "BUS 3, 29",
-  });
-
-  return (
-    <div className='p-4'>
-      <h2 className="text-xl font-bold mb-4">Bus Schedule</h2>
-      <div className="space-y-4">
-        {stations.map((item, index) => (
-          <div
-            key={index}
-            className="bg-surface-container text-on-surface p-4 rounded flex justify-between text-sm"
-          >
-            <div>Station: {item.station}</div>
-            <div>Time: {item.time}</div>
-            <div>Bus: {item.bus}</div>
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-};
diff --git a/apps/next/src/app/_components/class-schedule.tsx b/apps/next/src/app/_components/class-schedule.tsx
deleted file mode 100644
index 61f2a19..0000000
--- a/apps/next/src/app/_components/class-schedule.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-
-export const ClassSchedule: React.FC = () => {
-  const classes = [
-    { time: "08:30 AM", course: "CSC 283 - C++", status: "Missed" },
-    { time: "09:55 AM", course: "CSC 433 - DBMS", status: "On Time" },
-    { time: "11:20 AM", course: "MAT 247 - Numerical", status: "Ongoing" },
-  ];
-
-  return (
-    <div className="p-4">
-      <h2 className="text-xl font-bold mb-4">Class Schedule</h2>
-      <div className="space-y-4">
-        {classes.map((item, index) => (
-          <div
-            key={index}
-            className={`p-4 rounded flex justify-between text-sm ${
-              item.status === "Missed"
-                ? "bg-red-500"
-                : item.status === "On Time"
-                ? "bg-green-500"
-                : "bg-yellow-500"
-            }`}
-          >
-            <div>{item.time}</div>
-            <div>{item.course}</div>
-            <div className="capitalize">{item.status}</div>
-          </div>
-        ))}
-      </div>
-      <div className="flex space-x-4 mt-6">
-        <button className=" px-4 py-2 rounded">
-          Modify
-        </button>
-        <button className=" px-4 py-2 rounded">
-          Add
-        </button>
-        <button className=" px-4 py-2 rounded">
-          Delete
-        </button>
-      </div>
-    </div>
-  );
-};
diff --git a/apps/next/src/app/_components/header.tsx b/apps/next/src/app/_components/header.tsx
index 333ee16..dc8da88 100644
--- a/apps/next/src/app/_components/header.tsx
+++ b/apps/next/src/app/_components/header.tsx
@@ -8,8 +8,8 @@ import { Button } from "@ubus/ui/button";
 import { Logo } from "./logo";
 import { DashboardNavbar, LandingNavbar } from "./navbar";
 
-export const DashboardHeader = ({ className }: { className?: string }) => {
-  return <DashboardNavbar className={className} />;
+export const DashboardHeader = () => {
+  return <DashboardNavbar />;
 };
 
 export const LandingHeader = () => {
diff --git a/apps/next/src/app/_components/navbar.tsx b/apps/next/src/app/_components/navbar.tsx
index 21a2176..1398829 100644
--- a/apps/next/src/app/_components/navbar.tsx
+++ b/apps/next/src/app/_components/navbar.tsx
@@ -1,38 +1,15 @@
-"use client";
-
-import { useEffect, useState } from "react";
-
 import { landingNavLinks } from "@ubus/configs";
-import { cn } from "@ubus/ui";
-import { Button } from "@ubus/ui/button";
 
+import { LogoutButton } from "./logout-button";
 import { NavLink } from "./navlink";
 import { UserAvatar } from "./user-avatar";
 
-export const DashboardNavbar = ({ className }: { className?: string }) => {
-  const [mounted, setMounted] = useState(false);
-  const [currentTime, setCurrentTime] = useState(new Date().toISOString());
-
-  useEffect(() => {
-    setMounted(true);
-    const intervalId = setInterval(() => {
-      setCurrentTime(new Date().toISOString());
-    }, 1000);
-
-    return clearInterval(intervalId);
-  }, [currentTime]);
-
-  if (!mounted) return null;
-
+export const DashboardNavbar = () => {
   return (
-    <div
-      className={cn(
-        "container flex h-20 w-full justify-between bg-red-300",
-        className,
-      )}
-    >
-      <Button variant="outline">{currentTime}</Button>
+    <div className="container flex h-20 w-full justify-between">
+      UBus
       <UserAvatar />
+      <LogoutButton />
     </div>
   );
 };
diff --git a/apps/next/src/app/_components/sidebar.tsx b/apps/next/src/app/_components/sidebar.tsx
deleted file mode 100644
index dc805fe..0000000
--- a/apps/next/src/app/_components/sidebar.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { cn } from "@ubus/ui";
-
-export const Sidebar = ({ className }: { className?: string }) => {
-  return (
-    <aside className={cn("flex h-full w-52 flex-col py-4", className)}>
-      <ul className="space-y-2">
-        <li className="cursor-pointer px-4 py-2 hover:bg-gray-700">
-          Dashboard
-        </li>
-        <li className="cursor-pointer bg-gray-700 px-4 py-2 font-bold">
-          Schedule
-        </li>
-        <li className="cursor-pointer px-4 py-2 hover:bg-gray-700">Settings</li>
-        <li className="cursor-pointer px-4 py-2 hover:bg-gray-700">Support</li>
-      </ul>
-    </aside>
-  );
-};
diff --git a/apps/next/src/app/dashboard/page.tsx b/apps/next/src/app/dashboard/page.tsx
index 151d08e..69531e2 100644
--- a/apps/next/src/app/dashboard/page.tsx
+++ b/apps/next/src/app/dashboard/page.tsx
@@ -1,6 +1,7 @@
+import { DashboardHeader } from "../_components/header";
 
 const Dashboard = () => {
-  return <div>HEllo world</div>;
+  return <DashboardHeader />;
 };
 
 export default Dashboard;
diff --git a/apps/next/src/app/dashboard/schedule/page.tsx b/apps/next/src/app/dashboard/schedule/page.tsx
deleted file mode 100644
index a26bda6..0000000
--- a/apps/next/src/app/dashboard/schedule/page.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { BusSchedule } from "~/app/_components/bus-schedule";
-import { ClassSchedule } from "~/app/_components/class-schedule";
-import { DashboardHeader } from "~/app/_components/header";
-import { Sidebar } from "~/app/_components/sidebar";
-
-export default function SchedulePage() {
-  return (
-    <div className="max-h-dvh p-4">
-      <div className="grid h-full grid-cols-[13rem_1fr_1fr] grid-rows-[5rem_1fr] rounded-2xl border">
-        <DashboardHeader className="col-span-3" />
-        <Sidebar className="row-span-2" />
-        <div className="p-4">
-          <BusSchedule />
-        </div>
-        <div className="p-4">
-          <ClassSchedule />
-        </div>
-      </div>
-    </div>
-  );
-}