diff --git a/src/app/api/server/route.ts b/src/app/api/server/route.ts
index bbafd6d..207247e 100644
--- a/src/app/api/server/route.ts
+++ b/src/app/api/server/route.ts
@@ -1,7 +1,10 @@
 import axios, { HttpStatusCode } from "axios";
 import { NextResponse } from "next/server";
-import { servers } from "../servers/servers";
+import { PORT, servers } from "../servers/servers";
 import validate from "../auth/auth";
+import Service from "@/types/service";
+
+const allServices: { [key: string]: Service[] } = {};
 
 export async function GET(request: Request) {
   const { searchParams } = new URL(request.url);
@@ -26,10 +29,12 @@ export async function GET(request: Request) {
 
   const server = servers.data[parseInt(index)];
 
-  const apps = await axios.get(`http://${server.ip}:8080/apps`, {params: {auth: 'my-key'}});
+  axios.get(`http://${server.ip}:${PORT}/apps`, {params: {auth: 'my-key'}}).then((apps) => {
+    allServices[parseInt(index)] = apps.data;
+  });
 
   return NextResponse.json({
     message: "ok",
-    apps: apps.data,
+    apps: allServices[parseInt(index)] || [],
   });
 }
diff --git a/src/app/api/servers/servers.ts b/src/app/api/servers/servers.ts
index 148593b..c9bc31e 100644
--- a/src/app/api/servers/servers.ts
+++ b/src/app/api/servers/servers.ts
@@ -2,6 +2,8 @@ import Server, { ServerAPI } from "@/types/server";
 import Data from "../data";
 import axios from "axios";
 
+export const PORT = 63774;
+
 export const useServer = (server: ServerAPI, index: number) => {
   const interval = setInterval(() => {
     if (deletes.has(index) || !currentServers[index]) {
@@ -9,7 +11,7 @@ export const useServer = (server: ServerAPI, index: number) => {
       interval.close();
       return;
     }
-    axios.get(`http://${server.ip}:8080/`, {params: {auth: 'my-key'}}).then(({data}) => {
+    axios.get(`http://${server.ip}:${PORT}/`, {params: {auth: 'my-key'}}).then(({data}) => {
       if (data.status) {
         currentServers[index].status = data.status;
       }
@@ -25,7 +27,9 @@ export const useServer = (server: ServerAPI, index: number) => {
       if (data.network) {
         currentServers[index].network = data.network;
       }
+      currentServers[index].status = 'online';
     }).catch((e) => {
+      currentServers[index].status = 'offline';
       console.error(e.data);
     })
   }, 2000);
diff --git a/src/app/dashboard/server.tsx b/src/app/dashboard/server.tsx
index 0d59c53..7cd8ff0 100644
--- a/src/app/dashboard/server.tsx
+++ b/src/app/dashboard/server.tsx
@@ -24,6 +24,7 @@ import {
 import { Label } from "@/components/ui/label";
 import { Progress } from "@/components/ui/progress";
 import Session from "@/lib/session";
+import { cn } from "@/lib/utils";
 import Server from "@/types/server";
 import {
   Cpu,
@@ -130,12 +131,12 @@ export default function ServerComponent({
                 <div>
                   <CardTitle>{server.name}</CardTitle>
                   <CardDescription className="flex justify-between">
-                    <div className="flex gap-2 items-center flex-wrap">
-                      {server.status[0].toUpperCase() + server.status.slice(1)}
+                    <div className="flex items-center flex-wrap">
+                      <div className={cn("mr-1", server.status)}>{server.status[0].toUpperCase() + server.status.slice(1)}</div>
                       {" · "}
                       {server.ip}
                       {server.location && (
-                        <div className="flex items-center gap-1">
+                        <div className="flex items-center gap-1 ml-2">
                           <MapPin size={14} />
                           {server.location}
                         </div>
diff --git a/src/app/globals.css b/src/app/globals.css
index cc8079c..08a858b 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -303,3 +303,11 @@ body {
 .sidebar div {
   border-radius: 14px !important;
 }
+
+.online {
+  color: var(--chart-3) !important;
+}
+
+.offline {
+  color: var(--chart-4) !important;
+}
\ No newline at end of file
diff --git a/src/app/servers/[server]/page.tsx b/src/app/servers/[server]/page.tsx
index d19e914..abbaa90 100644
--- a/src/app/servers/[server]/page.tsx
+++ b/src/app/servers/[server]/page.tsx
@@ -15,13 +15,18 @@ export default function ServerPage() {
   useEffect(() => {
     session?.getServerIndex(0).then((s) => {
       setServer(s.data);
+      setTimeout(() => {
+        session?.getServerIndex(0).then((s) => {
+          setServer(s.data);
+        });
+    }, 1000);
     });
   }, [session]);
 
   return server && (
     <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-5">
       {server.apps.map((a, i) => (
-        <ServiceComponent key={i} server={a} index={i} session={session} / >
+        <ServiceComponent key={i} service={a} index={i} session={session} / >
     ))}
     </div>
   );
diff --git a/src/app/servers/[server]/service.tsx b/src/app/servers/[server]/service.tsx
index 526c14e..94cee3b 100644
--- a/src/app/servers/[server]/service.tsx
+++ b/src/app/servers/[server]/service.tsx
@@ -1,13 +1,3 @@
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from "@/components/ui/alert-dialog";
 import {
   Card,
   CardContent,
@@ -15,32 +5,13 @@ import {
   CardHeader,
   CardTitle,
 } from "@/components/ui/card";
-import {
-  ContextMenu,
-  ContextMenuContent,
-  ContextMenuItem,
-  ContextMenuTrigger,
-} from "@/components/ui/context-menu";
 import { Label } from "@/components/ui/label";
 import { Progress } from "@/components/ui/progress";
 import Session from "@/lib/session";
-import Server from "@/types/server";
-import {
-  AppWindow,
-  AppWindowMac,
-  Cpu,
-  HardDrive,
-  MapPin,
-  MemoryStick,
-  Network,
-  Pencil,
-  ServerIcon,
-  Trash,
-  Wifi,
-} from "lucide-react";
+import Service from "@/types/service";
+import { AppWindowMac } from "lucide-react";
 import { redirect } from "next/navigation";
 import { useState } from "react";
-import { toast } from "sonner";
 
 export function UsageBar({
   value,
@@ -104,116 +75,39 @@ export function ByteUnit({
 }
 
 export default function ServiceComponent({
-  server: service,
+  service,
   index,
   session,
 }: {
-  server: { name?: string, description?: string };
+  service: Service;
   index: number;
   session: Session | null;
 }) {
   const [deleteAlert, setDeleteAlert] = useState(false);
 
   return (
-    <>
-      <ContextMenu>
-        <ContextMenuTrigger>
-          <Card
-            className="w-full transition-transform duration-500 hover:scale-102 hover:cursor-pointer !select-none"
-            onClick={() => {
-              redirect(`/servers/${index}`);
-            }}
-          >
-            <CardHeader>
-              <div className="flex items-center gap-2 overflow-clip">
-                <div className="bg-muted text-muted-foreground p-1.5 rounded-md">
-                  <AppWindowMac className="w-4.5 h-4.5 text-current my-auto" />
-                </div>
-                <div>
-                  <CardTitle>{service.name}</CardTitle>
+    <Card
+      className="w-full transition-transform duration-500 hover:scale-102 hover:cursor-pointer !select-none"
+      onClick={() => {
+        redirect(`/servers/${index}`);
+      }}
+    >
+      <CardHeader>
+        <div className="flex items-center gap-2 overflow-clip">
+          <div className="bg-muted text-muted-foreground p-1.5 rounded-md">
+            <AppWindowMac className="w-4.5 h-4.5 text-current my-auto" />
+          </div>
+          <div>
+            <CardTitle>{service.name}</CardTitle>
 
-                  {(service.description && <CardDescription className="flex justify-between">
-                    {service.description} {(service as any).cpu}
-                  </CardDescription>)}
-                </div>
-              </div>
-            </CardHeader>
-            <CardContent className="w-full flex flex-col gap-3.5">
-              {/* <UsageBar
-                value={service.cpu}
-                Icon={Cpu}
-                text="CPU"
-                color="var(--chart-2)"
-              />
-              <UsageBar
-                value={service.memory}
-                Icon={MemoryStick}
-                text="Memory"
-                color="var(--chart-1)"
-              />
-              <UsageBar
-                value={service.storage}
-                Icon={HardDrive}
-                text="Storage"
-                color="var(--chart-5)"
-              /> */}
-              {/* <div className="flex flex-col gap-2 w-full">
-                <div className="justify-between flex">
-                  <Label className="text-md flex justify-center">
-                    <Network size={16} color="var(--chart-3)" /> Network
-                  </Label>
-                  <Label className="text-md">{formatBytes(service.network)}</Label>
-                </div>
-              </div> */}
-            </CardContent>
-          </Card>
-        </ContextMenuTrigger>
-        <ContextMenuContent>
-          <ContextMenuItem>
-            <Pencil className="text-current" />
-            Edit
-          </ContextMenuItem>
-          <ContextMenuItem
-            className="text-destructive"
-            onClick={() => setDeleteAlert(true)}
-          >
-            <Trash className="text-current" />
-            Delete
-          </ContextMenuItem>
-        </ContextMenuContent>
-      </ContextMenu>
-
-      <AlertDialog open={deleteAlert} onOpenChange={setDeleteAlert}>
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>Are you sure?</AlertDialogTitle>
-            <AlertDialogDescription>
-              This action will permanently remove your server from the server
-              list
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel>Cancel</AlertDialogCancel>
-            <AlertDialogAction
-              className="text-destructive-foreground bg-destructive"
-              onClick={() =>
-                session
-                  ?.removeServer(index)
-                  .then(() => {
-                    toast.info("Server successfully deleted");
-                  })
-                  .catch((e) => {
-                    toast.error(
-                      `Error deleting server: ` + e.response.data.message
-                    );
-                  })
-              }
-            >
-              Delete
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    </>
+            {(service.description && <CardDescription className="flex justify-between">
+              {service.description} {(service as any).cpu}
+            </CardDescription>)}
+          </div>
+        </div>
+      </CardHeader>
+      <CardContent className="w-full flex flex-col gap-3.5">
+      </CardContent>
+    </Card>
   );
 }
diff --git a/src/types/service.ts b/src/types/service.ts
new file mode 100644
index 0000000..96383be
--- /dev/null
+++ b/src/types/service.ts
@@ -0,0 +1 @@
+export default interface Service { name?: string, description?: string };
\ No newline at end of file