diff --git a/resources/js/pages/monitoring/components/resource-usage-chart.tsx b/resources/js/pages/monitoring/components/resource-usage-chart.tsx
index f0f2d198..51c47e86 100644
--- a/resources/js/pages/monitoring/components/resource-usage-chart.tsx
+++ b/resources/js/pages/monitoring/components/resource-usage-chart.tsx
@@ -1,11 +1,12 @@
 import * as React from 'react';
-import { Area, AreaChart, XAxis } from 'recharts';
+import { Area, AreaChart, XAxis, YAxis } from 'recharts';
 
 import { Card, CardContent } from '@/components/ui/card';
 import { ChartConfig, ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart';
 import { Metric } from '@/types/metric';
 import { Button } from '@/components/ui/button';
-import { Formatter } from 'recharts/types/component/DefaultTooltipContent';
+import { router } from '@inertiajs/react';
+import { cn } from '@/lib/utils';
 
 interface Props {
   title: string;
@@ -13,10 +14,12 @@ interface Props {
   dataKey: 'load' | 'memory_used' | 'disk_used';
   label: string;
   chartData: Metric[];
-  formatter?: Formatter<number | string, string>;
+  link: string;
+  formatter?: (value: unknown, name: unknown) => string | number;
+  single?: boolean;
 }
 
-export function ResourceUsageChart({ title, color, dataKey, label, chartData, formatter }: Props) {
+export function ResourceUsageChart({ title, color, dataKey, label, chartData, link, formatter, single }: Props) {
   const chartConfig = {
     [dataKey]: {
       label: label,
@@ -24,37 +27,37 @@ export function ResourceUsageChart({ title, color, dataKey, label, chartData, fo
     },
   } satisfies ChartConfig;
 
-  const getCurrentValue = () => {
-    if (chartData.length === 0) return 'N/A';
-
-    const value = chartData[chartData.length - 1][dataKey];
-    if (formatter) {
-      return formatter(value, dataKey);
-    }
-
-    return typeof value === 'number' ? value.toLocaleString() : String(value);
-  };
-
   return (
     <Card>
       <CardContent className="overflow-hidden p-0">
         <div className="flex items-start justify-between p-4">
           <div className="space-y-2 py-[7px]">
             <h2 className="text-muted-foreground text-sm">{title}</h2>
-            <span className="text-3xl font-bold">{getCurrentValue()}</span>
+            <span className="text-3xl font-bold">
+              {chartData.length > 0
+                ? formatter
+                  ? formatter(chartData[chartData.length - 1][dataKey], dataKey)
+                  : chartData[chartData.length - 1][dataKey].toLocaleString()
+                : 'N/A'}
+            </span>
           </div>
-          <Button variant="ghost">View</Button>
+          {!single && (
+            <Button variant="ghost" onClick={() => router.visit(link)}>
+              View
+            </Button>
+          )}
         </div>
-        <ChartContainer config={chartConfig} className="aspect-auto h-[100px] w-full overflow-hidden rounded-b-xl">
-          <AreaChart data={chartData} margin={{ left: 0, right: 0, top: 0, bottom: 0 }}>
+        <ChartContainer config={chartConfig} className={cn('aspect-auto w-full overflow-hidden rounded-b-xl', single ? 'h-[400px]' : 'h-[100px]')}>
+          <AreaChart accessibilityLayer data={chartData} margin={{ left: 0, right: 0, top: 0, bottom: 0 }}>
             <defs>
               <linearGradient id={`fill-${dataKey}`} x1="0" y1="0" x2="0" y2="1">
                 <stop offset="5%" stopColor={color} stopOpacity={0.8} />
                 <stop offset="95%" stopColor={color} stopOpacity={0.1} />
               </linearGradient>
             </defs>
+            <YAxis dataKey={dataKey} hide />
             <XAxis
-              hide
+              hide={!single}
               dataKey="date"
               tickLine={false}
               axisLine={false}
@@ -71,7 +74,7 @@ export function ResourceUsageChart({ title, color, dataKey, label, chartData, fo
               }}
             />
             <ChartTooltip
-              cursor={false}
+              cursor={true}
               content={
                 <ChartTooltipContent
                   labelFormatter={(value) => {
@@ -87,7 +90,7 @@ export function ResourceUsageChart({ title, color, dataKey, label, chartData, fo
                 />
               }
             />
-            <Area dataKey={dataKey} type="natural" fill={`url(#fill-${dataKey})`} stroke={color} />
+            <Area dataKey={dataKey} type="monotone" fill={`url(#fill-${dataKey})`} stroke={color} />
           </AreaChart>
         </ChartContainer>
       </CardContent>