diff --git a/components/charts/area-chart.tsx b/components/charts/area-chart.tsx
index 64ee618..0bd5cfb 100644
--- a/components/charts/area-chart.tsx
+++ b/components/charts/area-chart.tsx
@@ -41,23 +41,24 @@ export function AreaChartComponent({
         <CardTitle className='text-xl'>{title}</CardTitle>
         {description && <CardDescription>{description}</CardDescription>}
       </CardHeader>
-      <CardContent className='flex-1 pb-0'>
+      <CardContent className='flex-1 pb-5'>
         <ChartContainer config={config}>
           <AreaChart
             accessibilityLayer
             data={data}
             margin={{
-              left: 20,
-              right: 12,
+              left: 10,
+              right: 10,
             }}
           >
-            <CartesianGrid vertical={false} />
+            <CartesianGrid vertical={true} />
             <XAxis
               dataKey='property'
               tickLine={false}
               axisLine={false}
               tickMargin={5}
               tickFormatter={(value) => value.slice(0, 5)}
+              hide
             />
             <ChartTooltip
               cursor={false}
@@ -65,7 +66,7 @@ export function AreaChartComponent({
             />
             <Area
               dataKey='value'
-              type='natural'
+              type='linear'
               fill='var(--color-property)'
               fillOpacity={0.4}
               stroke='var(--color-property)'
diff --git a/components/data-table/data.ts b/components/data-table/data.ts
index 4ebfe1b..8bdcd4c 100644
--- a/components/data-table/data.ts
+++ b/components/data-table/data.ts
@@ -128,7 +128,7 @@ export const getFormattedData = (data: TestResultData[]): FormattedData => {
 
   const areaChartData: AreaChartData[] = data.map((r) => {
     return {
-      property: r.method_name,
+      property: `${r.class_name} / ${r.method_name}`,
       value: toDuration(r.duration_ms),
     };
   });
diff --git a/lib/formatting.ts b/lib/formatting.ts
index 842bc7c..103690b 100644
--- a/lib/formatting.ts
+++ b/lib/formatting.ts
@@ -52,32 +52,35 @@ export const formatDateTime = (
     const systemZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
     const timezoneSplit = dateTimeString.split(' ');
-    let timezone = systemZone;
     let adjustedDateTimeString = dateTimeString;
 
     if (timezoneSplit.length > 1) {
-      timezone = timezoneSplit.pop() || systemZone;
+      timezoneSplit.pop();
       adjustedDateTimeString = timezoneSplit.join(' ');
     }
 
-    let dateTime = DateTime.fromISO(adjustedDateTimeString, { zone: timezone });
+    let dateTime = DateTime.fromISO(adjustedDateTimeString, {
+      zone: systemZone,
+    });
 
     if (!dateTime.isValid) {
       dateTime = DateTime.fromRFC2822(adjustedDateTimeString, {
-        zone: timezone,
+        zone: systemZone,
       });
     }
 
     if (!dateTime.isValid) {
-      dateTime = DateTime.fromHTTP(adjustedDateTimeString, { zone: timezone });
+      dateTime = DateTime.fromHTTP(adjustedDateTimeString, {
+        zone: systemZone,
+      });
     }
 
     if (!dateTime.isValid) {
       throw new Error('Invalid date-time format');
     }
 
-    const formattedDate = dateTime.toUTC().toFormat('yyyy-MM-dd');
-    const formattedTime = dateTime.toUTC().toFormat('hh:mm:ss a');
+    const formattedDate = dateTime.toFormat('yyyy-MM-dd');
+    const formattedTime = dateTime.toFormat('hh:mm:ss a');
 
     return { date: formattedDate, time: formattedTime };
   } catch (error) {