diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx
index eecd3355..10debee6 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx
@@ -97,7 +97,7 @@ export default function ReportEditor({
           <ReportSaveButton />
         </div>
       </StickyBelowHeader>
-      <div className="flex flex-col gap-4 p-4">
+      <div className="flex flex-col gap-4 p-4" id="report-editor">
         {report.ready && (
           <ChartSwitch {...report} projectId={projectId} editMode />
         )}
diff --git a/apps/dashboard/src/components/overview/overview-metrics.tsx b/apps/dashboard/src/components/overview/overview-metrics.tsx
index aa6adbbf..1bff6442 100644
--- a/apps/dashboard/src/components/overview/overview-metrics.tsx
+++ b/apps/dashboard/src/components/overview/overview-metrics.tsx
@@ -191,14 +191,14 @@ export default function OverviewMetrics({ projectId }: OverviewMetricsProps) {
   const selectedMetric = reports[metric]!;
 
   return (
-    <>
-      <div className="col-span-6 flex flex-wrap gap-4">
+    <div className="card col-span-6 p-4">
+      <div className="mb-2 grid grid-cols-6 gap-2">
         {reports.map((report, index) => (
           <button
             key={index}
             className={cn(
-              'group relative col-span-3 min-w-[170px] transition-all max-md:flex-1 md:col-span-2 lg:col-span-1 [&_[role="heading"]]:text-sm',
-              index === metric && 'z-10 scale-[101%] rounded-xl shadow-md'
+              'col-span-3 rounded p-2 transition-all max-md:flex-1 md:col-span-2 lg:col-span-1 [&_[role="heading"]]:text-sm',
+              index === metric && 'border-l-4 border-blue-600 bg-slate-50'
             )}
             onClick={() => {
               setMetric(index);
@@ -209,19 +209,12 @@ export default function OverviewMetrics({ projectId }: OverviewMetricsProps) {
           </button>
         ))}
       </div>
-      <Widget className="col-span-6">
-        <WidgetHead>
-          <div className="title">{selectedMetric.events[0]?.displayName}</div>
-        </WidgetHead>
-        <WidgetBody>
-          <ChartSwitch
-            key={selectedMetric.id}
-            hideID
-            {...selectedMetric}
-            chartType="linear"
-          />
-        </WidgetBody>
-      </Widget>
-    </>
+      <ChartSwitch
+        key={selectedMetric.id}
+        hideID
+        {...selectedMetric}
+        chartType="linear"
+      />
+    </div>
   );
 }
diff --git a/apps/dashboard/src/components/overview/overview-widget.tsx b/apps/dashboard/src/components/overview/overview-widget.tsx
index 8cc92a8c..b49034e4 100644
--- a/apps/dashboard/src/components/overview/overview-widget.tsx
+++ b/apps/dashboard/src/components/overview/overview-widget.tsx
@@ -85,7 +85,7 @@ export function WidgetButtons({
     <div
       ref={container}
       className={cn(
-        '-mt-2 flex flex-wrap justify-start self-stretch px-4 transition-opacity [&_button.active]:border-b-2 [&_button.active]:border-black [&_button.active]:opacity-100 [&_button]:whitespace-nowrap [&_button]:py-1 [&_button]:text-xs [&_button]:opacity-50',
+        '-mb-px -mt-2 flex flex-wrap justify-start self-stretch px-4 transition-opacity [&_button.active]:border-b-2 [&_button.active]:border-black [&_button.active]:opacity-100 dark:[&_button.active]:border-white [&_button]:whitespace-nowrap [&_button]:py-1 [&_button]:text-xs [&_button]:opacity-50',
         className
       )}
       style={{ gap }}
diff --git a/apps/dashboard/src/components/report/chart/MetricCard.tsx b/apps/dashboard/src/components/report/chart/MetricCard.tsx
index 7bccf9f4..3bcf5619 100644
--- a/apps/dashboard/src/components/report/chart/MetricCard.tsx
+++ b/apps/dashboard/src/components/report/chart/MetricCard.tsx
@@ -3,7 +3,7 @@
 import { ColorSquare } from '@/components/color-square';
 import { fancyMinutes, useNumber } from '@/hooks/useNumerFormatter';
 import type { IChartData } from '@/trpc/client';
-import { theme } from '@/utils/theme';
+import { cn } from '@/utils/cn';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { Area, AreaChart } from 'recharts';
 
@@ -56,17 +56,25 @@ export function MetricCard({
 
   return (
     <div
-      className="card group relative h-24 overflow-hidden p-4"
+      className={cn(
+        'group relative h-[70px] overflow-hidden',
+        '[#report-editor_&&]:card [#report-editor_&&]:px-4 [#report-editor_&&]:py-2'
+      )}
       key={serie.name}
     >
-      <div className="absolute inset-0 -left-1 -right-1 z-0 rounded-md opacity-20 transition-opacity duration-300 group-hover:opacity-50">
+      <div
+        className={cn(
+          'absolute -right-1 bottom-2 top-0 z-0 rounded-md opacity-20 transition-opacity duration-300 group-hover:opacity-50',
+          previous ? 'left-[80px]' : '-left-1'
+        )}
+      >
         <AutoSizer>
           {({ width, height }) => (
             <AreaChart
               width={width}
-              height={height / 4}
+              height={height / 3}
               data={serie.data}
-              style={{ marginTop: (height / 4) * 3 }}
+              style={{ marginTop: (height / 3) * 2 }}
             >
               <Area
                 dataKey="count"
@@ -93,15 +101,15 @@ export function MetricCard({
           </div>
           {/* <PreviousDiffIndicator {...serie.metrics.previous[metric]} /> */}
         </div>
-        <div className="mt-2 flex items-end justify-between">
+        <div className="flex items-end justify-between">
           <div className="overflow-hidden text-ellipsis whitespace-nowrap text-2xl font-bold">
             {renderValue(serie.metrics[metric], 'ml-1 font-light text-xl')}
           </div>
-          <PreviousDiffIndicatorText
-            {...serie.metrics.previous[metric]}
-            className="mb-0.5 text-xs font-medium"
-          />
         </div>
+        <PreviousDiffIndicatorText
+          {...previous}
+          className="mb-0.5 text-xs font-medium"
+        />
       </div>
     </div>
   );
@@ -119,9 +127,10 @@ export function MetricCardEmpty() {
 
 export function MetricCardLoading() {
   return (
-    <div className="card flex h-24 flex-col p-4 py-5">
+    <div className="flex h-[70px] flex-col justify-between">
       <div className="h-4 w-1/2 animate-pulse rounded bg-slate-200"></div>
-      <div className="mt-auto h-6 w-1/5 animate-pulse rounded bg-slate-200"></div>
+      <div className="h-8 w-1/3 animate-pulse rounded bg-slate-200"></div>
+      <div className="h-3 w-1/5 animate-pulse rounded bg-slate-200"></div>
     </div>
   );
 }