diff --git a/frontend/src/Pages/Admin/Admin.tsx b/frontend/src/Pages/Admin/Admin.tsx
index 3835cc4..bcbe210 100644
--- a/frontend/src/Pages/Admin/Admin.tsx
+++ b/frontend/src/Pages/Admin/Admin.tsx
@@ -1,8 +1,7 @@
 import { useEffect } from "react";
-import ServerManagement from "./ServerManagement/ServerManagement";
-import UserManagement from "./UserManagement/UserManagement";
 import { IsCurrentUserAdmin } from "../../Lib/Auth";
-import { useNavigate } from "react-router-dom";
+import { Outlet, useNavigate } from "react-router-dom";
+import { Button } from "react-bootstrap";
 
 
 const Admin = () => {
@@ -21,10 +20,16 @@ const Admin = () => {
   }, [navigate])
 
   return (
-    <div>
-      <ServerManagement />
-      <UserManagement />
-    </div>
+    <>
+      <div style={{ margin: "auto", maxWidth: "500px", display: "flex", flexDirection: "column", alignItems: "center", paddingTop: "20px" }}>
+        <h2>Admin</h2>
+        <div>
+          <Button style={{ marginRight: "10px" }} onClick={() => navigate("/admin/users")}>Manage Users</Button>
+          <Button onClick={() => navigate("/admin/servers")}>Manage Servers</Button>
+        </div>
+      </div>
+      <Outlet />
+    </>
   )
 }
 
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 787be00..6460546 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -9,6 +9,8 @@ import Login from './Pages/Login/Login.tsx';
 import Admin from './Pages/Admin/Admin.tsx';
 import NotFound from './Pages/NotFound/NotFound.tsx';
 import ManageUser from './Pages/ManageUser/ManageUser.tsx';
+import ServerManagement from './Pages/Admin/ServerManagement/ServerManagement.tsx';
+import UserManagement from './Pages/Admin/UserManagement/UserManagement.tsx';
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
@@ -18,7 +20,10 @@ createRoot(document.getElementById('root')!).render(
         <Route index={true} path="/" element={<Index />} />
         <Route path="/search" element={<Search />} />
         <Route path="/login" element={<Login />} />
-        <Route path="/admin" element={<Admin />} />
+        <Route path="/admin" element={<Admin />}>
+          <Route path="users" element={<UserManagement />} />
+          <Route path="servers" element={<ServerManagement />} />
+        </Route>
         <Route path="/user" element={<ManageUser />} />
         <Route path="*" element={<NotFound />} />
       </Routes>