diff --git a/components/ServerCard.tsx b/components/ServerCard.tsx
index fd41c84..3a93215 100644
--- a/components/ServerCard.tsx
+++ b/components/ServerCard.tsx
@@ -7,7 +7,7 @@ import {
   PopoverTrigger,
 } from "@/components/ui/popover";
 import { formatNezhaInfo } from "@/lib/utils";
-import ServerCardPopover from "./ServerPopover";
+import ServerCardPopover from "./ServerCardPopover";
 
 export default function ServerCard({
   timestamp,
diff --git a/components/ServerCardPopover.tsx b/components/ServerCardPopover.tsx
new file mode 100644
index 0000000..aab2299
--- /dev/null
+++ b/components/ServerCardPopover.tsx
@@ -0,0 +1,68 @@
+import { NezhaAPISafe } from "@/app/types/nezha-api";
+import { cn, formatBytes } from "@/lib/utils";
+
+export function ServerCardPopoverCard({
+  className,
+  title,
+  content,
+  children,
+}: {
+  className?: string;
+  title: string;
+  content?: string;
+  children?: React.ReactNode;
+}) {
+  return (
+    <div className={cn("mb-[6px] flex w-full flex-col", className)}>
+      <div className="text-sm font-semibold">{title}</div>
+      {children ? children : <div className="break-all text-sm">{content}</div>}
+      <div className="h-[0.5px] w-full bg-accent"></div>
+    </div>
+  );
+}
+
+export default function ServerCardPopover({
+  host,
+  status,
+}: {
+  host: NezhaAPISafe["host"];
+  status: NezhaAPISafe["status"];
+}) {
+  return (
+    <section className="max-w-[300px]">
+      <ServerCardPopoverCard
+        title="System"
+        content={`${host.Platform}-${host.PlatformVersion} [${host.Virtualization}: ${host.Arch}]`}
+      />
+      <ServerCardPopoverCard
+        title="CPU"
+        content={`${host.CPU.map((item) => item).join(", ")}`}
+      />
+      <ServerCardPopoverCard
+        title="Mem"
+        content={`${formatBytes(host.MemTotal)} / ${formatBytes(status.MemUsed)}`}
+      />
+      <ServerCardPopoverCard
+        title="STG"
+        content={`${formatBytes(status.DiskUsed)} / ${formatBytes(host.DiskTotal)}`}
+      />
+      <ServerCardPopoverCard
+        title="Swap"
+        content={`${formatBytes(status.SwapUsed)} / ${formatBytes(host.SwapTotal)}`}
+      />
+      <ServerCardPopoverCard
+        title="Network"
+        content={`${formatBytes(status.NetInTransfer)} / ${formatBytes(status.NetOutTransfer)}`}
+      />
+      <ServerCardPopoverCard
+        title="Load"
+        content={`${status.Load1.toFixed(2)} / ${status.Load5.toFixed(2)} / ${status.Load15.toFixed(2)}`}
+      />
+      <ServerCardPopoverCard
+        className="mb-0"
+        title="Online"
+        content={`${(status.Uptime / 86400).toFixed(0)} Days`}
+      />
+    </section>
+  );
+}
diff --git a/components/ServerPopover.tsx b/components/ServerPopover.tsx
deleted file mode 100644
index f25f5a2..0000000
--- a/components/ServerPopover.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { NezhaAPISafe } from "@/app/types/nezha-api";
-import { formatBytes } from "@/lib/utils";
-
-export default function ServerCardPopover({
-  host,
-  status,
-}: {
-  host: NezhaAPISafe["host"];
-  status: NezhaAPISafe["status"];
-}) {
-  return (
-    <section className="max-w-[240px]">
-      <div>
-        System: {host.Platform}-{host.PlatformVersion} [{host.Virtualization}:{" "}
-        {host.Arch}]
-      </div>
-      <div>CPU: [{host.CPU.map((item) => item).join(", ")}]</div>
-      <div>
-        STG: {formatBytes(status.DiskUsed)}/{formatBytes(host.DiskTotal)}
-      </div>
-      <div>
-        Mem: {formatBytes(status.MemUsed)}/{formatBytes(host.MemTotal)}
-      </div>
-      <div>
-        Swap: {formatBytes(status.SwapUsed)}/{formatBytes(host.SwapTotal)}
-      </div>
-      <div></div>
-      <div>
-        Load: {status.Load1.toFixed(2)}/{status.Load5.toFixed(2)}/
-        {status.Load15.toFixed(2)}
-      </div>
-      <div>Online: {(status.Uptime / 86400).toFixed(0)} Days</div>
-    </section>
-  );
-}