diff --git a/src/components/core/card/RawCard.tsx b/src/components/core/card/RawCard.tsx
index f9c10c4..32225ca 100644
--- a/src/components/core/card/RawCard.tsx
+++ b/src/components/core/card/RawCard.tsx
@@ -95,7 +95,7 @@ export function RawCard({
                   color="gray"
                   aria-label="Edit Field"
                   component={Link}
-                  href={`/t/edit?fld=${props.id}`}
+                  href={`/team/edit?fld=${props.id}`}
                 >
                   <IconPencil
                     style={{ width: "70%", height: "70%" }}
diff --git a/src/components/layout/admin/navbar.tsx b/src/components/layout/admin/navbar.tsx
deleted file mode 100644
index fe63cd4..0000000
--- a/src/components/layout/admin/navbar.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-"use client";
-
-import { AppShellNavbar, Group, Image, Text } from "@mantine/core";
-
-import ThemeIcon from "@/components/core/ThemeIcon";
-import classes from "@/styles/BuildTeamNavbar.module.css";
-import { adminNavLinks } from "@/util/links";
-
-export interface AdminNavbar {
-  currentLink: string;
-}
-
-/**
- * Navbar of Admin Pages
- */
-export default function AdminNavbar(props: AdminNavbar) {
-  const links = adminNavLinks.map((item) => (
-    <a
-      className={classes.navbarLink}
-      data-active={item.link === props.currentLink}
-      href={"/tools" + item.link}
-      key={item.label}
-    >
-      <item.icon className={classes.navbarLinkIcon} stroke={1.5} />
-      <span>{item.label}</span>
-    </a>
-  ));
-
-  return (
-    <AppShellNavbar p={0} h="100%">
-      <div className={classes.navbarTop}>
-        <Group className={classes.navbarHead} justify="space-between">
-          <Group>
-            <Image src="/logo.png" h={32} alt="BuildTheEarth Logo" />
-            <Text fw="bold" fz="xl" lineClamp={1}>
-              Admin
-            </Text>
-          </Group>
-          <ThemeIcon />
-        </Group>
-        <div className={classes.navbarLinks}>{links}</div>
-      </div>
-    </AppShellNavbar>
-  );
-}
diff --git a/src/components/layout/buildTeam/navbar.tsx b/src/components/layout/buildTeam/navbar.tsx
deleted file mode 100644
index 7424e9b..0000000
--- a/src/components/layout/buildTeam/navbar.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-"use client";
-
-import { ActionIcon, AppShellNavbar, Group, Image, Text } from "@mantine/core";
-
-import ThemeIcon from "@/components/core/ThemeIcon";
-import { UserButton } from "@/components/core/UserButton";
-import useAvailableBuildTeam from "@/hooks/useAvailableBuildTeam";
-import classes from "@/styles/BuildTeamNavbar.module.css";
-import { buildTeamNavLinks } from "@/util/links";
-import { IconLock } from "@tabler/icons-react";
-import { useSession } from "next-auth/react";
-import { useRouter } from "next/router";
-
-export interface BuildTeamNavbar {
-  currentLink: string;
-}
-
-/**
- * Navbar of BuildTeam Pages
- */
-export default function BuildTeamNavbar(props: BuildTeamNavbar) {
-  const { activeBuildTeam } = useAvailableBuildTeam();
-  const router = useRouter();
-  const { data: session } = useSession();
-
-  const links = buildTeamNavLinks.map((item) => (
-    <a
-      className={classes.navbarLink}
-      data-active={item.link === props.currentLink}
-      href={"/t" + item.link}
-      key={item.label}
-    >
-      <item.icon className={classes.navbarLinkIcon} stroke={1.5} />
-      <span>{item.label}</span>
-    </a>
-  ));
-
-  return (
-    <AppShellNavbar p={0} h="100%">
-      <div className={classes.navbarTop}>
-        <Group className={classes.navbarHead} justify="space-between">
-          <Group>
-            <Image src="/logo.png" h={32} alt="BTE Logo" />
-            <Text fw="bold" fz="xl" lineClamp={1}>
-              BuildTheEarth
-            </Text>
-          </Group>
-          <ThemeIcon />
-        </Group>
-        <div className={classes.navbarLinks}>{links}</div>
-      </div>
-
-      <div className={classes.navbarBottom}>
-        <UserButton
-          title={activeBuildTeam?.name || "Select Build Team..."}
-          image={activeBuildTeam?.icon || ""}
-          subtitle={session?.user ? `viewing as ${session.user.username}` : ""}
-        />
-      </div>
-    </AppShellNavbar>
-  );
-}
diff --git a/src/components/layout/index.tsx b/src/components/layout/index.tsx
index c8c24f0..1af9824 100644
--- a/src/components/layout/index.tsx
+++ b/src/components/layout/index.tsx
@@ -1,15 +1,11 @@
 import { AppShell, Box, ScrollArea } from "@mantine/core";
 
-import AdminNavbar from "./admin/navbar";
-import BuildTeamNavbar from "./buildTeam/navbar";
-import ToolsNavbar from "./tools/navbar";
+import { default as Navbar } from "./navbar";
 
 export interface LayoutProps {
   children: React.ReactNode;
   currentLink: string;
-  tools?: boolean;
-  admin?: boolean;
-  team?: boolean;
+  currentSpace: "me" | "team";
   isLoading?: boolean;
   loader?: React.ReactNode;
 }
@@ -18,16 +14,6 @@ export interface LayoutProps {
  * Root layout of BuildTeam Pages
  */
 export default function Layout(props: LayoutProps) {
-  const Navbar = props.team
-    ? BuildTeamNavbar
-    : props.tools
-      ? ToolsNavbar
-      : props.admin
-        ? AdminNavbar
-        : () => {
-            return <></>;
-          };
-
   return (
     <AppShell
       navbar={{
@@ -38,7 +24,10 @@ export default function Layout(props: LayoutProps) {
       h="100vh"
     >
       <AppShell.Navbar p={0}>
-        <Navbar currentLink={props.currentLink} />
+        <Navbar
+          currentLink={props.currentLink}
+          currentSpace={props.currentSpace}
+        />
       </AppShell.Navbar>
 
       <AppShell.Main h="100vh" style={{ overflow: "hidden" }}>
diff --git a/src/components/layout/navbar.tsx b/src/components/layout/navbar.tsx
new file mode 100644
index 0000000..7a01eb0
--- /dev/null
+++ b/src/components/layout/navbar.tsx
@@ -0,0 +1,72 @@
+"use client";
+
+import { AppShellNavbar, Group, Image, Text } from "@mantine/core";
+import { IconLogout, IconSwitchHorizontal } from "@tabler/icons-react";
+
+import classes from "@/styles/Navbar.module.css";
+import { navLinks } from "@/util/links";
+import { signOut } from "next-auth/react";
+import Anchor from "../core/Anchor";
+
+export interface ToolsNavbar {
+  currentLink: string;
+  currentSpace: "me" | "team";
+}
+
+/**
+ * Main Navbar
+ */
+export default function ToolsNavbar(props: ToolsNavbar) {
+  const links = navLinks[props.currentSpace].map((item) => (
+    <a
+      className={classes.navbarLink}
+      data-active={item.link == props.currentLink}
+      href={item.link}
+      key={item.label}
+    >
+      <item.icon className={classes.navbarLinkIcon} stroke={1.5} />
+      <span>{item.label}</span>
+    </a>
+  ));
+
+  return (
+    <AppShellNavbar p={"sm"} h="100%">
+      <div className={classes.navbarTop}>
+        <Group className={classes.navbarHead} justify="space-between">
+          <Group>
+            <Image src="/logo.png" h={32} alt="BuildTheEarth Logo" />
+            <Text fw="bold" fz="xl" lineClamp={1}>
+              MyBuildTheEarth
+            </Text>
+          </Group>
+        </Group>
+
+        <div className={classes.navbarLinks}>{links}</div>
+      </div>
+      <div className={classes.navbarBottom}>
+        {props.currentSpace == "team" ? (
+          <Anchor href="/" className={classes.navbarLink} underline="never">
+            <IconSwitchHorizontal
+              className={classes.navbarLinkIcon}
+              stroke={1.5}
+            />
+            <span>My Dashboard</span>
+          </Anchor>
+        ) : (
+          <Anchor href="/team" className={classes.navbarLink} underline="never">
+            <IconSwitchHorizontal
+              className={classes.navbarLinkIcon}
+              stroke={1.5}
+            />
+            <span>Team Dashboard</span>
+          </Anchor>
+        )}
+
+        <a className={classes.navbarLink} onClick={() => signOut()}>
+          <IconLogout className={classes.navbarLinkIcon} stroke={1.5} />
+          <span>Logout</span>
+        </a>
+      </div>
+    </AppShellNavbar>
+  );
+}
diff --git a/src/components/layout/tools/navbar.tsx b/src/components/layout/tools/navbar.tsx
deleted file mode 100644
index 9b36cfd..0000000
--- a/src/components/layout/tools/navbar.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-"use client";
-
-import { ActionIcon, AppShellNavbar, Group, Image, Text } from "@mantine/core";
-
-import ThemeIcon from "@/components/core/ThemeIcon";
-import classes from "@/styles/BuildTeamNavbar.module.css";
-import { toolsNavLiks } from "@/util/links";
-import { IconLock } from "@tabler/icons-react";
-
-export interface ToolsNavbar {
-  currentLink: string;
-}
-
-/**
- * Navbar of Tools Pages
- */
-export default function ToolsNavbar(props: ToolsNavbar) {
-  const links = toolsNavLiks.map((item) => (
-    <a
-      className={classes.navbarLink}
-      data-active={item.link == props.currentLink}
-      href={"/tools" + item.link}
-      key={item.label}
-    >
-      <item.icon className={classes.navbarLinkIcon} stroke={1.5} />
-      <span>{item.label}</span>
-    </a>
-  ));
-
-  return (
-    <AppShellNavbar p={0} h="100%">
-      <div className={classes.navbarTop}>
-        <Group className={classes.navbarHead} justify="space-between">
-          <Group>
-            <Image src="/logo.png" h={32} alt="BuildTheEarth Logo" />
-            <Text fw="bold" fz="xl" lineClamp={1}>
-              Tools
-            </Text>
-          </Group>
-          <ThemeIcon />
-        </Group>
-        <div className={classes.navbarLinks}>{links}</div>
-      </div>
-    </AppShellNavbar>
-  );
-}
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 8f5a51a..e7cb59b 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -61,7 +61,10 @@ export default function Debug() {
             fz="sm"
             c="dimmed"
             onClick={() =>
-              signIn("keycloak", { callbackUrl: "/t/select", redirect: true })
+              signIn("keycloak", {
+                callbackUrl: "/team/select",
+                redirect: true,
+              })
             }
             style={{ cursor: "pointer" }}
           >
diff --git a/src/pages/t/index.tsx b/src/pages/team/index.tsx
similarity index 97%
rename from src/pages/t/index.tsx
rename to src/pages/team/index.tsx
index 7d56899..92725a2 100644
--- a/src/pages/t/index.tsx
+++ b/src/pages/team/index.tsx
@@ -24,7 +24,12 @@ export default function Home() {
   const { data, isLoading } = useBuildTeamData("/");
 
   return (
-    <Layout currentLink="/" team isLoading={isLoading} loader={<Loader />}>
+    <Layout
+      currentLink="/team"
+      currentSpace="team"
+      isLoading={isLoading}
+      loader={<Loader />}
+    >
       <Grid>
         <GridCol span={6}>
           <TextCard
@@ -197,7 +202,7 @@ export default function Home() {
                 </Anchor>
               </RawCard>
             </GridCol>
-          ),
+          )
         )}
       </Grid>
       <Divider mt="xl" mb="xs" />
@@ -244,7 +249,7 @@ export default function Home() {
               fw="bold"
               className="xl2"
               lineClamp={1}
-              href={`/t/members/${data?.creatorId}`}
+              href={`/team/members/${data?.creatorId}`}
               target="_blank"
             >
               {isLoading
diff --git a/src/pages/t/members/[id].tsx b/src/pages/team/members/[id].tsx
similarity index 99%
rename from src/pages/t/members/[id].tsx
rename to src/pages/team/members/[id].tsx
index e9c5e74..f3e4d65 100644
--- a/src/pages/t/members/[id].tsx
+++ b/src/pages/team/members/[id].tsx
@@ -59,7 +59,7 @@ export default function Home() {
   );
 
   return (
-    <Layout currentLink="/members" team>
+    <Layout currentLink="/team/members" currentSpace="team">
       <Group mb="md" justify="space-between">
         <Group gap="xs">
           <ActionIcon variant="default" aria-label="Go back">
@@ -292,7 +292,7 @@ export default function Home() {
                           disabled={
                             application.buildteam.id != activeBuildTeam?.id
                           }
-                          href={`/t/applications/${application.id}`}
+                          href={`/team/applications/${application.id}`}
                         >
                           <IconEye size={16} />
                         </ActionIcon>
diff --git a/src/pages/t/members/index.tsx b/src/pages/team/members/index.tsx
similarity index 96%
rename from src/pages/t/members/index.tsx
rename to src/pages/team/members/index.tsx
index 40eb8fa..9bbe2e7 100644
--- a/src/pages/t/members/index.tsx
+++ b/src/pages/team/members/index.tsx
@@ -27,7 +27,7 @@ export default function Home() {
   const { data, isLoading } = useBuildTeamData(`/members?page=${page}`);
 
   return (
-    <Layout currentLink="/members" team>
+    <Layout currentLink="/team/members" currentSpace="team">
       <DataTable
         withTableBorder
         borderRadius="sm"
@@ -101,7 +101,7 @@ export default function Home() {
                   variant="subtle"
                   color="gray"
                   component={Link}
-                  href={`/t/members/${record.id}`}
+                  href={`/team/members/${record.id}`}
                 >
                   <IconEye size={16} />
                 </ActionIcon>
diff --git a/src/pages/t/select.tsx b/src/pages/team/select.tsx
similarity index 100%
rename from src/pages/t/select.tsx
rename to src/pages/team/select.tsx
diff --git a/src/pages/t/tools.tsx b/src/pages/team/tools.tsx
similarity index 94%
rename from src/pages/t/tools.tsx
rename to src/pages/team/tools.tsx
index 8b664d3..e42b843 100644
--- a/src/pages/t/tools.tsx
+++ b/src/pages/team/tools.tsx
@@ -20,20 +20,20 @@ export default function Home() {
       "/teams/[team]/manage/settings",
     ].map(
       (route) =>
-        "/" + lang + route.replaceAll("[team]", activeBuildTeam?.slug || ""),
-    ),
+        "/" + lang + route.replaceAll("[team]", activeBuildTeam?.slug || "")
+    )
   );
   const [loading, setLoading] = useState(false);
 
   const handleRerender = async () => {
     setLoading(true);
     await fetch(`/api/rerender?routes=${JSON.stringify(routes)}`).then((res) =>
-      setLoading(false),
+      setLoading(false)
     );
   };
 
   return (
-    <Layout currentLink="/tools" team>
+    <Layout currentLink="/team/tools" currentSpace="team">
       <Grid>
         <GridCol span={3}>
           <RawCard
diff --git a/src/pages/tools/assets.tsx b/src/pages/tools/assets.tsx
index 9c71c2d..4e18cfa 100644
--- a/src/pages/tools/assets.tsx
+++ b/src/pages/tools/assets.tsx
@@ -7,10 +7,10 @@ import {
   TextInput,
 } from "@mantine/core";
 
-import Layout from "@/components/layout";
-import { useState } from "react";
 import DynamicIcon from "@/components/core/DynamicIcon";
 import { IconError404 } from "@tabler/icons-react";
+import Layout from "@/components/layout";
+import { useState } from "react";
 
 interface Category {
   id: string;
@@ -29,8 +29,10 @@ export default function Assets() {
   };
 
   return (
-    <Layout currentLink="/assets" tools>
-      <Button onClick={handleGetCategories} fullWidth={false}>Get Categories</Button>
+    <Layout currentLink="/tools/assets" currentSpace="me">
+      <Button onClick={handleGetCategories} fullWidth={false}>
+        Get Categories
+      </Button>
       <Paper withBorder p="md" radius="sm">
         <SimpleGrid cols={1}>
           {categoriesResult.map((category) => {
diff --git a/src/pages/tools/coordinates.tsx b/src/pages/tools/coordinates.tsx
index e7f8f7b..fc63837 100644
--- a/src/pages/tools/coordinates.tsx
+++ b/src/pages/tools/coordinates.tsx
@@ -33,7 +33,7 @@ export default function Coordinates() {
   };
 
   return (
-    <Layout currentLink="/coordinates" tools>
+    <Layout currentLink="/tools/coordinates" currentSpace="me">
       <SimpleGrid cols={2}>
         <Paper withBorder p="md" radius="sm">
           <Text size="xs" c="dimmed" tt="uppercase" fw="bold">
diff --git a/src/pages/tools/report.tsx b/src/pages/tools/report.tsx
index efefbe3..48c843c 100644
--- a/src/pages/tools/report.tsx
+++ b/src/pages/tools/report.tsx
@@ -201,7 +201,7 @@ export default function Report() {
   };
 
   return (
-    <Layout currentLink="/report" tools>
+    <Layout currentLink="/tools/report" currentSpace="me">
       <Title>BuildTheEarth Report Form</Title>
       <Text mb="xl" c="dimmed">
         To submit a report to us, you need to fill in all the data below.
diff --git a/src/pages/tools/timezone.tsx b/src/pages/tools/timezone.tsx
index 7a8d915..79c5b90 100644
--- a/src/pages/tools/timezone.tsx
+++ b/src/pages/tools/timezone.tsx
@@ -11,11 +11,11 @@ import {
 } from "@mantine/core";
 import { useEffect, useState } from "react";
 
-import { DateTimePicker } from "@mantine/dates";
-import { IconSearch } from "@tabler/icons-react";
-import Layout from "@/components/layout";
 import { RawCard } from "@/components/core/card/RawCard";
 import TextCard from "@/components/core/card/TextCard";
+import Layout from "@/components/layout";
+import { DateTimePicker } from "@mantine/dates";
+import { IconSearch } from "@tabler/icons-react";
 import moment from "moment-timezone";
 import { useRouter } from "next/router";
 
@@ -23,7 +23,7 @@ export default function Timezones() {
   const router = useRouter();
   const [search, setSearch] = useState("");
   const [date, setDate] = useState<Date | undefined | null>(
-    router.query?.date ? new Date(router.query.date as string) : new Date(),
+    router.query?.date ? new Date(router.query.date as string) : new Date()
   );
   let loadedDate = moment(date);
 
@@ -37,7 +37,7 @@ export default function Timezones() {
   }, [date, router]);
 
   return (
-    <Layout currentLink="/timezone" tools>
+    <Layout currentLink="/tools/timezone" currentSpace="me">
       <Grid>
         <GridCol span={8}>
           <RawCard
diff --git a/src/styles/BuildTeamNavbar.module.css b/src/styles/Navbar.module.css
similarity index 95%
rename from src/styles/BuildTeamNavbar.module.css
rename to src/styles/Navbar.module.css
index c72f5bf..f4c55b2 100644
--- a/src/styles/BuildTeamNavbar.module.css
+++ b/src/styles/Navbar.module.css
@@ -22,6 +22,7 @@
   padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
   border-radius: var(--mantine-radius-sm);
   font-weight: 500;
+  cursor: pointer;
 
   @mixin hover {
     background-color: light-dark(
@@ -57,7 +58,7 @@
 
 .navbarBottom {
   margin-top: var(--mantine-spacing-md);
-  /* padding: calc(var(--mantine-spacing-md) * 1.5) var(--mantine-spacing-md) ; */
+  padding-top: var(--mantine-spacing-md);
   border-top: rem(1px) solid
     light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
 }
diff --git a/src/util/links.ts b/src/util/links.ts
index d6eb333..34e36a1 100644
--- a/src/util/links.ts
+++ b/src/util/links.ts
@@ -4,7 +4,6 @@ import {
   IconList,
   IconMap,
   IconMessageReport,
-  IconReport,
   IconTool,
   IconUsersGroup,
 } from "@tabler/icons-react";
@@ -12,26 +11,26 @@ import {
 /**
  * These links are used for navigation between buildteam related pages
  */
-export const buildTeamNavLinks: NavLink[] = [
-  { link: "/", label: "Team Overview", icon: IconList },
-  { link: "/members", label: "Members", icon: IconUsersGroup },
-  { link: "/tools", label: "Debug Tools", icon: IconTool },
+export const teamNavLinks: NavLink[] = [
+  { link: "/team", label: "Team Overview", icon: IconList },
+  { link: "/team/members", label: "Members", icon: IconUsersGroup },
+  { link: "/team/tools", label: "Debug Tools", icon: IconTool },
 ];
 
 /**
  * These links are used for navigation between tool pages
  */
-export const toolsNavLiks: NavLink[] = [
-  { link: "/timezone", label: "Timezone Converter", icon: IconClock },
-  { link: "/coordinates", label: "Coordinate Converter", icon: IconMap },
-  { link: "/report", label: "Reports", icon: IconMessageReport },
-  { link: "/assets", label: "Assets", icon: IconFiles}
+export const meNavLinks: NavLink[] = [
+  { link: "/tools/timezone", label: "Timezone Converter", icon: IconClock },
+  { link: "/tools/coordinates", label: "Coordinate Converter", icon: IconMap },
+  { link: "/tools/report", label: "Reports", icon: IconMessageReport },
+  { link: "/tools/assets", label: "Assets", icon: IconFiles },
 ];
 
-/**
- * These links are used for navigation between management and staff pages
- */
-export const adminNavLinks: NavLink[] = [];
+export const navLinks: NavLinkGroup = {
+  team: teamNavLinks,
+  me: meNavLinks,
+};
 
 /**
  * Converts a NavLink array to an array of href links
@@ -47,3 +46,6 @@ interface NavLink {
   label: string;
   icon: any;
 }
+interface NavLinkGroup {
+  [section: string]: NavLink[];
+}
\ No newline at end of file