diff --git a/package.json b/package.json
index 269dada3..40acca28 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "@react-spring/web": "^9.7.5",
     "@tanstack/react-query": "^5.68.0",
     "@umami/prisma-client": "^0.16.0",
-    "@umami/react-zen": "^0.66.0",
+    "@umami/react-zen": "^0.71.0",
     "@umami/redis-client": "^0.27.0",
     "bcryptjs": "^2.4.3",
     "chalk": "^4.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 635eda78..615e30c1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,8 +45,8 @@ importers:
         specifier: ^0.16.0
         version: 0.16.0(@prisma/client@6.5.0(prisma@6.5.0(typescript@5.8.2))(typescript@5.8.2))(@prisma/extension-read-replicas@0.4.0(@prisma/client@6.5.0(prisma@6.5.0(typescript@5.8.2))(typescript@5.8.2)))
       '@umami/react-zen':
-        specifier: ^0.66.0
-        version: 0.66.0(@babel/core@7.26.9)(@types/react@19.0.10)(immer@9.0.21)(use-sync-external-store@1.4.0(react@19.0.0))
+        specifier: ^0.71.0
+        version: 0.71.0(@babel/core@7.26.9)(@types/react@19.0.10)(immer@9.0.21)(use-sync-external-store@1.4.0(react@19.0.0))
       '@umami/redis-client':
         specifier: ^0.27.0
         version: 0.27.0
@@ -1516,27 +1516,42 @@ packages:
   '@formatjs/ecma402-abstract@2.3.3':
     resolution: {integrity: sha512-pJT1OkhplSmvvr6i3CWTPvC/FGC06MbN5TNBfRO6Ox62AEz90eMq+dVvtX9Bl3jxCEkS0tATzDarRZuOLw7oFg==}
 
+  '@formatjs/ecma402-abstract@2.3.4':
+    resolution: {integrity: sha512-qrycXDeaORzIqNhBOx0btnhpD1c+/qFIHAN9znofuMJX6QBwtbrmlpWfD4oiUUD2vJUOIYFA/gYtg2KAMGG7sA==}
+
   '@formatjs/fast-memoize@2.2.6':
     resolution: {integrity: sha512-luIXeE2LJbQnnzotY1f2U2m7xuQNj2DA8Vq4ce1BY9ebRZaoPB1+8eZ6nXpLzsxuW5spQxr7LdCg+CApZwkqkw==}
 
+  '@formatjs/fast-memoize@2.2.7':
+    resolution: {integrity: sha512-Yabmi9nSvyOMrlSeGGWDiH7rf3a7sIwplbvo/dlz9WCIjzIQAfy1RMf4S0X3yG724n5Ghu2GmEl5NJIV6O9sZQ==}
+
   '@formatjs/icu-messageformat-parser@2.1.0':
     resolution: {integrity: sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==}
 
   '@formatjs/icu-messageformat-parser@2.11.1':
     resolution: {integrity: sha512-o0AhSNaOfKoic0Sn1GkFCK4MxdRsw7mPJ5/rBpIqdvcC7MIuyUSW8WChUEvrK78HhNpYOgqCQbINxCTumJLzZA==}
 
+  '@formatjs/icu-messageformat-parser@2.11.2':
+    resolution: {integrity: sha512-AfiMi5NOSo2TQImsYAg8UYddsNJ/vUEv/HaNqiFjnI3ZFfWihUtD5QtuX6kHl8+H+d3qvnE/3HZrfzgdWpsLNA==}
+
   '@formatjs/icu-skeleton-parser@1.3.6':
     resolution: {integrity: sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==}
 
   '@formatjs/icu-skeleton-parser@1.8.13':
     resolution: {integrity: sha512-N/LIdTvVc1TpJmMt2jVg0Fr1F7Q1qJPdZSCs19unMskCmVQ/sa0H9L8PWt13vq+gLdLg1+pPsvBLydL1Apahjg==}
 
+  '@formatjs/icu-skeleton-parser@1.8.14':
+    resolution: {integrity: sha512-i4q4V4qslThK4Ig8SxyD76cp3+QJ3sAqr7f6q9VVfeGtxG9OhiAk3y9XF6Q41OymsKzsGQ6OQQoJNY4/lI8TcQ==}
+
   '@formatjs/intl-localematcher@0.2.25':
     resolution: {integrity: sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==}
 
   '@formatjs/intl-localematcher@0.6.0':
     resolution: {integrity: sha512-4rB4g+3hESy1bHSBG3tDFaMY2CH67iT7yne1e+0CLTsGLDcmoEWWpJjjpWVaYgYfYuohIRuo0E+N536gd2ZHZA==}
 
+  '@formatjs/intl-localematcher@0.6.1':
+    resolution: {integrity: sha512-ePEgLgVCqi2BBFnTMWPfIghu6FkbZnnBVhO2sSxvLfrdFw7wCHAHiDoM2h4NRgjbaY7+B7HgOLZGkK187pZTZg==}
+
   '@formatjs/intl-numberformat@5.7.6':
     resolution: {integrity: sha512-ZlZfYtvbVHYZY5OG3RXizoCwxKxEKOrzEe2YOw9wbzoxF3PmFn0SAgojCFGLyNXkkR6xVxlylhbuOPf1dkIVNg==}
 
@@ -2949,8 +2964,8 @@ packages:
       '@prisma/client': ^4.8.0
       '@prisma/extension-read-replicas': ^0.3.0
 
-  '@umami/react-zen@0.66.0':
-    resolution: {integrity: sha512-RAVrzv+bQQs+UtFpCczJ0ieEb11Q+NLZ0r8GLDTMTXXWlyaLqZxj0GGb2p7BhbsnLh+gQnaiSSeN9Q/ACYA93w==}
+  '@umami/react-zen@0.71.0':
+    resolution: {integrity: sha512-SIfbDv/uW7mN5uebDeBeD+MnRiOrjsa2pJmVEdobyiM3ImdshpVVYxyBAJqAbiKbLF4OGZgRVbFsRfUcP/2Y0w==}
 
   '@umami/redis-client@0.27.0':
     resolution: {integrity: sha512-SbHTpxhgeZyTBUSp2zdZM+XUtpsaSL4Tad8QXIEhEtjWhvvfoornyT5kLuyYCVtzSAT4daALeGmOO1z6EE1KcA==}
@@ -4398,6 +4413,10 @@ packages:
     engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
 
+  glob@10.4.5:
+    resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
+    hasBin: true
+
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     deprecated: Glob versions prior to v9 are no longer supported
@@ -4618,6 +4637,9 @@ packages:
   intl-messageformat@10.7.15:
     resolution: {integrity: sha512-LRyExsEsefQSBjU2p47oAheoKz+EOJxSLDdjOaEjdriajfHsMXOmV/EhMvYSg9bAgCUHasuAC+mcUBe/95PfIg==}
 
+  intl-messageformat@10.7.16:
+    resolution: {integrity: sha512-UmdmHUmp5CIKKjSoE10la5yfU+AYJAaiYLsodbjL4lji83JNvgOQUjGaGhGrpFCb0Uh7sl7qfP1IyILa8Z40ug==}
+
   ipaddr.js@2.2.0:
     resolution: {integrity: sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==}
     engines: {node: '>= 10'}
@@ -4849,6 +4871,9 @@ packages:
     resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
     engines: {node: '>=14'}
 
+  jackspeak@3.4.3:
+    resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
+
   jake@10.9.2:
     resolution: {integrity: sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==}
     engines: {node: '>=10'}
@@ -5592,6 +5617,9 @@ packages:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
 
+  package-json-from-dist@1.0.1:
+    resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
+
   parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
@@ -8516,10 +8544,21 @@ snapshots:
       decimal.js: 10.5.0
       tslib: 2.8.1
 
+  '@formatjs/ecma402-abstract@2.3.4':
+    dependencies:
+      '@formatjs/fast-memoize': 2.2.7
+      '@formatjs/intl-localematcher': 0.6.1
+      decimal.js: 10.5.0
+      tslib: 2.8.1
+
   '@formatjs/fast-memoize@2.2.6':
     dependencies:
       tslib: 2.8.1
 
+  '@formatjs/fast-memoize@2.2.7':
+    dependencies:
+      tslib: 2.8.1
+
   '@formatjs/icu-messageformat-parser@2.1.0':
     dependencies:
       '@formatjs/ecma402-abstract': 1.11.4
@@ -8532,6 +8571,12 @@ snapshots:
       '@formatjs/icu-skeleton-parser': 1.8.13
       tslib: 2.8.1
 
+  '@formatjs/icu-messageformat-parser@2.11.2':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.3.4
+      '@formatjs/icu-skeleton-parser': 1.8.14
+      tslib: 2.8.1
+
   '@formatjs/icu-skeleton-parser@1.3.6':
     dependencies:
       '@formatjs/ecma402-abstract': 1.11.4
@@ -8542,6 +8587,11 @@ snapshots:
       '@formatjs/ecma402-abstract': 2.3.3
       tslib: 2.8.1
 
+  '@formatjs/icu-skeleton-parser@1.8.14':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.3.4
+      tslib: 2.8.1
+
   '@formatjs/intl-localematcher@0.2.25':
     dependencies:
       tslib: 2.8.1
@@ -8550,6 +8600,10 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
+  '@formatjs/intl-localematcher@0.6.1':
+    dependencies:
+      tslib: 2.8.1
+
   '@formatjs/intl-numberformat@5.7.6':
     dependencies:
       '@formatjs/ecma402-abstract': 1.4.0
@@ -8689,7 +8743,7 @@ snapshots:
   '@internationalized/message@3.1.6':
     dependencies:
       '@swc/helpers': 0.5.15
-      intl-messageformat: 10.7.15
+      intl-messageformat: 10.7.16
 
   '@internationalized/number@3.6.0':
     dependencies:
@@ -10551,13 +10605,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@umami/react-zen@0.66.0(@babel/core@7.26.9)(@types/react@19.0.10)(immer@9.0.21)(use-sync-external-store@1.4.0(react@19.0.0))':
+  '@umami/react-zen@0.71.0(@babel/core@7.26.9)(@types/react@19.0.10)(immer@9.0.21)(use-sync-external-store@1.4.0(react@19.0.0))':
     dependencies:
       '@fontsource/jetbrains-mono': 5.2.5
       '@react-aria/focus': 3.20.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       '@react-spring/web': 9.7.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       classnames: 2.5.1
-      glob: 10.3.10
+      glob: 10.4.5
       highlight.js: 11.11.1
       lucide-react: 0.479.0(react@19.0.0)
       next: 15.2.4(@babel/core@7.26.9)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
@@ -12361,6 +12415,15 @@ snapshots:
       minipass: 7.1.2
       path-scurry: 1.11.1
 
+  glob@10.4.5:
+    dependencies:
+      foreground-child: 3.3.1
+      jackspeak: 3.4.3
+      minimatch: 9.0.5
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.1
+      path-scurry: 1.11.1
+
   glob@7.2.3:
     dependencies:
       fs.realpath: 1.0.0
@@ -12564,6 +12627,13 @@ snapshots:
       '@formatjs/icu-messageformat-parser': 2.11.1
       tslib: 2.8.1
 
+  intl-messageformat@10.7.16:
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.3.4
+      '@formatjs/fast-memoize': 2.2.7
+      '@formatjs/icu-messageformat-parser': 2.11.2
+      tslib: 2.8.1
+
   ipaddr.js@2.2.0: {}
 
   is-array-buffer@3.0.5:
@@ -12791,6 +12861,12 @@ snapshots:
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
 
+  jackspeak@3.4.3:
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+
   jake@10.9.2:
     dependencies:
       async: 3.2.6
@@ -13735,6 +13811,8 @@ snapshots:
 
   p-try@2.2.0: {}
 
+  package-json-from-dist@1.0.1: {}
+
   parent-module@1.0.1:
     dependencies:
       callsites: 3.1.0
diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx
index 470856a0..3c201366 100644
--- a/src/app/(main)/App.tsx
+++ b/src/app/(main)/App.tsx
@@ -5,7 +5,7 @@ import { usePathname } from 'next/navigation';
 import { UpdateNotice } from './UpdateNotice';
 import { Nav } from '@/app/(main)/Nav';
 import { MenuBar } from '@/app/(main)/MenuBar';
-import { Page } from '@/components/layout/Page';
+import { Page } from '@/components/common/Page';
 import { useLoginQuery, useConfig } from '@/components/hooks';
 
 export function App({ children }) {
@@ -33,7 +33,13 @@ export function App({ children }) {
     <Grid height="100vh" width="100%" columns="auto 1fr" rows="auto 1fr" overflow="hidden">
       <Nav gridColumn="1 / 2" gridRow="1 / 3" />
       <MenuBar gridColumn="2 / 3" gridRow="1 / 2" />
-      <Column gridColumn="2 / 3" gridRow="2 / 3" alignItems="center" overflow="auto">
+      <Column
+        gridColumn="2 / 3"
+        gridRow="2 / 3"
+        alignItems="center"
+        overflow="auto"
+        backgroundColor="1"
+      >
         <Page>
           {children}
           {process.env.NODE_ENV === 'production' && !pathname.includes('/share/') && (
diff --git a/src/app/(main)/MenuBar.tsx b/src/app/(main)/MenuBar.tsx
index 2dcf0a0e..4c1d2e4c 100644
--- a/src/app/(main)/MenuBar.tsx
+++ b/src/app/(main)/MenuBar.tsx
@@ -17,6 +17,8 @@ export function MenuBar(props: RowProps) {
       paddingY="3"
       paddingX="3"
       paddingRight="5"
+      backgroundColor="1"
+      style={{ borderBottom: '1px solid var(--border-color)' }}
     >
       <Row>
         <Button onPress={() => setCollapsed(!isCollapsed)} variant="quiet">
diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsx
index a93045e7..3ae99d3a 100644
--- a/src/app/(main)/console/TestConsole.tsx
+++ b/src/app/(main)/console/TestConsole.tsx
@@ -2,8 +2,8 @@ import { Button } from '@umami/react-zen';
 import Link from 'next/link';
 import Script from 'next/script';
 import { WebsiteSelect } from '@/components/input/WebsiteSelect';
-import { Page } from '@/components/layout/Page';
-import { PageHeader } from '@/components/layout/PageHeader';
+import { Page } from '@/components/common/Page';
+import { PageHeader } from '@/components/common/PageHeader';
 import { EventsChart } from '@/components/metrics/EventsChart';
 import { WebsiteChart } from '../websites/[websiteId]/WebsiteChart';
 import { useApi, useNavigation } from '@/components/hooks';
diff --git a/src/app/(main)/dashboard/DashboardPage.tsx b/src/app/(main)/dashboard/DashboardPage.tsx
index 7629c5b4..f0ee71a2 100644
--- a/src/app/(main)/dashboard/DashboardPage.tsx
+++ b/src/app/(main)/dashboard/DashboardPage.tsx
@@ -1,6 +1,6 @@
 'use client';
 import { Icon, Icons, Loading, Text } from '@umami/react-zen';
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { Pager } from '@/components/common/Pager';
 import { WebsiteChartList } from '../websites/[websiteId]/WebsiteChartList';
 import { DashboardSettingsButton } from '@/app/(main)/dashboard/DashboardSettingsButton';
diff --git a/src/app/(main)/profile/ProfileHeader.tsx b/src/app/(main)/profile/ProfileHeader.tsx
index 4908e9db..004ce9b0 100644
--- a/src/app/(main)/profile/ProfileHeader.tsx
+++ b/src/app/(main)/profile/ProfileHeader.tsx
@@ -1,4 +1,4 @@
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { useMessages } from '@/components/hooks';
 
 export function ProfileHeader() {
diff --git a/src/app/(main)/reports/ReportsHeader.tsx b/src/app/(main)/reports/ReportsHeader.tsx
index b5f81f1b..769b13c4 100644
--- a/src/app/(main)/reports/ReportsHeader.tsx
+++ b/src/app/(main)/reports/ReportsHeader.tsx
@@ -1,4 +1,4 @@
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { Icon, Icons, Text } from '@umami/react-zen';
 import { useLoginQuery, useMessages, useNavigation } from '@/components/hooks';
 import { LinkButton } from '@/components/common/LinkButton';
diff --git a/src/app/(main)/reports/ReportsTable.tsx b/src/app/(main)/reports/ReportsTable.tsx
index 99251e60..4760a759 100644
--- a/src/app/(main)/reports/ReportsTable.tsx
+++ b/src/app/(main)/reports/ReportsTable.tsx
@@ -4,7 +4,7 @@ import { useMessages, useLoginQuery, useNavigation } from '@/components/hooks';
 import { REPORT_TYPES } from '@/lib/constants';
 import { ReportDeleteButton } from './ReportDeleteButton';
 
-export function ReportsTable({ data = [], showDomain }: { data: any[]; showDomain?: boolean }) {
+export function ReportsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
   const { formatMessage, labels } = useMessages();
   const { user } = useLoginQuery();
   const { renderTeamUrl } = useNavigation();
@@ -20,11 +20,6 @@ export function ReportsTable({ data = [], showDomain }: { data: any[]; showDomai
           );
         }}
       </DataColumn>
-      {showDomain && (
-        <DataColumn id="domain" label={formatMessage(labels.domain)}>
-          {(row: any) => row?.website?.domain}
-        </DataColumn>
-      )}
       <DataColumn id="action" label="" align="end">
         {(row: any) => {
           const { id, name, userId, website } = row;
diff --git a/src/app/(main)/reports/[reportId]/BaseParameters.module.css b/src/app/(main)/reports/[reportId]/BaseParameters.module.css
deleted file mode 100644
index 4750c7d7..00000000
--- a/src/app/(main)/reports/[reportId]/BaseParameters.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.dropdown div {
-  max-height: 300px;
-}
diff --git a/src/app/(main)/reports/[reportId]/BaseParameters.tsx b/src/app/(main)/reports/[reportId]/BaseParameters.tsx
index fe0e803a..1e49d378 100644
--- a/src/app/(main)/reports/[reportId]/BaseParameters.tsx
+++ b/src/app/(main)/reports/[reportId]/BaseParameters.tsx
@@ -1,11 +1,9 @@
-import { useContext } from 'react';
 import { Column, Label } from '@umami/react-zen';
+import { useReport } from '@/components/hooks';
 import { parseDateRange } from '@/lib/date';
 import { DateFilter } from '@/components/input/DateFilter';
 import { WebsiteSelect } from '@/components/input/WebsiteSelect';
 import { useMessages, useNavigation, useWebsiteQuery } from '@/components/hooks';
-import { ReportContext } from './Report';
-import styles from './BaseParameters.module.css';
 
 export interface BaseParametersProps {
   showWebsiteSelect?: boolean;
@@ -20,7 +18,7 @@ export function BaseParameters({
   showDateSelect = true,
   allowDateSelect = true,
 }: BaseParametersProps) {
-  const { report, updateReport } = useContext(ReportContext);
+  const { report, updateReport } = useReport();
   const { formatMessage, labels } = useMessages();
   const { teamId } = useNavigation();
   const { parameters } = report || {};
@@ -50,7 +48,7 @@ export function BaseParameters({
         </Column>
       )}
       {showDateSelect && (
-        <Column className={styles.dropdown}>
+        <Column>
           <Label>{formatMessage(labels.dateRange)}</Label>
           {allowDateSelect && (
             <DateFilter
diff --git a/src/app/(main)/reports/[reportId]/FieldAddForm.tsx b/src/app/(main)/reports/[reportId]/FieldAddForm.tsx
index 9c0ab149..8034724e 100644
--- a/src/app/(main)/reports/[reportId]/FieldAddForm.tsx
+++ b/src/app/(main)/reports/[reportId]/FieldAddForm.tsx
@@ -1,7 +1,6 @@
 import { useState } from 'react';
 import { createPortal } from 'react-dom';
 import { REPORT_PARAMETERS } from '@/lib/constants';
-import { PopupForm } from './PopupForm';
 import { FieldSelectForm } from './FieldSelectForm';
 
 export function FieldAddForm({
@@ -39,9 +38,7 @@ export function FieldAddForm({
   };
 
   return createPortal(
-    <PopupForm>
-      {!selected && <FieldSelectForm fields={fields} onSelect={handleSelect} />}
-    </PopupForm>,
+    !selected && <FieldSelectForm fields={fields} onSelect={handleSelect} />,
     document.body,
   );
 }
diff --git a/src/app/(main)/reports/[reportId]/FieldParameters.tsx b/src/app/(main)/reports/[reportId]/FieldParameters.tsx
index 45c6f16e..18ed6c11 100644
--- a/src/app/(main)/reports/[reportId]/FieldParameters.tsx
+++ b/src/app/(main)/reports/[reportId]/FieldParameters.tsx
@@ -1,13 +1,11 @@
-import { useFields, useMessages } from '@/components/hooks';
+import { useFields, useMessages, useReport } from '@/components/hooks';
 import { Icons } from '@/components/icons';
-import { useContext } from 'react';
-import { Button, Row, Label, Icon, Popover, MenuTrigger } from '@umami/react-zen';
+import { Button, Row, Label, Icon, Popover, MenuTrigger, Column } from '@umami/react-zen';
 import { FieldSelectForm } from '../[reportId]/FieldSelectForm';
 import { ParameterList } from '../[reportId]/ParameterList';
-import { ReportContext } from './Report';
 
 export function FieldParameters() {
-  const { report, updateReport } = useContext(ReportContext);
+  const { report, updateReport } = useReport();
   const { formatMessage, labels } = useMessages();
   const { parameters } = report || {};
   const { fields } = parameters || {};
@@ -26,12 +24,12 @@ export function FieldParameters() {
   const AddButton = () => {
     return (
       <MenuTrigger>
-        <Button size="sm">
-          <Icon>
+        <Button variant="quiet">
+          <Icon size="sm">
             <Icons.Plus />
           </Icon>
         </Button>
-        <Popover placement="start">
+        <Popover placement="right top">
           <FieldSelectForm
             fields={fieldOptions.filter(({ name }) => !fields.find(f => f.name === name))}
             onSelect={handleAdd}
@@ -43,8 +41,11 @@ export function FieldParameters() {
   };
 
   return (
-    <Row>
-      <Label>{formatMessage(labels.fields)}</Label>
+    <Column gap="3">
+      <Row justifyContent="space-between">
+        <Label>{formatMessage(labels.fields)}</Label>
+        <AddButton />
+      </Row>
       <ParameterList>
         {fields.map(({ name }) => {
           return (
@@ -54,7 +55,6 @@ export function FieldParameters() {
           );
         })}
       </ParameterList>
-      <AddButton />
-    </Row>
+    </Column>
   );
 }
diff --git a/src/app/(main)/reports/[reportId]/FieldSelectForm.tsx b/src/app/(main)/reports/[reportId]/FieldSelectForm.tsx
index cc3ef08e..73501732 100644
--- a/src/app/(main)/reports/[reportId]/FieldSelectForm.tsx
+++ b/src/app/(main)/reports/[reportId]/FieldSelectForm.tsx
@@ -1,6 +1,5 @@
-import { List, ListItem, Label, Column } from '@umami/react-zen';
+import { Menu, MenuItem, Text, MenuSection } from '@umami/react-zen';
 import { useMessages } from '@/components/hooks';
-import styles from './FieldSelectForm.module.css';
 import { Key } from 'react';
 
 export interface FieldSelectFormProps {
@@ -13,18 +12,17 @@ export function FieldSelectForm({ fields = [], onSelect, showType = true }: Fiel
   const { formatMessage, labels } = useMessages();
 
   return (
-    <Column>
-      <Label>{formatMessage(labels.fields)}</Label>
-      <List onSelectionChange={key => onSelect(fields[key as any])}>
+    <Menu onSelectionChange={key => onSelect(fields[key as any])}>
+      <MenuSection title={formatMessage(labels.fields)}>
         {fields.map(({ name, label, type }: any, index: Key) => {
           return (
-            <ListItem key={index} className={styles.item}>
-              <div>{label || name}</div>
-              {showType && type && <div className={styles.type}>{type}</div>}
-            </ListItem>
+            <MenuItem key={index}>
+              <Text>{label || name}</Text>
+              {showType && type && <Text color="muted">{type}</Text>}
+            </MenuItem>
           );
         })}
-      </List>
-    </Column>
+      </MenuSection>
+    </Menu>
   );
 }
diff --git a/src/app/(main)/reports/[reportId]/FilterParameters.tsx b/src/app/(main)/reports/[reportId]/FilterParameters.tsx
index 39481065..c4e4c0f6 100644
--- a/src/app/(main)/reports/[reportId]/FilterParameters.tsx
+++ b/src/app/(main)/reports/[reportId]/FilterParameters.tsx
@@ -1,17 +1,23 @@
-import { useContext } from 'react';
-import { useMessages, useFormat, useFilters, useFields } from '@/components/hooks';
+import { useMessages, useFormat, useFilters, useFields, useReport } from '@/components/hooks';
 import { Icons } from '@/components/icons';
-import { Button, Row, Label, Icon, Popover, MenuTrigger } from '@umami/react-zen';
+import {
+  Button,
+  Row,
+  Column,
+  Label,
+  Icon,
+  Popover,
+  MenuTrigger,
+  Focusable,
+  Text,
+} from '@umami/react-zen';
 import { FilterSelectForm } from '../[reportId]/FilterSelectForm';
 import { ParameterList } from '../[reportId]/ParameterList';
-import { PopupForm } from '../[reportId]/PopupForm';
-import { ReportContext } from './Report';
 import { FieldFilterEditForm } from '../[reportId]/FieldFilterEditForm';
 import { isSearchOperator } from '@/lib/params';
-import styles from './FilterParameters.module.css';
 
 export function FilterParameters() {
-  const { report, updateReport } = useContext(ReportContext);
+  const { report, updateReport } = useReport();
   const { formatMessage, labels } = useMessages();
   const { formatValue } = useFormat();
   const { parameters } = report || {};
@@ -45,28 +51,26 @@ export function FilterParameters() {
   const AddButton = () => {
     return (
       <MenuTrigger>
-        <Button size="sm">
-          <Icon>
+        <Button variant="quiet">
+          <Icon size="sm">
             <Icons.Plus />
           </Icon>
         </Button>
-        <Popover placement="bottom start">
-          <PopupForm>
-            <FilterSelectForm
-              websiteId={websiteId}
-              fields={fields.filter(({ name }) => !filters.find(f => f.name === name))}
-              startDate={dateRange?.startDate}
-              endDate={dateRange?.endDate}
-              onChange={handleAdd}
-            />
-          </PopupForm>
+        <Popover placement="right top">
+          <FilterSelectForm
+            websiteId={websiteId}
+            fields={fields.filter(({ name }) => !filters.find(f => f.name === name))}
+            startDate={dateRange?.startDate}
+            endDate={dateRange?.endDate}
+            onChange={handleAdd}
+          />
         </Popover>
       </MenuTrigger>
     );
   };
 
   return (
-    <>
+    <Column gap="3">
       <Row justifyContent="space-between">
         <Label>{formatMessage(labels.filters)}</Label>
         <AddButton />
@@ -94,7 +98,7 @@ export function FilterParameters() {
           },
         )}
       </ParameterList>
-    </>
+    </Column>
   );
 }
 
@@ -113,12 +117,16 @@ const FilterParameter = ({
 
   return (
     <MenuTrigger>
-      <div className={styles.item}>
-        <div className={styles.label}>{label}</div>
-        <div className={styles.op}>{operatorLabels[operator]}</div>
-        <div className={styles.value}>{value}</div>
-      </div>
-      <Popover className={styles.edit} placement="right top">
+      <Focusable>
+        <Row gap="3" alignItems="center">
+          <Text>{label}</Text>
+          <Text size="2" transform="uppercase">
+            {operatorLabels[operator]}
+          </Text>
+          <Text weight="bold">{value}</Text>
+        </Row>
+      </Focusable>
+      <Popover placement="right top">
         {(close: any) => (
           <FieldFilterEditForm
             websiteId={websiteId}
diff --git a/src/app/(main)/reports/[reportId]/ParameterList.tsx b/src/app/(main)/reports/[reportId]/ParameterList.tsx
index fc3c31f3..d206e0f1 100644
--- a/src/app/(main)/reports/[reportId]/ParameterList.tsx
+++ b/src/app/(main)/reports/[reportId]/ParameterList.tsx
@@ -1,10 +1,8 @@
 import { ReactNode } from 'react';
-import { Icon } from '@umami/react-zen';
+import { Icon, Row, Text, Button, Column } from '@umami/react-zen';
 import { Icons } from '@/components/icons';
 import { Empty } from '@/components/common/Empty';
 import { useMessages } from '@/components/hooks';
-import styles from './ParameterList.module.css';
-import classNames from 'classnames';
 
 export interface ParameterListProps {
   children?: ReactNode;
@@ -14,34 +12,43 @@ export function ParameterList({ children }: ParameterListProps) {
   const { formatMessage, labels } = useMessages();
 
   return (
-    <div className={styles.list}>
+    <Column>
       {!children && <Empty message={formatMessage(labels.none)} />}
       {children}
-    </div>
+    </Column>
   );
 }
 
 const Item = ({
-  children,
-  className,
   icon,
   onClick,
   onRemove,
+  children,
 }: {
-  children?: ReactNode;
-  className?: string;
   icon?: ReactNode;
   onClick?: () => void;
   onRemove?: () => void;
+  children?: ReactNode;
 }) => {
   return (
-    <div className={classNames(styles.item, className)} onClick={onClick}>
-      {icon && <Icon className={styles.icon}>{icon}</Icon>}
-      <div className={styles.value}>{children}</div>
-      <Icon className={styles.close} onClick={onRemove}>
-        <Icons.Close />
-      </Icon>
-    </div>
+    <Row
+      gap="3"
+      alignItems="center"
+      justifyContent="space-between"
+      onClick={onClick}
+      backgroundColor="2"
+      border
+      borderRadius="2"
+      paddingLeft="3"
+    >
+      {icon && <Icon>{icon}</Icon>}
+      <Text>{children}</Text>
+      <Button onPress={onRemove} variant="quiet">
+        <Icon>
+          <Icons.Close />
+        </Icon>
+      </Button>
+    </Row>
   );
 };
 
diff --git a/src/app/(main)/reports/[reportId]/PopupForm.module.css b/src/app/(main)/reports/[reportId]/PopupForm.module.css
deleted file mode 100644
index 5d069dd4..00000000
--- a/src/app/(main)/reports/[reportId]/PopupForm.module.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.form {
-  background: var(--base50);
-  min-width: 300px;
-  padding: 20px;
-  border: 1px solid var(--base400);
-  border-radius: var(--border-radius);
-  box-shadow: 0 0 0 5px rgba(0, 0, 0, 0.1);
-  z-index: 1000;
-}
diff --git a/src/app/(main)/reports/[reportId]/PopupForm.tsx b/src/app/(main)/reports/[reportId]/PopupForm.tsx
deleted file mode 100644
index 2c470c2b..00000000
--- a/src/app/(main)/reports/[reportId]/PopupForm.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { CSSProperties, ReactNode } from 'react';
-import classNames from 'classnames';
-import styles from './PopupForm.module.css';
-
-export function PopupForm({
-  className,
-  style,
-  children,
-}: {
-  className?: string;
-  style?: CSSProperties;
-  children: ReactNode;
-}) {
-  return (
-    <div
-      className={classNames(styles.form, className)}
-      style={style}
-      onClick={e => e.stopPropagation()}
-    >
-      {children}
-    </div>
-  );
-}
diff --git a/src/app/(main)/reports/[reportId]/Report.tsx b/src/app/(main)/reports/[reportId]/Report.tsx
index 661288f3..788191b3 100644
--- a/src/app/(main)/reports/[reportId]/Report.tsx
+++ b/src/app/(main)/reports/[reportId]/Report.tsx
@@ -1,8 +1,6 @@
 import { createContext, ReactNode } from 'react';
-import { Loading } from '@umami/react-zen';
-import classNames from 'classnames';
+import { Loading, Grid } from '@umami/react-zen';
 import { useReportQuery } from '@/components/hooks';
-import styles from './Report.module.css';
 
 export const ReportContext = createContext(null);
 
@@ -10,12 +8,10 @@ export function Report({
   reportId,
   defaultParameters,
   children,
-  className,
 }: {
   reportId: string;
   defaultParameters: { type: string; parameters: { [key: string]: any } };
   children: ReactNode;
-  className?: string;
 }) {
   const report = useReportQuery(reportId, defaultParameters);
 
@@ -25,7 +21,9 @@ export function Report({
 
   return (
     <ReportContext.Provider value={report}>
-      <div className={classNames(styles.container, className)}>{children}</div>
+      <Grid rows="auto 1fr" columns="auto 1fr" gap="6">
+        {children}
+      </Grid>
     </ReportContext.Provider>
   );
 }
diff --git a/src/app/(main)/reports/[reportId]/ReportBody.tsx b/src/app/(main)/reports/[reportId]/ReportBody.tsx
index 9e7ca966..bbf5323b 100644
--- a/src/app/(main)/reports/[reportId]/ReportBody.tsx
+++ b/src/app/(main)/reports/[reportId]/ReportBody.tsx
@@ -1,13 +1,12 @@
-import { useContext } from 'react';
-import { ReportContext } from './Report';
-import styles from './ReportBody.module.css';
+import { Panel } from '@/components/common/Panel';
+import { useReport } from '@/components/hooks';
 
 export function ReportBody({ children }) {
-  const { report } = useContext(ReportContext);
+  const { report } = useReport();
 
   if (!report) {
     return null;
   }
 
-  return <div className={styles.body}>{children}</div>;
+  return <Panel>{children}</Panel>;
 }
diff --git a/src/app/(main)/reports/[reportId]/ReportHeader.module.css b/src/app/(main)/reports/[reportId]/ReportHeader.module.css
deleted file mode 100644
index 5ff26104..00000000
--- a/src/app/(main)/reports/[reportId]/ReportHeader.module.css
+++ /dev/null
@@ -1,36 +0,0 @@
-.header {
-  display: grid;
-  grid-template-columns: 1fr min-content;
-  align-items: center;
-  grid-row: 1 / 2;
-  grid-column: 1 / 3;
-  margin: 20px 0 40px 0;
-}
-
-.title {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  font-size: 24px;
-  font-weight: 700;
-  gap: 20px;
-  height: 60px;
-}
-
-.type {
-  font-size: 11px;
-  font-weight: 700;
-  text-transform: uppercase;
-  color: var(--base600);
-}
-
-.description {
-  color: var(--font-color300);
-  max-width: 500px;
-  height: 30px;
-}
-
-.actions {
-  display: flex;
-  align-items: center;
-}
diff --git a/src/app/(main)/reports/[reportId]/ReportHeader.tsx b/src/app/(main)/reports/[reportId]/ReportHeader.tsx
index 981d67a8..d6a7fc05 100644
--- a/src/app/(main)/reports/[reportId]/ReportHeader.tsx
+++ b/src/app/(main)/reports/[reportId]/ReportHeader.tsx
@@ -1,13 +1,18 @@
-import { useContext } from 'react';
-import { Icon, LoadingButton, InlineEditField, useToast } from '@umami/react-zen';
-import { useMessages, useApi, useNavigation } from '@/components/hooks';
-import { ReportContext } from './Report';
-import styles from './ReportHeader.module.css';
+import {
+  Row,
+  Column,
+  Text,
+  Heading,
+  Icon,
+  LoadingButton,
+  InlineEditField,
+  useToast,
+} from '@umami/react-zen';
+import { useMessages, useApi, useNavigation, useReport } from '@/components/hooks';
 import { REPORT_TYPES } from '@/lib/constants';
-import { Breadcrumb } from '@/components/common/Breadcrumb';
 
 export function ReportHeader({ icon }) {
-  const { report, updateReport } = useContext(ReportContext);
+  const { report, updateReport } = useReport();
   const { formatMessage, labels, messages } = useMessages();
   const { toast } = useToast();
   const { router, renderTeamUrl } = useNavigation();
@@ -54,41 +59,33 @@ export function ReportHeader({ icon }) {
   }
 
   return (
-    <div className={styles.header}>
-      <div>
-        <div className={styles.type}>
-          <Breadcrumb
-            data={[
-              { label: formatMessage(labels.reports), url: renderTeamUrl('/reports') },
-              {
-                label: formatMessage(
-                  labels[Object.keys(REPORT_TYPES).find(key => REPORT_TYPES[key] === report?.type)],
-                ),
-              },
-            ]}
-          />
-        </div>
-        <div className={styles.title}>
-          <Icon size="lg">{icon}</Icon>
-          <InlineEditField
-            key={name}
-            name="name"
-            value={name}
-            placeholder={defaultName}
-            onCommit={handleNameChange}
-          />
-        </div>
-        <div className={styles.description}>
-          <InlineEditField
-            key={description}
-            name="description"
-            value={description}
-            placeholder={`+ ${formatMessage(labels.addDescription)}`}
-            onCommit={handleDescriptionChange}
-          />
-        </div>
-      </div>
-      <div className={styles.actions}>
+    <Column marginY="6" gap="3" gridColumn="1 / 3">
+      <Row gap="3" alignItems="center">
+        <Icon size="sm">{icon}</Icon>
+        <Text transform="uppercase" weight="bold">
+          {formatMessage(
+            labels[Object.keys(REPORT_TYPES).find(key => REPORT_TYPES[key] === report?.type)],
+          )}
+        </Text>
+      </Row>
+      <Row justifyContent="space-between" alignItems="center">
+        <Row gap="6">
+          <Column gap="3">
+            <Row gap="3" alignItems="center">
+              <InlineEditField key={name} name="name" value={name} onCommit={handleNameChange}>
+                <Heading>{name}</Heading>
+              </InlineEditField>
+            </Row>
+            <InlineEditField
+              key={description}
+              name="description"
+              value={description}
+              onCommit={handleDescriptionChange}
+            >
+              <Text>{description || `+ ${formatMessage(labels.addDescription)}`}</Text>
+            </InlineEditField>
+          </Column>
+        </Row>
         <LoadingButton
           variant="primary"
           isLoading={isCreating || isUpdating}
@@ -97,7 +94,7 @@ export function ReportHeader({ icon }) {
         >
           {formatMessage(labels.save)}
         </LoadingButton>
-      </div>
-    </div>
+      </Row>
+    </Column>
   );
 }
diff --git a/src/app/(main)/reports/[reportId]/ReportMenu.tsx b/src/app/(main)/reports/[reportId]/ReportMenu.tsx
index 22846d2a..3bdb1131 100644
--- a/src/app/(main)/reports/[reportId]/ReportMenu.tsx
+++ b/src/app/(main)/reports/[reportId]/ReportMenu.tsx
@@ -1,25 +1,26 @@
-import { useContext, useState } from 'react';
-import { Icon, Icons } from '@umami/react-zen';
-import classNames from 'classnames';
-import { ReportContext } from './Report';
-import styles from './ReportMenu.module.css';
+import { useState } from 'react';
+import { Button, Column, Icon, Row } from '@umami/react-zen';
+import { Icons } from '@/components/icons';
+import { useReport } from '@/components/hooks';
 
 export function ReportMenu({ children }) {
   const [collapsed, setCollapsed] = useState(false);
-  const { report } = useContext(ReportContext);
+  const { report } = useReport();
 
   if (!report) {
     return null;
   }
 
   return (
-    <div className={classNames(styles.menu, collapsed && styles.collapsed)}>
-      <div className={styles.button} onClick={() => setCollapsed(!collapsed)}>
-        <Icon rotate={collapsed ? -90 : 90}>
-          <Icons.Chevron />
-        </Icon>
-      </div>
+    <Column>
+      <Row alignItems="center" justifyContent="flex-end">
+        <Button variant="quiet" onPress={() => setCollapsed(!collapsed)}>
+          <Icon>
+            <Icons.PanelLeft />
+          </Icon>
+        </Button>
+      </Row>
       {!collapsed && children}
-    </div>
+    </Column>
   );
 }
diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index fe6bbe63..62a7bfcc 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -1,7 +1,7 @@
 import { Icon, Text, Row, Column, Grid } from '@umami/react-zen';
 import { useMessages, useNavigation } from '@/components/hooks';
 import { Icons } from '@/components/icons';
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { LinkButton } from '@/components/common/LinkButton';
 
 export function ReportTemplates({ showHeader = true }: { showHeader?: boolean }) {
@@ -71,7 +71,7 @@ function ReportItem({ title, description, url, icon }) {
   const { formatMessage, labels } = useMessages();
 
   return (
-    <Column gap="6" padding="6" borderSize="1" borderRadius="3" justifyContent="space-between">
+    <Column gap="6" padding="6" border borderRadius="3" justifyContent="space-between">
       <Row gap="3" alignItems="center">
         <Icon size="md">{icon}</Icon>
         <Text size="5" weight="bold">
diff --git a/src/app/(main)/reports/event-data/EventDataParameters.tsx b/src/app/(main)/reports/event-data/EventDataParameters.tsx
index a57ab126..776ed1d5 100644
--- a/src/app/(main)/reports/event-data/EventDataParameters.tsx
+++ b/src/app/(main)/reports/event-data/EventDataParameters.tsx
@@ -1,4 +1,3 @@
-import { useContext } from 'react';
 import {
   Form,
   FormField,
@@ -10,9 +9,8 @@ import {
 } from '@umami/react-zen';
 import { Empty } from '@/components/common/Empty';
 import { Icons } from '@/components/icons';
-import { useApi, useMessages } from '@/components/hooks';
+import { useApi, useMessages, useReport } from '@/components/hooks';
 import { DATA_TYPES, REPORT_PARAMETERS } from '@/lib/constants';
-import { ReportContext } from '../[reportId]/Report';
 import { FieldAddForm } from '../[reportId]/FieldAddForm';
 import { ParameterList } from '../[reportId]/ParameterList';
 import { BaseParameters } from '../[reportId]/BaseParameters';
@@ -35,7 +33,7 @@ function useFields(websiteId, startDate, endDate) {
 }
 
 export function EventDataParameters() {
-  const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
+  const { report, runReport, updateReport, isRunning } = useReport();
   const { formatMessage, labels, messages } = useMessages();
   const { id, parameters } = report || {};
   const { websiteId, dateRange, fields, filters, groups } = parameters || {};
diff --git a/src/app/(main)/reports/event-data/EventDataTable.tsx b/src/app/(main)/reports/event-data/EventDataTable.tsx
index 3c861c6c..7aec1b77 100644
--- a/src/app/(main)/reports/event-data/EventDataTable.tsx
+++ b/src/app/(main)/reports/event-data/EventDataTable.tsx
@@ -1,10 +1,8 @@
-import { useContext } from 'react';
 import { DataTable, DataColumn } from '@umami/react-zen';
-import { useMessages } from '@/components/hooks';
-import { ReportContext } from '../[reportId]/Report';
+import { useMessages, useReport } from '@/components/hooks';
 
 export function EventDataTable() {
-  const { report } = useContext(ReportContext);
+  const { report } = useReport();
   const { formatMessage, labels } = useMessages();
 
   return (
diff --git a/src/app/(main)/reports/funnel/FunnelChart.tsx b/src/app/(main)/reports/funnel/FunnelChart.tsx
index e5c3c9d4..fb335f0b 100644
--- a/src/app/(main)/reports/funnel/FunnelChart.tsx
+++ b/src/app/(main)/reports/funnel/FunnelChart.tsx
@@ -1,7 +1,5 @@
-import { useContext } from 'react';
 import classNames from 'classnames';
-import { useMessages } from '@/components/hooks';
-import { ReportContext } from '../[reportId]/Report';
+import { useMessages, useReport } from '@/components/hooks';
 import { formatLongNumber } from '@/lib/format';
 import styles from './FunnelChart.module.css';
 
@@ -11,7 +9,7 @@ export interface FunnelChartProps {
 }
 
 export function FunnelChart({ className }: FunnelChartProps) {
-  const { report } = useContext(ReportContext);
+  const { report } = useReport();
   const { formatMessage, labels } = useMessages();
 
   const { data } = report || {};
diff --git a/src/app/(main)/reports/funnel/FunnelParameters.tsx b/src/app/(main)/reports/funnel/FunnelParameters.tsx
index 8a0cdada..f8acc8d1 100644
--- a/src/app/(main)/reports/funnel/FunnelParameters.tsx
+++ b/src/app/(main)/reports/funnel/FunnelParameters.tsx
@@ -1,5 +1,4 @@
-import { useContext } from 'react';
-import { useMessages } from '@/components/hooks';
+import { useMessages, useReport } from '@/components/hooks';
 import {
   Icon,
   Form,
@@ -13,14 +12,12 @@ import {
 } from '@umami/react-zen';
 import { Icons } from '@/components/icons';
 import { FunnelStepAddForm } from './FunnelStepAddForm';
-import { ReportContext } from '../[reportId]/Report';
 import { BaseParameters } from '../[reportId]/BaseParameters';
 import { ParameterList } from '../[reportId]/ParameterList';
-import { PopupForm } from '../[reportId]/PopupForm';
 import styles from './FunnelParameters.module.css';
 
 export function FunnelParameters() {
-  const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
+  const { report, runReport, updateReport, isRunning } = useReport();
   const { formatMessage, labels } = useMessages();
 
   const { id, parameters } = report || {};
@@ -66,9 +63,7 @@ export function FunnelParameters() {
           </Icon>
         </Button>
         <Popover placement="start">
-          <PopupForm>
-            <FunnelStepAddForm onChange={handleAddStep} />
-          </PopupForm>
+          <FunnelStepAddForm onChange={handleAddStep} />
         </Popover>
       </DialogTrigger>
     );
@@ -90,7 +85,6 @@ export function FunnelParameters() {
             return (
               <DialogTrigger key={index}>
                 <ParameterList.Item
-                  className={styles.item}
                   icon={step.type === 'url' ? <Icons.Eye /> : <Icons.Bolt />}
                   onRemove={() => handleRemoveStep(index)}
                 >
@@ -100,13 +94,11 @@ export function FunnelParameters() {
                 </ParameterList.Item>
                 <Popover placement="start">
                   {({ close }: any) => (
-                    <PopupForm>
-                      <FunnelStepAddForm
-                        type={step.type}
-                        value={step.value}
-                        onChange={handleUpdateStep.bind(null, close, index)}
-                      />
-                    </PopupForm>
+                    <FunnelStepAddForm
+                      type={step.type}
+                      value={step.value}
+                      onChange={handleUpdateStep.bind(null, close, index)}
+                    />
                   )}
                 </Popover>
               </DialogTrigger>
diff --git a/src/app/(main)/reports/goals/GoalsChart.tsx b/src/app/(main)/reports/goals/GoalsChart.tsx
index 831899fb..b69bf5e1 100644
--- a/src/app/(main)/reports/goals/GoalsChart.tsx
+++ b/src/app/(main)/reports/goals/GoalsChart.tsx
@@ -1,12 +1,10 @@
-import { useContext } from 'react';
 import classNames from 'classnames';
-import { useMessages } from '@/components/hooks';
-import { ReportContext } from '../[reportId]/Report';
+import { useMessages, useReport } from '@/components/hooks';
 import { formatLongNumber } from '@/lib/format';
 import styles from './GoalsChart.module.css';
 
 export function GoalsChart({ className }: { className?: string; isLoading?: boolean }) {
-  const { report } = useContext(ReportContext);
+  const { report } = useReport();
   const { formatMessage, labels } = useMessages();
 
   const { data } = report || {};
diff --git a/src/app/(main)/reports/goals/GoalsParameters.tsx b/src/app/(main)/reports/goals/GoalsParameters.tsx
index 75ec995a..b3e632fe 100644
--- a/src/app/(main)/reports/goals/GoalsParameters.tsx
+++ b/src/app/(main)/reports/goals/GoalsParameters.tsx
@@ -1,7 +1,6 @@
-import { useMessages } from '@/components/hooks';
+import { useMessages, useReport } from '@/components/hooks';
 import { Icons } from '@/components/icons';
 import { formatNumber } from '@/lib/format';
-import { useContext } from 'react';
 import {
   Button,
   Form,
@@ -15,12 +14,11 @@ import {
 } from '@umami/react-zen';
 import { BaseParameters } from '../[reportId]/BaseParameters';
 import { ParameterList } from '../[reportId]/ParameterList';
-import { ReportContext } from '../[reportId]/Report';
 import { GoalsAddForm } from './GoalsAddForm';
 import styles from './GoalsParameters.module.css';
 
 export function GoalsParameters() {
-  const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
+  const { report, runReport, updateReport, isRunning } = useReport();
   const { formatMessage, labels } = useMessages();
 
   const { id, parameters } = report || {};
@@ -76,7 +74,7 @@ export function GoalsParameters() {
     <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
       <BaseParameters allowWebsiteSelect={!id} />
       <AddGoalsButton />
-      <FormField label={formatMessage(labels.goals)}>
+      <FormField name="goal" label={formatMessage(labels.goals)}>
         <ParameterList>
           {goals.map(
             (
diff --git a/src/app/(main)/reports/insights/InsightsParameters.tsx b/src/app/(main)/reports/insights/InsightsParameters.tsx
index fbaa9e34..1844deb4 100644
--- a/src/app/(main)/reports/insights/InsightsParameters.tsx
+++ b/src/app/(main)/reports/insights/InsightsParameters.tsx
@@ -1,13 +1,11 @@
-import { useMessages } from '@/components/hooks';
-import { useContext } from 'react';
+import { useMessages, useReport } from '@/components/hooks';
 import { Form, FormButtons, FormSubmitButton } from '@umami/react-zen';
 import { BaseParameters } from '../[reportId]/BaseParameters';
-import { ReportContext } from '../[reportId]/Report';
 import { FieldParameters } from '../[reportId]/FieldParameters';
 import { FilterParameters } from '../[reportId]/FilterParameters';
 
 export function InsightsParameters() {
-  const { report, runReport, isRunning } = useContext(ReportContext);
+  const { report, runReport, isRunning } = useReport();
   const { formatMessage, labels } = useMessages();
   const { id, parameters } = report || {};
   const { websiteId, dateRange, fields, filters } = parameters || {};
@@ -20,7 +18,7 @@ export function InsightsParameters() {
   };
 
   return (
-    <Form values={parameters} onSubmit={handleSubmit}>
+    <Form values={parameters} onSubmit={handleSubmit} gap="6">
       <BaseParameters allowWebsiteSelect={!id} />
       {parametersSelected && <FieldParameters />}
       {parametersSelected && <FilterParameters />}
diff --git a/src/app/(main)/reports/insights/InsightsTable.tsx b/src/app/(main)/reports/insights/InsightsTable.tsx
index 9095ff9f..e1bd59df 100644
--- a/src/app/(main)/reports/insights/InsightsTable.tsx
+++ b/src/app/(main)/reports/insights/InsightsTable.tsx
@@ -1,13 +1,12 @@
-import { useContext, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { DataTable, DataColumn } from '@umami/react-zen';
-import { useFormat, useMessages } from '@/components/hooks';
-import { ReportContext } from '../[reportId]/Report';
+import { useFormat, useMessages, useReport } from '@/components/hooks';
 import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder';
 import { formatShortTime } from '@/lib/format';
 
 export function InsightsTable() {
   const [fields, setFields] = useState([]);
-  const { report } = useContext(ReportContext);
+  const { report } = useReport();
   const { formatMessage, labels } = useMessages();
   const { formatValue } = useFormat();
 
diff --git a/src/app/(main)/reports/journey/JourneyParameters.tsx b/src/app/(main)/reports/journey/JourneyParameters.tsx
index 0ee197e9..839ce6dd 100644
--- a/src/app/(main)/reports/journey/JourneyParameters.tsx
+++ b/src/app/(main)/reports/journey/JourneyParameters.tsx
@@ -1,5 +1,4 @@
-import { useContext } from 'react';
-import { useMessages } from '@/components/hooks';
+import { useMessages, useReport } from '@/components/hooks';
 import {
   Select,
   Form,
@@ -9,11 +8,10 @@ import {
   FormSubmitButton,
   TextField,
 } from '@umami/react-zen';
-import { ReportContext } from '../[reportId]/Report';
 import { BaseParameters } from '../[reportId]/BaseParameters';
 
 export function JourneyParameters() {
-  const { report, runReport, isRunning } = useContext(ReportContext);
+  const { report, runReport, isRunning } = useReport();
   const { formatMessage, labels } = useMessages();
 
   const { id, parameters } = report || {};
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index 29eba2b3..0ec73126 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -1,10 +1,9 @@
-import { useContext, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import { TooltipTrigger, Tooltip, Focusable } from '@umami/react-zen';
 import { firstBy } from 'thenby';
 import classNames from 'classnames';
-import { useEscapeKey, useMessages } from '@/components/hooks';
+import { useEscapeKey, useMessages, useReport } from '@/components/hooks';
 import { objectToArray } from '@/lib/data';
-import { ReportContext } from '../[reportId]/Report';
 import styles from './JourneyView.module.css';
 import { formatLongNumber } from '@/lib/format';
 
@@ -15,7 +14,7 @@ const LINE_WIDTH = 3;
 export function JourneyView() {
   const [selectedNode, setSelectedNode] = useState(null);
   const [activeNode, setActiveNode] = useState(null);
-  const { report } = useContext(ReportContext);
+  const { report } = useReport();
   const { data, parameters } = report || {};
   const { formatMessage, labels } = useMessages();
 
diff --git a/src/app/(main)/reports/retention/RetentionParameters.tsx b/src/app/(main)/reports/retention/RetentionParameters.tsx
index 22a62fe7..e49c8529 100644
--- a/src/app/(main)/reports/retention/RetentionParameters.tsx
+++ b/src/app/(main)/reports/retention/RetentionParameters.tsx
@@ -1,12 +1,9 @@
-import { useContext } from 'react';
-import { useMessages } from '@/components/hooks';
+import { useMessages, useReport } from '@/components/hooks';
 import { Form, FormButtons, FormSubmitButton } from '@umami/react-zen';
-import { ReportContext } from '../[reportId]/Report';
 import { BaseParameters } from '../[reportId]/BaseParameters';
-import { parseDateRange } from '@/lib/date';
 
 export function RetentionParameters() {
-  const { report, runReport, isRunning, updateReport } = useContext(ReportContext);
+  const { report, runReport, isRunning } = useReport();
   const { formatMessage, labels } = useMessages();
 
   const { id, parameters } = report || {};
diff --git a/src/app/(main)/reports/retention/RetentionTable.tsx b/src/app/(main)/reports/retention/RetentionTable.tsx
index 3e57c2d0..78ee3fb4 100644
--- a/src/app/(main)/reports/retention/RetentionTable.tsx
+++ b/src/app/(main)/reports/retention/RetentionTable.tsx
@@ -1,8 +1,6 @@
-import { useContext } from 'react';
 import classNames from 'classnames';
-import { ReportContext } from '../[reportId]/Report';
 import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder';
-import { useMessages, useLocale } from '@/components/hooks';
+import { useMessages, useLocale, useReport } from '@/components/hooks';
 import { formatDate } from '@/lib/date';
 import styles from './RetentionTable.module.css';
 
@@ -11,7 +9,7 @@ const DAYS = [1, 2, 3, 4, 5, 6, 7, 14, 21, 28];
 export function RetentionTable({ days = DAYS }) {
   const { formatMessage, labels } = useMessages();
   const { locale } = useLocale();
-  const { report } = useContext(ReportContext);
+  const { report } = useReport();
   const { data } = report || {};
 
   if (!data) {
diff --git a/src/app/(main)/reports/revenue/RevenueParameters.tsx b/src/app/(main)/reports/revenue/RevenueParameters.tsx
index 81278faf..9bbd0044 100644
--- a/src/app/(main)/reports/revenue/RevenueParameters.tsx
+++ b/src/app/(main)/reports/revenue/RevenueParameters.tsx
@@ -1,12 +1,10 @@
-import { useMessages } from '@/components/hooks';
+import { useMessages, useReport } from '@/components/hooks';
 import { useRevenueValuesQuery } from '@/components/hooks/queries/useRevenueValuesQuery';
-import { useContext } from 'react';
 import { Select, Form, FormButtons, FormField, ListItem, FormSubmitButton } from '@umami/react-zen';
 import { BaseParameters } from '../[reportId]/BaseParameters';
-import { ReportContext } from '../[reportId]/Report';
 
 export function RevenueParameters() {
-  const { report, runReport, isRunning } = useContext(ReportContext);
+  const { report, runReport, isRunning } = useReport();
   const { formatMessage, labels } = useMessages();
   const { id, parameters } = report || {};
   const { websiteId, dateRange } = parameters || {};
diff --git a/src/app/(main)/reports/revenue/RevenueTable.tsx b/src/app/(main)/reports/revenue/RevenueTable.tsx
index 127fc6d1..cc0c8013 100644
--- a/src/app/(main)/reports/revenue/RevenueTable.tsx
+++ b/src/app/(main)/reports/revenue/RevenueTable.tsx
@@ -1,12 +1,10 @@
 import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder';
-import { useMessages } from '@/components/hooks';
-import { useContext } from 'react';
+import { useMessages, useReport } from '@/components/hooks';
 import { DataColumn, DataTable } from '@umami/react-zen';
-import { ReportContext } from '../[reportId]/Report';
 import { formatLongCurrency } from '@/lib/format';
 
 export function RevenueTable() {
-  const { report } = useContext(ReportContext);
+  const { report } = useReport();
   const { formatMessage, labels } = useMessages();
   const { data } = report || {};
 
diff --git a/src/app/(main)/reports/revenue/RevenueView.tsx b/src/app/(main)/reports/revenue/RevenueView.tsx
index 8df4d59e..e3e60c76 100644
--- a/src/app/(main)/reports/revenue/RevenueView.tsx
+++ b/src/app/(main)/reports/revenue/RevenueView.tsx
@@ -3,16 +3,15 @@ import { colord } from 'colord';
 import { BarChart } from '@/components/charts/BarChart';
 import { PieChart } from '@/components/charts/PieChart';
 import { TypeIcon } from '@/components/common/TypeIcon';
-import { useCountryNames, useLocale, useMessages } from '@/components/hooks';
-import { GridRow } from '@/components/layout/GridRow';
+import { useCountryNames, useLocale, useMessages, useReport } from '@/components/hooks';
+import { GridRow } from '@/components/common/GridRow';
 import { ListTable } from '@/components/metrics/ListTable';
 import { MetricCard } from '@/components/metrics/MetricCard';
 import { MetricsBar } from '@/components/metrics/MetricsBar';
 import { renderDateLabels } from '@/lib/charts';
 import { CHART_COLORS } from '@/lib/constants';
 import { formatLongCurrency, formatLongNumber } from '@/lib/format';
-import { useCallback, useContext, useMemo } from 'react';
-import { ReportContext } from '../[reportId]/Report';
+import { useCallback, useMemo } from 'react';
 import { RevenueTable } from './RevenueTable';
 import styles from './RevenueView.module.css';
 
@@ -24,7 +23,7 @@ export function RevenueView({ isLoading }: RevenueViewProps) {
   const { formatMessage, labels } = useMessages();
   const { locale } = useLocale();
   const { countryNames } = useCountryNames(locale);
-  const { report } = useContext(ReportContext);
+  const { report } = useReport();
   const {
     data,
     parameters: { dateRange, currency },
diff --git a/src/app/(main)/reports/utm/UTMParameters.tsx b/src/app/(main)/reports/utm/UTMParameters.tsx
index 1ba7a616..759f77f5 100644
--- a/src/app/(main)/reports/utm/UTMParameters.tsx
+++ b/src/app/(main)/reports/utm/UTMParameters.tsx
@@ -1,11 +1,9 @@
-import { useContext } from 'react';
-import { useMessages } from '@/components/hooks';
+import { useMessages, useReport } from '@/components/hooks';
 import { Form, FormButtons, FormSubmitButton } from '@umami/react-zen';
-import { ReportContext } from '../[reportId]/Report';
 import { BaseParameters } from '../[reportId]/BaseParameters';
 
 export function UTMParameters() {
-  const { report, runReport, isRunning } = useContext(ReportContext);
+  const { report, runReport, isRunning } = useReport();
   const { formatMessage, labels } = useMessages();
 
   const { id, parameters } = report || {};
diff --git a/src/app/(main)/reports/utm/UTMView.tsx b/src/app/(main)/reports/utm/UTMView.tsx
index 77443814..fea15fd8 100644
--- a/src/app/(main)/reports/utm/UTMView.tsx
+++ b/src/app/(main)/reports/utm/UTMView.tsx
@@ -1,7 +1,6 @@
-import { useContext } from 'react';
 import { firstBy } from 'thenby';
-import { ReportContext } from '../[reportId]/Report';
 import { CHART_COLORS, UTM_PARAMS } from '@/lib/constants';
+import { useReport } from '@/components/hooks';
 import { PieChart } from '@/components/charts/PieChart';
 import { ListTable } from '@/components/metrics/ListTable';
 import styles from './UTMView.module.css';
@@ -17,7 +16,7 @@ function toArray(data: { [key: string]: number } = {}) {
 
 export function UTMView() {
   const { formatMessage, labels } = useMessages();
-  const { report } = useContext(ReportContext);
+  const { report } = useReport();
   const { data } = report || {};
 
   if (!data) {
diff --git a/src/app/(main)/settings/SettingsLayout.tsx b/src/app/(main)/settings/SettingsLayout.tsx
index b4562285..47d9d6ac 100644
--- a/src/app/(main)/settings/SettingsLayout.tsx
+++ b/src/app/(main)/settings/SettingsLayout.tsx
@@ -2,7 +2,7 @@
 import { ReactNode } from 'react';
 import { Grid, Column } from '@umami/react-zen';
 import { useLoginQuery, useMessages } from '@/components/hooks';
-import { SideBar } from '@/components/layout/SideBar';
+import { SideBar } from '@/components/common/SideBar';
 
 export function SettingsLayout({ children }: { children: ReactNode }) {
   const { user } = useLoginQuery();
diff --git a/src/app/(main)/settings/teams/TeamsHeader.tsx b/src/app/(main)/settings/teams/TeamsHeader.tsx
index 91211f95..61244033 100644
--- a/src/app/(main)/settings/teams/TeamsHeader.tsx
+++ b/src/app/(main)/settings/teams/TeamsHeader.tsx
@@ -1,5 +1,5 @@
 import { Row } from '@umami/react-zen';
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { ROLES } from '@/lib/constants';
 import { useLoginQuery, useMessages } from '@/components/hooks';
 import { TeamsJoinButton } from './TeamsJoinButton';
diff --git a/src/app/(main)/settings/users/UsersHeader.tsx b/src/app/(main)/settings/users/UsersHeader.tsx
index b94f0c26..9d866b2f 100644
--- a/src/app/(main)/settings/users/UsersHeader.tsx
+++ b/src/app/(main)/settings/users/UsersHeader.tsx
@@ -1,4 +1,4 @@
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { useMessages } from '@/components/hooks';
 import { UserAddButton } from './UserAddButton';
 
diff --git a/src/app/(main)/settings/users/[userId]/UserSettings.tsx b/src/app/(main)/settings/users/[userId]/UserSettings.tsx
index 505e8ea4..9aaee5e2 100644
--- a/src/app/(main)/settings/users/[userId]/UserSettings.tsx
+++ b/src/app/(main)/settings/users/[userId]/UserSettings.tsx
@@ -2,7 +2,7 @@ import { useContext } from 'react';
 import { Tabs, Tab, TabList, TabPanel } from '@umami/react-zen';
 import { Icons } from '@/components/icons';
 import { UserEditForm } from './UserEditForm';
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { useMessages } from '@/components/hooks';
 import { UserWebsites } from './UserWebsites';
 import { UserContext } from './UserProvider';
diff --git a/src/app/(main)/settings/websites/WebsitesHeader.tsx b/src/app/(main)/settings/websites/WebsitesHeader.tsx
index 997cae8b..4ccbca00 100644
--- a/src/app/(main)/settings/websites/WebsitesHeader.tsx
+++ b/src/app/(main)/settings/websites/WebsitesHeader.tsx
@@ -1,5 +1,5 @@
 import { useMessages, useNavigation } from '@/components/hooks';
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { WebsiteAddButton } from './WebsiteAddButton';
 
 export interface WebsitesHeaderProps {
diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
index b64468f1..114485c8 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
@@ -10,7 +10,7 @@ import {
 import { WebsiteDeleteForm } from './WebsiteDeleteForm';
 import { WebsiteResetForm } from './WebsiteResetForm';
 import { WebsiteTransferForm } from './WebsiteTransferForm';
-import { ActionForm } from '@/components/layout/ActionForm';
+import { ActionForm } from '@/components/common/ActionForm';
 import { ROLES } from '@/lib/constants';
 
 export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?: () => void }) {
diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
index d0bcc512..1e4e2a11 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
@@ -4,7 +4,7 @@ import Link from 'next/link';
 import { WebsiteContext } from '@/app/(main)/websites/[websiteId]/WebsiteProvider';
 import { useMessages } from '@/components/hooks';
 import { Icons } from '@/components/icons';
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { ShareUrl } from './ShareUrl';
 import { TrackingCode } from './TrackingCode';
 import { WebsiteData } from './WebsiteData';
diff --git a/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx
index d52196fe..62f4663e 100644
--- a/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx
@@ -2,7 +2,7 @@
 import { ReactNode } from 'react';
 import { useMessages, useNavigation } from '@/components/hooks';
 import { Grid, Column } from '@umami/react-zen';
-import { SideBar } from '@/components/layout/SideBar';
+import { SideBar } from '@/components/common/SideBar';
 
 export function TeamSettingsLayout({ children }: { children: ReactNode }) {
   const { formatMessage, labels } = useMessages();
diff --git a/src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsx
index 01b15d35..344c9223 100644
--- a/src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsx
@@ -1,7 +1,7 @@
 'use client';
 import { TeamContext } from '@/app/(main)/teams/[teamId]/TeamProvider';
 import { TeamMembersDataTable } from './TeamMembersDataTable';
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { useLoginQuery, useMessages } from '@/components/hooks';
 import { ROLES } from '@/lib/constants';
 import { useContext } from 'react';
diff --git a/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx
index 680088f5..2078dea9 100644
--- a/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx
@@ -1,14 +1,14 @@
 import { TeamContext } from '@/app/(main)/teams/[teamId]/TeamProvider';
 import { useLoginQuery, useMessages } from '@/components/hooks';
 import { Icons } from '@/components/icons';
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { ROLES } from '@/lib/constants';
 import { useContext, useState } from 'react';
 import { Column, Tabs, TabList, Tab, TabPanel } from '@umami/react-zen';
 import { TeamLeaveButton } from '@/app/(main)/settings/teams/TeamLeaveButton';
 import { TeamManage } from './TeamManage';
 import { TeamEditForm } from './TeamEditForm';
-import { Panel } from '@/components/layout/Panel';
+import { Panel } from '@/components/common/Panel';
 
 export function TeamDetails({ teamId }: { teamId: string }) {
   const team = useContext(TeamContext);
diff --git a/src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsx
index 8579500b..120fe5c9 100644
--- a/src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsx
@@ -1,7 +1,7 @@
 import { useMessages, useModified } from '@/components/hooks';
 import { useRouter } from 'next/navigation';
 import { Button, Modal, DialogTrigger, Dialog } from '@umami/react-zen';
-import { ActionForm } from '@/components/layout/ActionForm';
+import { ActionForm } from '@/components/common/ActionForm';
 import { TeamDeleteForm } from './TeamDeleteForm';
 
 export function TeamManage({ teamId }: { teamId: string }) {
diff --git a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsx
index 46587bf8..f9261a99 100644
--- a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsx
@@ -2,7 +2,7 @@
 import { TeamContext } from '@/app/(main)/teams/[teamId]/TeamProvider';
 import { WebsiteAddButton } from '@/app/(main)/settings/websites/WebsiteAddButton';
 import { useLoginQuery, useMessages } from '@/components/hooks';
-import { PageHeader } from '@/components/layout/PageHeader';
+import { PageHeader } from '@/components/common/PageHeader';
 import { TeamWebsitesDataTable } from './TeamWebsitesDataTable';
 import { ROLES } from '@/lib/constants';
 import { useContext } from 'react';
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
index e90bd75a..39539594 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
@@ -1,9 +1,7 @@
 'use client';
 import { Column } from '@umami/react-zen';
-import { Panel } from '@/components/layout/Panel';
-import { FilterTags } from '@/components/metrics/FilterTags';
+import { Panel } from '@/components/common/Panel';
 import { useNavigation } from '@/components/hooks';
-import { FILTER_COLUMNS } from '@/lib/constants';
 import { WebsiteChart } from './WebsiteChart';
 import { WebsiteExpandedView } from './WebsiteExpandedView';
 import { WebsiteHeader } from './WebsiteHeader';
@@ -11,21 +9,16 @@ import { WebsiteMetricsBar } from './WebsiteMetricsBar';
 import { WebsiteTableView } from './WebsiteTableView';
 
 export function WebsiteDetailsPage({ websiteId }: { websiteId: string }) {
-  const { query } = useNavigation();
-  const { view } = query;
-
-  const params = Object.keys(query).reduce((obj, key) => {
-    if (FILTER_COLUMNS[key]) {
-      obj[key] = query[key];
-    }
-    return obj;
-  }, {});
+  const {
+    query: { view },
+  } = useNavigation();
 
   return (
     <Column gap="3">
       <WebsiteHeader websiteId={websiteId} />
-      <FilterTags websiteId={websiteId} params={params} />
-      <WebsiteMetricsBar websiteId={websiteId} showFilter={true} showChange={true} />
+      <Panel>
+        <WebsiteMetricsBar websiteId={websiteId} showFilter={true} showChange={true} />
+      </Panel>
       <Panel>
         <WebsiteChart websiteId={websiteId} />
       </Panel>
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
index 2db567ea..c7412449 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
@@ -1,7 +1,7 @@
 import { Icon, Icons, Text, Grid, Column } from '@umami/react-zen';
 import { LinkButton } from '@/components/common/LinkButton';
 import { useMessages, useNavigation } from '@/components/hooks';
-import { SideBar } from '@/components/layout/SideBar';
+import { SideBar } from '@/components/common/SideBar';
 import { BrowsersTable } from '@/components/metrics/BrowsersTable';
 import { CitiesTable } from '@/components/metrics/CitiesTable';
 import { CountriesTable } from '@/components/metrics/CountriesTable';
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index 154ec5b5..de3abc28 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -1,31 +1,80 @@
-import { ReactNode } from 'react';
-import { Row, Heading } from '@umami/react-zen';
+import {
+  Column,
+  Row,
+  Heading,
+  MenuTrigger,
+  Button,
+  Icon,
+  Icons,
+  Popover,
+  Menu,
+  MenuItem,
+  MenuSeparator,
+} from '@umami/react-zen';
 import { Favicon } from '@/components/common/Favicon';
 import { ActiveUsers } from '@/components/metrics/ActiveUsers';
 import { WebsiteTabs } from '@/app/(main)/websites/[websiteId]/WebsiteTabs';
 import { useWebsite } from '@/components/hooks/useWebsite';
+import { WebsiteFilterButton } from '@/app/(main)/websites/[websiteId]/WebsiteFilterButton';
+import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
+import { FilterTags } from '@/components/metrics/FilterTags';
+import { useMessages } from '@/components/hooks';
 
 export function WebsiteHeader({
   websiteId,
-  children,
+  showFilter = true,
+  allowEdit = true,
+  compareMode = false,
 }: {
   websiteId: string;
-  children?: ReactNode;
+  showFilter?: boolean;
+  allowEdit?: boolean;
+  compareMode?: boolean;
 }) {
   const website = useWebsite();
+  const { formatMessage, labels } = useMessages();
   const { name, domain } = website || {};
 
+  const items = [
+    { label: formatMessage(labels.previousPeriod), value: 'prev' },
+    { label: formatMessage(labels.previousYear), value: 'yoy' },
+  ];
+
   return (
-    <>
-      <Row alignItems="center" gap="3" marginY="6">
-        <Favicon domain={domain} />
-        <Heading>
-          {name}
-          <ActiveUsers websiteId={websiteId} />
-        </Heading>
-        {children}
+    <Column marginY="6" gap="6">
+      <Row alignItems="center" justifyContent="space-between" gap="3">
+        <Row alignItems="center" gap="3">
+          <Favicon domain={domain} />
+          <Heading>
+            {name}
+            <ActiveUsers websiteId={websiteId} />
+          </Heading>
+        </Row>
+        <Row alignItems="center" gap="3">
+          {showFilter && <WebsiteFilterButton websiteId={websiteId} />}
+          <WebsiteDateFilter websiteId={websiteId} />
+          {allowEdit && (
+            <MenuTrigger>
+              <Button variant="quiet">
+                <Icon>
+                  <Icons.More />
+                </Icon>
+              </Button>
+              <Popover placement="bottom end">
+                <Menu>
+                  <MenuItem>Compare dates</MenuItem>
+                  <MenuItem>Share</MenuItem>
+                  <MenuSeparator />
+                  <MenuItem>Settings</MenuItem>
+                </Menu>
+              </Popover>
+            </MenuTrigger>
+          )}
+        </Row>
       </Row>
+      {compareMode && items.map(item => <div key={item.value}>{item.label}</div>)}
+      <FilterTags websiteId={websiteId} />
       <WebsiteTabs websiteId={websiteId} />
-    </>
+    </Column>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index 912aeee4..1672b8a0 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -1,24 +1,16 @@
-import { Select, ListItem } from '@umami/react-zen';
-import classNames from 'classnames';
-import { useDateRange, useMessages, useSticky } from '@/components/hooks';
-import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
+import { useDateRange, useMessages } from '@/components/hooks';
 import { MetricCard } from '@/components/metrics/MetricCard';
 import { MetricsBar } from '@/components/metrics/MetricsBar';
 import { formatShortTime, formatLongNumber } from '@/lib/format';
 import { useWebsiteStatsQuery } from '@/components/hooks/queries/useWebsiteStatsQuery';
-import { useWebsites, setWebsiteDateCompare } from '@/store/websites';
-import { WebsiteFilterButton } from './WebsiteFilterButton';
-import styles from './WebsiteMetricsBar.module.css';
+import { useWebsites } from '@/store/websites';
 
 export function WebsiteMetricsBar({
   websiteId,
-  sticky,
   showChange = false,
   compareMode = false,
-  showFilter = false,
 }: {
   websiteId: string;
-  sticky?: boolean;
   showChange?: boolean;
   compareMode?: boolean;
   showFilter?: boolean;
@@ -26,7 +18,6 @@ export function WebsiteMetricsBar({
   const { dateRange } = useDateRange(websiteId);
   const { formatMessage, labels } = useMessages();
   const dateCompare = useWebsites(state => state[websiteId]?.dateCompare);
-  const { ref } = useSticky({ enabled: sticky });
   const { data, isLoading, isFetched, error } = useWebsiteStatsQuery(
     websiteId,
     compareMode && dateCompare,
@@ -76,51 +67,23 @@ export function WebsiteMetricsBar({
       ]
     : [];
 
-  const items = [
-    { label: formatMessage(labels.previousPeriod), value: 'prev' },
-    { label: formatMessage(labels.previousYear), value: 'yoy' },
-  ];
-
   return (
-    <div ref={ref} className={classNames(styles.container)}>
-      <div>
-        <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
-          {metrics.map(({ label, value, prev, change, formatValue, reverseColors }) => {
-            return (
-              <MetricCard
-                key={label}
-                value={value}
-                previousValue={prev}
-                label={label}
-                change={change}
-                formatValue={formatValue}
-                reverseColors={reverseColors}
-                showChange={!isAllTime && (compareMode || showChange)}
-                showPrevious={!isAllTime && compareMode}
-              />
-            );
-          })}
-        </MetricsBar>
-      </div>
-      <div className={styles.actions}>
-        {showFilter && <WebsiteFilterButton websiteId={websiteId} />}
-        <WebsiteDateFilter websiteId={websiteId} showAllTime={!compareMode} />
-        {compareMode && (
-          <div className={styles.vs}>
-            <b>VS</b>
-            <Select
-              className={styles.dropdown}
-              items={items}
-              value={dateCompare || 'prev'}
-              onChange={(value: any) => setWebsiteDateCompare(websiteId, value)}
-            >
-              {items.map(({ label, value }) => (
-                <ListItem key={value}>{label}</ListItem>
-              ))}
-            </Select>
-          </div>
-        )}
-      </div>
-    </div>
+    <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
+      {metrics.map(({ label, value, prev, change, formatValue, reverseColors }) => {
+        return (
+          <MetricCard
+            key={label}
+            value={value}
+            previousValue={prev}
+            label={label}
+            change={change}
+            formatValue={formatValue}
+            reverseColors={reverseColors}
+            showChange={!isAllTime && (compareMode || showChange)}
+            showPrevious={!isAllTime && compareMode}
+          />
+        );
+      })}
+    </MetricsBar>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
index 2f4191bd..acd268c8 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
@@ -1,5 +1,5 @@
 import { Grid } from '@umami/react-zen';
-import { Panel } from '@/components/layout/Panel';
+import { Panel } from '@/components/common/Panel';
 import { PagesTable } from '@/components/metrics/PagesTable';
 import { ReferrersTable } from '@/components/metrics/ReferrersTable';
 import { BrowsersTable } from '@/components/metrics/BrowsersTable';
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
index 980abc58..58fe395b 100644
--- a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
@@ -1,28 +1,17 @@
 'use client';
 import { Grid } from '@umami/react-zen';
-import { Panel } from '@/components/layout/Panel';
+import { Panel } from '@/components/common/Panel';
 import { WebsiteHeader } from '../WebsiteHeader';
 import { WebsiteMetricsBar } from '../WebsiteMetricsBar';
 import { FilterTags } from '@/components/metrics/FilterTags';
-import { useNavigation } from '@/components/hooks';
-import { FILTER_COLUMNS } from '@/lib/constants';
 import { WebsiteChart } from '../WebsiteChart';
 import { WebsiteCompareTables } from './WebsiteCompareTables';
 
 export function WebsiteComparePage({ websiteId }) {
-  const { query } = useNavigation();
-
-  const params = Object.keys(query).reduce((obj, key) => {
-    if (FILTER_COLUMNS[key]) {
-      obj[key] = query[key];
-    }
-    return obj;
-  }, {});
-
   return (
     <Grid gap="3">
       <WebsiteHeader websiteId={websiteId} />
-      <FilterTags websiteId={websiteId} params={params} />
+      <FilterTags websiteId={websiteId} />
       <WebsiteMetricsBar websiteId={websiteId} compareMode={true} showFilter={true} />
       <Panel>
         <WebsiteChart websiteId={websiteId} compareMode={true} />
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
index 9a93602d..1ccbbd83 100644
--- a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
@@ -1,6 +1,6 @@
 import { Grid, Heading, Column } from '@umami/react-zen';
 import { useDateRange, useMessages, useNavigation } from '@/components/hooks';
-import { SideBar } from '@/components/layout/SideBar';
+import { SideBar } from '@/components/common/SideBar';
 import { BrowsersTable } from '@/components/metrics/BrowsersTable';
 import { ChangeLabel } from '@/components/metrics/ChangeLabel';
 import { CitiesTable } from '@/components/metrics/CitiesTable';
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
index 3099898f..26fdfa5d 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
@@ -1,40 +1,35 @@
 import { useMessages } from '@/components/hooks';
 import { useWebsiteSessionStatsQuery } from '@/components/hooks/queries/useWebsiteSessionStatsQuery';
-import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
 import { MetricCard } from '@/components/metrics/MetricCard';
 import { MetricsBar } from '@/components/metrics/MetricsBar';
 import { formatLongNumber } from '@/lib/format';
-import { Flexbox } from '@umami/react-zen';
 
 export function EventsMetricsBar({ websiteId }: { websiteId: string }) {
   const { formatMessage, labels } = useMessages();
   const { data, isLoading, isFetched, error } = useWebsiteSessionStatsQuery(websiteId);
 
   return (
-    <Flexbox direction="row" justifyContent="space-between" style={{ minHeight: 120 }}>
-      <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
-        <MetricCard
-          value={data?.visitors?.value}
-          label={formatMessage(labels.visitors)}
-          formatValue={formatLongNumber}
-        />
-        <MetricCard
-          value={data?.visits?.value}
-          label={formatMessage(labels.visits)}
-          formatValue={formatLongNumber}
-        />
-        <MetricCard
-          value={data?.pageviews?.value}
-          label={formatMessage(labels.views)}
-          formatValue={formatLongNumber}
-        />
-        <MetricCard
-          value={data?.events?.value}
-          label={formatMessage(labels.events)}
-          formatValue={formatLongNumber}
-        />
-      </MetricsBar>
-      <WebsiteDateFilter websiteId={websiteId} />
-    </Flexbox>
+    <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
+      <MetricCard
+        value={data?.visitors?.value}
+        label={formatMessage(labels.visitors)}
+        formatValue={formatLongNumber}
+      />
+      <MetricCard
+        value={data?.visits?.value}
+        label={formatMessage(labels.visits)}
+        formatValue={formatLongNumber}
+      />
+      <MetricCard
+        value={data?.pageviews?.value}
+        label={formatMessage(labels.views)}
+        formatValue={formatLongNumber}
+      />
+      <MetricCard
+        value={data?.events?.value}
+        label={formatMessage(labels.events)}
+        formatValue={formatLongNumber}
+      />
+    </MetricsBar>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
index ff349c2b..25da014d 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
@@ -1,12 +1,12 @@
 'use client';
-import { TabList, Tab, Tabs, TabPanel, Grid } from '@umami/react-zen';
+import { TabList, Tab, Tabs, TabPanel, Column } from '@umami/react-zen';
 import { useState } from 'react';
 import { WebsiteHeader } from '../WebsiteHeader';
 import { EventsDataTable } from './EventsDataTable';
 import { EventsMetricsBar } from './EventsMetricsBar';
-import { Panel } from '@/components/layout/Panel';
+import { Panel } from '@/components/common/Panel';
 import { EventsChart } from '@/components/metrics/EventsChart';
-import { GridRow } from '@/components/layout/GridRow';
+import { GridRow } from '@/components/common/GridRow';
 import { MetricsTable } from '@/components/metrics/MetricsTable';
 import { useMessages } from '@/components/hooks';
 import { EventProperties } from './EventProperties';
@@ -16,9 +16,11 @@ export function EventsPage({ websiteId }) {
   const { formatMessage, labels } = useMessages();
 
   return (
-    <Grid gap="3">
+    <Column gap="3">
       <WebsiteHeader websiteId={websiteId} />
-      <EventsMetricsBar websiteId={websiteId} />
+      <Panel>
+        <EventsMetricsBar websiteId={websiteId} />
+      </Panel>
       <GridRow layout="two-one">
         <Panel>
           <EventsChart websiteId={websiteId} />
@@ -46,6 +48,6 @@ export function EventsPage({ websiteId }) {
           </TabPanel>
         </Tabs>
       </Panel>
-    </Grid>
+    </Column>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
index 00087743..20089bd3 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
@@ -1,36 +1,18 @@
 import { MetricCard } from '@/components/metrics/MetricCard';
 import { useMessages } from '@/components/hooks';
 import { RealtimeData } from '@/lib/types';
-import styles from './RealtimeHeader.module.css';
+import { MetricsBar } from '@/components/metrics/MetricsBar';
 
 export function RealtimeHeader({ data }: { data: RealtimeData }) {
   const { formatMessage, labels } = useMessages();
   const { totals }: any = data || {};
 
   return (
-    <div className={styles.header}>
-      <div className={styles.metrics}>
-        <MetricCard
-          className={styles.card}
-          label={formatMessage(labels.views)}
-          value={totals.views}
-        />
-        <MetricCard
-          className={styles.card}
-          label={formatMessage(labels.visitors)}
-          value={totals.visitors}
-        />
-        <MetricCard
-          className={styles.card}
-          label={formatMessage(labels.events)}
-          value={totals.events}
-        />
-        <MetricCard
-          className={styles.card}
-          label={formatMessage(labels.countries)}
-          value={totals.countries}
-        />
-      </div>
-    </div>
+    <MetricsBar isFetched={true}>
+      <MetricCard label={formatMessage(labels.views)} value={totals.views} />
+      <MetricCard label={formatMessage(labels.visitors)} value={totals.visitors} />
+      <MetricCard label={formatMessage(labels.events)} value={totals.events} />
+      <MetricCard label={formatMessage(labels.countries)} value={totals.countries} />
+    </MetricsBar>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx
index dabe6e87..82503bfd 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { useRouter } from 'next/navigation';
-import { Page } from '@/components/layout/Page';
-import { PageHeader } from '@/components/layout/PageHeader';
+import { Page } from '@/components/common/Page';
+import { PageHeader } from '@/components/common/PageHeader';
 import { useApi, useMessages } from '@/components/hooks';
 import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder';
 
diff --git a/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx b/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx
index cde3d5d4..f87bb1de 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx
@@ -1,9 +1,9 @@
 'use client';
 import { firstBy } from 'thenby';
 import { Grid } from '@umami/react-zen';
-import { GridRow } from '@/components/layout/GridRow';
-import { Page } from '@/components/layout/Page';
-import { Panel } from '@/components/layout/Panel';
+import { GridRow } from '@/components/common/GridRow';
+import { Page } from '@/components/common/Page';
+import { Panel } from '@/components/common/Panel';
 import { RealtimeChart } from '@/components/metrics/RealtimeChart';
 import { WorldMap } from '@/components/metrics/WorldMap';
 import { useRealtimeQuery } from '@/components/hooks';
@@ -30,7 +30,9 @@ export function WebsiteRealtimePage({ websiteId }) {
   return (
     <Grid gap="3">
       <WebsiteHeader websiteId={websiteId} />
-      <RealtimeHeader data={data} />
+      <Panel>
+        <RealtimeHeader data={data} />
+      </Panel>
       <Panel>
         <RealtimeChart data={data} unit="minute" />
       </Panel>
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
index 717b2655..b890bbd5 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
@@ -1,40 +1,35 @@
 import { useMessages } from '@/components/hooks';
 import { useWebsiteSessionStatsQuery } from '@/components/hooks/queries/useWebsiteSessionStatsQuery';
-import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
 import { MetricCard } from '@/components/metrics/MetricCard';
 import { MetricsBar } from '@/components/metrics/MetricsBar';
 import { formatLongNumber } from '@/lib/format';
-import { Flexbox } from '@umami/react-zen';
 
 export function SessionsMetricsBar({ websiteId }: { websiteId: string }) {
   const { formatMessage, labels } = useMessages();
   const { data, isLoading, isFetched, error } = useWebsiteSessionStatsQuery(websiteId);
 
   return (
-    <Flexbox direction="row" justifyContent="space-between" style={{ minHeight: 120 }}>
-      <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
-        <MetricCard
-          value={data?.visitors?.value}
-          label={formatMessage(labels.visitors)}
-          formatValue={formatLongNumber}
-        />
-        <MetricCard
-          value={data?.visits?.value}
-          label={formatMessage(labels.visits)}
-          formatValue={formatLongNumber}
-        />
-        <MetricCard
-          value={data?.pageviews?.value}
-          label={formatMessage(labels.views)}
-          formatValue={formatLongNumber}
-        />
-        <MetricCard
-          value={data?.countries?.value}
-          label={formatMessage(labels.countries)}
-          formatValue={formatLongNumber}
-        />
-      </MetricsBar>
-      <WebsiteDateFilter websiteId={websiteId} />
-    </Flexbox>
+    <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
+      <MetricCard
+        value={data?.visitors?.value}
+        label={formatMessage(labels.visitors)}
+        formatValue={formatLongNumber}
+      />
+      <MetricCard
+        value={data?.visits?.value}
+        label={formatMessage(labels.visits)}
+        formatValue={formatLongNumber}
+      />
+      <MetricCard
+        value={data?.pageviews?.value}
+        label={formatMessage(labels.views)}
+        formatValue={formatLongNumber}
+      />
+      <MetricCard
+        value={data?.countries?.value}
+        label={formatMessage(labels.countries)}
+        formatValue={formatLongNumber}
+      />
+    </MetricsBar>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
index c84e0c67..50250e82 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
@@ -1,24 +1,26 @@
 'use client';
+import { useState } from 'react';
+import { TabList, Tab, Tabs, TabPanel, Column } from '@umami/react-zen';
 import { WebsiteHeader } from '../WebsiteHeader';
 import { SessionsDataTable } from './SessionsDataTable';
 import { SessionsMetricsBar } from './SessionsMetricsBar';
 import { SessionProperties } from './SessionProperties';
 import { WorldMap } from '@/components/metrics/WorldMap';
-import { GridRow } from '@/components/layout/GridRow';
-import { TabList, Tab, Tabs, TabPanel } from '@umami/react-zen';
-import { useState } from 'react';
+import { GridRow } from '@/components/common/GridRow';
 import { useMessages } from '@/components/hooks';
 import { SessionsWeekly } from './SessionsWeekly';
-import { Panel } from '@/components/layout/Panel';
+import { Panel } from '@/components/common/Panel';
 
 export function SessionsPage({ websiteId }) {
   const [tab, setTab] = useState('activity');
   const { formatMessage, labels } = useMessages();
 
   return (
-    <>
+    <Column gap="3">
       <WebsiteHeader websiteId={websiteId} />
-      <SessionsMetricsBar websiteId={websiteId} />
+      <Panel>
+        <SessionsMetricsBar websiteId={websiteId} />
+      </Panel>
       <GridRow layout="two-one">
         <Panel padding="0">
           <WorldMap websiteId={websiteId} />
@@ -41,6 +43,6 @@ export function SessionsPage({ websiteId }) {
           </TabPanel>
         </Tabs>
       </Panel>
-    </>
+    </Column>
   );
 }
diff --git a/src/app/share/[...shareId]/SharePage.tsx b/src/app/share/[...shareId]/SharePage.tsx
index c45ebcaa..3e0d2c87 100644
--- a/src/app/share/[...shareId]/SharePage.tsx
+++ b/src/app/share/[...shareId]/SharePage.tsx
@@ -1,7 +1,7 @@
 'use client';
 import { WebsiteDetailsPage } from '../../(main)/websites/[websiteId]/WebsiteDetailsPage';
 import { useShareTokenQuery } from '@/components/hooks';
-import { Page } from '@/components/layout/Page';
+import { Page } from '@/components/common/Page';
 import { Header } from './Header';
 import { Footer } from './Footer';
 import styles from './SharePage.module.css';
diff --git a/src/components/boards/Board.tsx b/src/components/boards/Board.tsx
index 818ab597..70f0fa01 100644
--- a/src/components/boards/Board.tsx
+++ b/src/components/boards/Board.tsx
@@ -1,7 +1,9 @@
 import { Column } from '@umami/react-zen';
 
-export interface BoardProps {}
-
-export function Board(props: BoardProps) {
-  return <Column>{}</Column>;
+export interface BoardProps {
+  children?: React.ReactNode;
+}
+
+export function Board({ children }: BoardProps) {
+  return <Column>{children}</Column>;
 }
diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsx
index d5ee26a6..e47ea3cd 100644
--- a/src/components/charts/Chart.tsx
+++ b/src/components/charts/Chart.tsx
@@ -26,7 +26,6 @@ export function Chart({
   onCreate,
   onUpdate,
   onTooltip,
-  className,
   chartOptions,
   tooltip,
   ...props
diff --git a/src/components/layout/ActionForm.tsx b/src/components/common/ActionForm.tsx
similarity index 77%
rename from src/components/layout/ActionForm.tsx
rename to src/components/common/ActionForm.tsx
index d330feed..4794b9b3 100644
--- a/src/components/layout/ActionForm.tsx
+++ b/src/components/common/ActionForm.tsx
@@ -2,7 +2,7 @@ import { Row, Column, Text } from '@umami/react-zen';
 
 export function ActionForm({ label, description, children }) {
   return (
-    <Row padding="6" borderSize="1" borderRadius="3" justifyContent="space-between" shadow="2">
+    <Row padding="6" border borderRadius="3" justifyContent="space-between" shadow="2">
       <Column>
         <Text weight="bold">{label}</Text>
         <Text>{description}</Text>
diff --git a/src/components/layout/GridRow.tsx b/src/components/common/GridRow.tsx
similarity index 100%
rename from src/components/layout/GridRow.tsx
rename to src/components/common/GridRow.tsx
diff --git a/src/components/layout/Page.module.css b/src/components/common/Page.module.css
similarity index 100%
rename from src/components/layout/Page.module.css
rename to src/components/common/Page.module.css
diff --git a/src/components/layout/Page.tsx b/src/components/common/Page.tsx
similarity index 100%
rename from src/components/layout/Page.tsx
rename to src/components/common/Page.tsx
diff --git a/src/components/layout/PageHeader.module.css b/src/components/common/PageHeader.module.css
similarity index 100%
rename from src/components/layout/PageHeader.module.css
rename to src/components/common/PageHeader.module.css
diff --git a/src/components/layout/PageHeader.tsx b/src/components/common/PageHeader.tsx
similarity index 50%
rename from src/components/layout/PageHeader.tsx
rename to src/components/common/PageHeader.tsx
index 7c0757a9..33afca7d 100644
--- a/src/components/layout/PageHeader.tsx
+++ b/src/components/common/PageHeader.tsx
@@ -1,21 +1,25 @@
 import { ReactNode } from 'react';
-import { Heading, Icon, Row } from '@umami/react-zen';
+import { Heading, Icon, Row, Text } from '@umami/react-zen';
 
 export function PageHeader({
   title,
+  description,
   icon,
   children,
 }: {
-  title?: ReactNode;
+  title: string;
+  description?: string;
   icon?: ReactNode;
+  allowEdit?: boolean;
   className?: string;
   children?: ReactNode;
 }) {
   return (
-    <Row justifyContent="space-between" alignItems="center">
+    <Row justifyContent="space-between" alignItems="center" marginY="6">
       <Row gap="3">
         {icon && <Icon size="lg">{icon}</Icon>}
-        {title && <Heading>{title}</Heading>}
+        {title && <Heading size="2">{title}</Heading>}
+        {description && <Text color="muted">{description}</Text>}
       </Row>
       <Row justifyContent="flex-end">{children}</Row>
     </Row>
diff --git a/src/components/common/Panel.tsx b/src/components/common/Panel.tsx
new file mode 100644
index 00000000..6d86b284
--- /dev/null
+++ b/src/components/common/Panel.tsx
@@ -0,0 +1,6 @@
+import { Box } from '@umami/react-zen';
+import type { BoxProps } from '@umami/react-zen/Box';
+
+export function Panel(props: BoxProps) {
+  return <Box padding="6" border borderRadius="3" backgroundColor="solid" shadow="4" {...props} />;
+}
diff --git a/src/components/layout/SideBar.tsx b/src/components/common/SideBar.tsx
similarity index 100%
rename from src/components/layout/SideBar.tsx
rename to src/components/common/SideBar.tsx
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index 7b83cb18..ae0c3024 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -41,6 +41,7 @@ export * from './useMessages';
 export * from './useModified';
 export * from './usePagedQuery';
 export * from './useRegionNames';
+export * from './useReport';
 export * from './useSticky';
 export * from './useNavigation';
 export * from './useTheme';
diff --git a/src/components/hooks/useReport.ts b/src/components/hooks/useReport.ts
new file mode 100644
index 00000000..6e2276ac
--- /dev/null
+++ b/src/components/hooks/useReport.ts
@@ -0,0 +1,6 @@
+import { useContext } from 'react';
+import { ReportContext } from '@/app/(main)/reports/[reportId]/Report';
+
+export function useReport() {
+  return useContext(ReportContext);
+}
diff --git a/src/components/hooks/useTheme.ts b/src/components/hooks/useTheme.ts
index 592c833e..44b8e1aa 100644
--- a/src/components/hooks/useTheme.ts
+++ b/src/components/hooks/useTheme.ts
@@ -8,6 +8,7 @@ const selector = (state: { theme: string }) => state.theme;
 
 export function useTheme() {
   const theme = useApp(selector) || getItem(THEME_CONFIG) || DEFAULT_THEME;
+  const { primary, text, line, fill } = THEME_COLORS[theme];
   const primaryColor = colord(THEME_COLORS[theme].primary);
 
   const colors = useMemo(() => {
@@ -16,8 +17,8 @@ export function useTheme() {
         ...THEME_COLORS[theme],
       },
       chart: {
-        text: THEME_COLORS[theme].gray700,
-        line: THEME_COLORS[theme].gray200,
+        text,
+        line,
         views: {
           hoverBackgroundColor: primaryColor.alpha(0.7).toRgbString(),
           backgroundColor: primaryColor.alpha(0.4).toRgbString(),
@@ -32,10 +33,10 @@ export function useTheme() {
         },
       },
       map: {
-        baseColor: THEME_COLORS[theme].primary,
-        fillColor: THEME_COLORS[theme].gray100,
-        strokeColor: THEME_COLORS[theme].primary,
-        hoverColor: THEME_COLORS[theme].primary,
+        baseColor: primary,
+        fillColor: fill,
+        strokeColor: primary,
+        hoverColor: primary,
       },
     };
   }, [theme]);
diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsx
index 77c1c518..7aab419a 100644
--- a/src/components/input/DateFilter.tsx
+++ b/src/components/input/DateFilter.tsx
@@ -103,7 +103,9 @@ export function DateFilter({
           return (
             <>
               {divider && <ListSeparator />}
-              <ListItem id={value}>{label}</ListItem>
+              <ListItem key={value} id={value}>
+                {label}
+              </ListItem>
             </>
           );
         })}
diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsx
index 3527bdfb..52c4edc3 100644
--- a/src/components/input/WebsiteDateFilter.tsx
+++ b/src/components/input/WebsiteDateFilter.tsx
@@ -1,9 +1,8 @@
 import { useDateRange } from '@/components/hooks';
 import { isAfter } from 'date-fns';
 import { getOffsetDateRange } from '@/lib/date';
-import { Button, Icon, Icons } from '@umami/react-zen';
+import { Button, Icon, Icons, Row } from '@umami/react-zen';
 import { DateFilter } from './DateFilter';
-import styles from './WebsiteDateFilter.module.css';
 import { DateRange } from '@/lib/types';
 
 export function WebsiteDateFilter({
@@ -27,9 +26,22 @@ export function WebsiteDateFilter({
   };
 
   return (
-    <div className={styles.container}>
+    <Row gap="3">
+      {value !== 'all' && !value.startsWith('range') && (
+        <Row gap="1">
+          <Button onPress={() => handleIncrement(-1)} variant="quiet">
+            <Icon size="xs" rotate={180}>
+              <Icons.Chevron />
+            </Icon>
+          </Button>
+          <Button onPress={() => handleIncrement(1)} variant="quiet" isDisabled={disableForward}>
+            <Icon size="xs">
+              <Icons.Chevron />
+            </Icon>
+          </Button>
+        </Row>
+      )}
       <DateFilter
-        className={styles.dropdown}
         value={value}
         startDate={startDate}
         endDate={endDate}
@@ -37,20 +49,6 @@ export function WebsiteDateFilter({
         onChange={handleChange}
         showAllTime={showAllTime}
       />
-      {value !== 'all' && !value.startsWith('range') && (
-        <div className={styles.buttons}>
-          <Button onPress={() => handleIncrement(-1)}>
-            <Icon size="sm" rotate={180}>
-              <Icons.Chevron />
-            </Icon>
-          </Button>
-          <Button onPress={() => handleIncrement(1)} isDisabled={disableForward}>
-            <Icon size="sm">
-              <Icons.Chevron />
-            </Icon>
-          </Button>
-        </div>
-      )}
-    </div>
+    </Row>
   );
 }
diff --git a/src/components/layout/Panel.tsx b/src/components/layout/Panel.tsx
deleted file mode 100644
index 8effe196..00000000
--- a/src/components/layout/Panel.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Box } from '@umami/react-zen';
-import type { BoxProps } from '@umami/react-zen/Box';
-
-export function Panel(props: BoxProps) {
-  return (
-    <Box
-      padding="6"
-      borderSize="1"
-      borderRadius="3"
-      backgroundColor="solid"
-      shadow="4"
-      {...props}
-    />
-  );
-}
diff --git a/src/components/metrics/FilterTags.tsx b/src/components/metrics/FilterTags.tsx
index 377c8f0b..1e97e97c 100644
--- a/src/components/metrics/FilterTags.tsx
+++ b/src/components/metrics/FilterTags.tsx
@@ -9,18 +9,12 @@ import {
   useFilters,
 } from '@/components/hooks';
 import { FieldFilterEditForm } from '@/app/(main)/reports/[reportId]/FieldFilterEditForm';
-import { OPERATOR_PREFIXES } from '@/lib/constants';
+import { FILTER_COLUMNS, OPERATOR_PREFIXES } from '@/lib/constants';
 import { isSearchOperator, parseParameterValue } from '@/lib/params';
 import styles from './FilterTags.module.css';
 import { WebsiteFilterButton } from '@/app/(main)/websites/[websiteId]/WebsiteFilterButton';
 
-export function FilterTags({
-  websiteId,
-  params,
-}: {
-  websiteId: string;
-  params: { [key: string]: string };
-}) {
+export function FilterTags({ websiteId }: { websiteId: string }) {
   const { formatMessage, labels } = useMessages();
   const { formatValue } = useFormat();
   const { dateRange } = useDateRange(websiteId);
@@ -32,6 +26,14 @@ export function FilterTags({
   const { fields } = useFields();
   const { operatorLabels } = useFilters();
   const { startDate, endDate } = dateRange;
+  const { query } = useNavigation();
+
+  const params = Object.keys(query).reduce((obj, key) => {
+    if (FILTER_COLUMNS[key]) {
+      obj[key] = query[key];
+    }
+    return obj;
+  }, {});
 
   if (Object.keys(params).filter(key => params[key]).length === 0) {
     return null;
@@ -60,13 +62,13 @@ export function FilterTags({
   return (
     <Row
       gap="3"
-      backgroundColor="1"
+      backgroundColor="2"
       alignItems="center"
-      paddingX="3"
-      paddingY="2"
+      paddingX="5"
+      paddingY="3"
+      border
       borderRadius="2"
-      borderSize="1"
-      marginBottom="6"
+      wrap="wrap"
     >
       <Text weight="bold">{formatMessage(labels.filters)}</Text>
       {Object.keys(params).map(key => {
diff --git a/src/components/metrics/MetricCard.module.css b/src/components/metrics/MetricCard.module.css
index 93e6c6d7..ec390830 100644
--- a/src/components/metrics/MetricCard.module.css
+++ b/src/components/metrics/MetricCard.module.css
@@ -1,37 +1,8 @@
 .card {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  min-width: 150px;
-}
-
-.card.compare .change {
-  font-size: 16px;
-  margin: 10px 0;
-}
-
-.card:first-child {
-  padding-left: 0;
+  border-right: 1px solid var(--border-color);
+  padding: 0 50px;
 }
 
 .card:last-child {
-  border: 0;
-}
-
-.value {
-  font-size: 36px;
-  font-weight: 700;
-  white-space: nowrap;
-  color: var(--base900);
-  line-height: 1.5;
-}
-
-.value.prev {
-  color: var(--base800);
-}
-
-.label {
-  font-weight: 700;
-  white-space: nowrap;
-  color: var(--base800);
+  border-right: 0;
 }
diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx
index 5711e35e..7c7cfa87 100644
--- a/src/components/metrics/MetricCard.tsx
+++ b/src/components/metrics/MetricCard.tsx
@@ -1,4 +1,4 @@
-import classNames from 'classnames';
+import { Text, Column } from '@umami/react-zen';
 import { useSpring } from '@react-spring/web';
 import { formatNumber } from '@/lib/format';
 import { AnimatedDiv } from '@/components/common/AnimatedDiv';
@@ -15,7 +15,6 @@ export interface MetricCardProps {
   showLabel?: boolean;
   showChange?: boolean;
   showPrevious?: boolean;
-  className?: string;
 }
 
 export const MetricCard = ({
@@ -27,7 +26,6 @@ export const MetricCard = ({
   showLabel = true,
   showChange = false,
   showPrevious = false,
-  className,
 }: MetricCardProps) => {
   const diff = value - change;
   const pct = ((value - diff) / diff) * 100;
@@ -36,26 +34,19 @@ export const MetricCard = ({
   const prevProps = useSpring({ x: Number(diff) || 0, from: { x: 0 } });
 
   return (
-    <div className={classNames(styles.card, className, showPrevious && styles.compare)}>
-      {showLabel && <div className={styles.label}>{label}</div>}
-      <AnimatedDiv className={styles.value} title={value?.toString()}>
-        {props?.x?.to(x => formatValue(x))}
-      </AnimatedDiv>
+    <Column className={styles.card} justifyContent="center">
+      {showLabel && <Text weight="bold">{label}</Text>}
+      <Text size="8" weight="bold" wrap="nowrap">
+        <AnimatedDiv title={value?.toString()}>{props?.x?.to(x => formatValue(x))}</AnimatedDiv>
+      </Text>
       {showChange && (
-        <ChangeLabel
-          className={styles.change}
-          value={change}
-          title={formatValue(change)}
-          reverseColors={reverseColors}
-        >
+        <ChangeLabel value={change} title={formatValue(change)} reverseColors={reverseColors}>
           <AnimatedDiv>{changeProps?.x?.to(x => `${Math.abs(~~x)}%`)}</AnimatedDiv>
         </ChangeLabel>
       )}
       {showPrevious && (
-        <AnimatedDiv className={classNames(styles.value, styles.prev)} title={diff.toString()}>
-          {prevProps?.x?.to(x => formatValue(x))}
-        </AnimatedDiv>
+        <AnimatedDiv title={diff.toString()}>{prevProps?.x?.to(x => formatValue(x))}</AnimatedDiv>
       )}
-    </div>
+    </Column>
   );
 };
diff --git a/src/components/metrics/MetricsBar.module.css b/src/components/metrics/MetricsBar.module.css
deleted file mode 100644
index dadee9ef..00000000
--- a/src/components/metrics/MetricsBar.module.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.bar {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(140px, max-content));
-  gap: 20px;
-  width: 100%;
-  position: relative;
-}
-
-@media screen and (max-width: 768px) {
-  .bar {
-    grid-template-columns: 1fr 1fr;
-  }
-}
diff --git a/src/components/metrics/MetricsBar.tsx b/src/components/metrics/MetricsBar.tsx
index b005b34c..b35988be 100644
--- a/src/components/metrics/MetricsBar.tsx
+++ b/src/components/metrics/MetricsBar.tsx
@@ -1,8 +1,6 @@
 import { ReactNode } from 'react';
-import { Loading, Row } from '@umami/react-zen';
-import { cloneChildren } from '@/lib/react';
+import { Grid, Loading } from '@umami/react-zen';
 import { ErrorMessage } from '@/components/common/ErrorMessage';
-import { formatLongNumber } from '@/lib/format';
 
 export interface MetricsBarProps {
   isLoading?: boolean;
@@ -12,18 +10,15 @@ export interface MetricsBarProps {
 }
 
 export function MetricsBar({ children, isLoading, isFetched, error }: MetricsBarProps) {
-  const formatFunc = n => (n >= 0 ? formatLongNumber(n) : `-${formatLongNumber(Math.abs(n))}`);
-
   return (
-    <Row>
+    <>
       {isLoading && !isFetched && <Loading icon="dots" />}
       {error && <ErrorMessage />}
-      {!isLoading &&
-        !error &&
-        isFetched &&
-        cloneChildren(children, child => {
-          return { format: child?.props['format'] || formatFunc };
-        })}
-    </Row>
+      {!isLoading && !error && isFetched && (
+        <Grid columns="repeat(auto-fill, minmax(200px, 1fr))" width="100%" gapY="3">
+          {children}
+        </Grid>
+      )}
+    </>
   );
 }
diff --git a/src/index.ts b/src/index.ts
index 8cc8bcbc..f6663e46 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -52,7 +52,6 @@ export * from '@/components/common/Favicon';
 export * from '@/components/common/FilterButtons';
 export * from '@/components/common/FilterLink';
 export * from '@/components/common/HamburgerButton';
-export * from '@/components/common/HoverTooltip';
 export * from '@/components/common/LinkButton';
 export * from '@/components/common/MobileMenu';
 export * from '@/components/common/Pager';
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 3eddefdc..d758d572 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -195,31 +195,15 @@ export const ROLE_PERMISSIONS = {
 export const THEME_COLORS = {
   light: {
     primary: '#2680eb',
-    gray50: '#ffffff',
-    gray75: '#fafafa',
-    gray100: '#f5f5f5',
-    gray200: '#eaeaea',
-    gray300: '#e1e1e1',
-    gray400: '#cacaca',
-    gray500: '#b3b3b3',
-    gray600: '#8e8e8e',
-    gray700: '#6e6e6e',
-    gray800: '#4b4b4b',
-    gray900: '#2c2c2c',
+    text: '#838383',
+    line: '#d9d9d9',
+    fill: '#f9f9f9',
   },
   dark: {
     primary: '#2680eb',
-    gray50: '#252525',
-    gray75: '#2f2f2f',
-    gray100: '#323232',
-    gray200: '#3e3e3e',
-    gray300: '#4a4a4a',
-    gray400: '#5a5a5a',
-    gray500: '#6e6e6e',
-    gray600: '#909090',
-    gray700: '#b9b9b9',
-    gray800: '#e3e3e3',
-    gray900: '#ffffff',
+    text: '#7b7b7b',
+    line: '#3a3a3a',
+    fill: '#191919',
   },
 };
 
diff --git a/src/lib/date.ts b/src/lib/date.ts
index 96135845..996d3274 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -108,7 +108,7 @@ export function isValidTimezone(timezone: string) {
   try {
     Intl.DateTimeFormat(undefined, { timeZone: timezone });
     return true;
-  } catch (error) {
+  } catch {
     return false;
   }
 }
diff --git a/src/lib/format.ts b/src/lib/format.ts
index e497464a..83227b30 100644
--- a/src/lib/format.ts
+++ b/src/lib/format.ts
@@ -90,7 +90,7 @@ export function formatCurrency(value: number, currency: string, locale = 'en-US'
       style: 'currency',
       currency: currency,
     });
-  } catch (error) {
+  } catch {
     // Fallback to default currency format if an error occurs
     formattedValue = new Intl.NumberFormat(locale, {
       style: 'currency',
diff --git a/src/lib/url.ts b/src/lib/url.ts
index a039d7d8..fa97bc10 100644
--- a/src/lib/url.ts
+++ b/src/lib/url.ts
@@ -22,7 +22,7 @@ export function safeDecodeURI(s: string | undefined | null): string | undefined
 
   try {
     return decodeURI(s);
-  } catch (e) {
+  } catch {
     return s;
   }
 }
@@ -34,7 +34,7 @@ export function safeDecodeURIComponent(s: string | undefined | null): string | u
 
   try {
     return decodeURIComponent(s);
-  } catch (e) {
+  } catch {
     return s;
   }
 }
diff --git a/src/tracker/index.js b/src/tracker/index.js
index c423a66b..0d6c6ed6 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -217,6 +217,7 @@
         disabled = !!data.disabled;
         cache = data.cache;
       }
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       /* empty */
     }