diff --git a/README.md b/README.md
index 6d9755d4d..33a5aac39 100644
--- a/README.md
+++ b/README.md
@@ -1,69 +1,93 @@
-# umami
+<p align="center">
+  <img src="https://umami.is/images/umami-logo.png" alt="Umami Logo" width="100">
+</p>
 
-Umami is a simple, fast, privacy-focused alternative to Google Analytics.
+<h1 align="center">Umami</h1>
 
-## Getting started
+<p align="center">
+  <i>Umami is a simple, fast, privacy-focused alternative to Google Analytics.</i>
+</p>
 
-A detailed getting started guide can be found at [https://umami.is/docs/](https://umami.is/docs/)
+<p align="center">
+  <a href="https://github.com/umami-software/umami/releases">
+    <img src="https://img.shields.io/github/release/umami-software/umami.svg" alt="GitHub Release" />
+  </a>
+  <a href="https://github.com/umami-software/umami/blob/master/LICENSE">
+    <img src="https://img.shields.io/github/license/umami-software/umami.svg" alt="MIT License" />
+  </a>
+  <a href="https://github.com/umami-software/umami/actions">
+    <img src="https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml" alt="Build Status" />
+  </a>
+  <a href="https://analytics.umami.is/share/LGazGOecbDtaIwDr/umami.is" style="text-decoration: none;">
+    <img src="https://img.shields.io/badge/Try%20Demo%20Now-Click%20Here-brightgreen" alt="Umami Demo" />
+  </a>
+</p>
 
-## Installing from source
+---
+
+## 🚀 Getting Started
+
+A detailed getting started guide can be found at [umami.is/docs](https://umami.is/docs/).
+
+---
+
+## 🛠 Installing from Source
 
 ### Requirements
 
 - A server with Node.js version 16.13 or newer
-- A database. Umami supports [MySQL](https://www.mysql.com/) (minimum v8.0) and [Postgresql](https://www.postgresql.org/) (minimum v12.14) databases.
+- A database. Umami supports [MySQL](https://www.mysql.com/) (minimum v8.0) and [PostgreSQL](https://www.postgresql.org/) (minimum v12.14) databases.
 
 ### Install Yarn
 
-```
+```bash
 npm install -g yarn
 ```
 
-### Get the source code and install packages
+### Get the Source Code and Install Packages
 
-```
+```bash
 git clone https://github.com/umami-software/umami.git
 cd umami
 yarn install
 ```
 
-### Configure umami
+### Configure Umami
 
-Create an `.env` file with the following
+Create an `.env` file with the following:
 
-```
+```bash
 DATABASE_URL=connection-url
 ```
 
-The connection url is in the following format:
+The connection URL format:
 
-```
+```bash
 postgresql://username:mypassword@localhost:5432/mydb
-
 mysql://username:mypassword@localhost:3306/mydb
 ```
 
-### Build the application
+### Build the Application
 
 ```bash
 yarn build
 ```
 
-The build step will also create tables in your database if you are installing for the first time. It will also create a login user with username **admin** and password **umami**.
+*The build step will create tables in your database if you are installing for the first time. It will also create a login user with username **admin** and password **umami**.*
 
-### Start the application
+### Start the Application
 
 ```bash
 yarn start
 ```
 
-By default this will launch the application on `http://localhost:3000`. You will need to either
-[proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server
-or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.
+*By default, this will launch the application on `http://localhost:3000`. You will need to either [proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.*
 
-## Installing with Docker
+---
 
-To build the umami container and start up a Postgres database, run:
+## 🐳 Installing with Docker
+
+To build the Umami container and start up a Postgres database, run:
 
 ```bash
 docker compose up -d
@@ -81,7 +105,9 @@ Or with MySQL support:
 docker pull docker.umami.is/umami-software/umami:mysql-latest
 ```
 
-## Getting updates
+---
+
+## 🔄 Getting Updates
 
 To get the latest features, simply do a pull, install any new dependencies, and rebuild:
 
@@ -98,7 +124,36 @@ docker compose pull
 docker compose up --force-recreate
 ```
 
-## License
+---
 
-MIT
+## 🛟 Support
 
+<p align="center">
+  <a href="https://github.com/umami-software/umami">
+    <img src="https://img.shields.io/badge/GitHub--blue?style=social&logo=github" alt="GitHub" />
+  </a>
+  <a href="https://twitter.com/umami_software">
+    <img src="https://img.shields.io/badge/Twitter--blue?style=social&logo=twitter" alt="Twitter" />
+  </a>
+  <a href="https://linkedin.com/company/umami-software">
+    <img src="https://img.shields.io/badge/LinkedIn--blue?style=social&logo=linkedin" alt="LinkedIn" />
+  </a>
+  <a href="https://umami.is/discord">
+    <img src="https://img.shields.io/badge/Discord--blue?style=social&logo=discord" alt="Discord" />
+  </a>
+</p>
+
+[release-shield]: https://img.shields.io/github/release/umami-software/umami.svg
+[releases-url]: https://github.com/umami-software/umami/releases
+[license-shield]: https://img.shields.io/github/license/umami-software/umami.svg
+[license-url]: https://github.com/umami-software/umami/blob/master/LICENSE
+[build-shield]: https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml
+[build-url]: https://github.com/umami-software/umami/actions
+[github-shield]: https://img.shields.io/badge/GitHub--blue?style=social&logo=github
+[github-url]: https://github.com/umami-software/umami
+[twitter-shield]: https://img.shields.io/badge/Twitter--blue?style=social&logo=twitter
+[twitter-url]: https://twitter.com/umami_software
+[linkedin-shield]: https://img.shields.io/badge/LinkedIn--blue?style=social&logo=linkedin
+[linkedin-url]: https://linkedin.com/company/umami-software
+[discord-shield]: https://img.shields.io/badge/Discord--blue?style=social&logo=discord
+[discord-url]: https://discord.com/invite/4dz4zcXYrQ
diff --git a/package.json b/package.json
index be5bb5ac0..7f5c7c489 100644
--- a/package.json
+++ b/package.json
@@ -64,9 +64,9 @@
     ".next/cache"
   ],
   "dependencies": {
-    "@clickhouse/client": "^1.0.1",
+    "@clickhouse/client": "^1.0.2",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.13.0",
+    "@prisma/client": "5.14.0",
     "@prisma/extension-read-replicas": "^0.3.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
@@ -102,7 +102,7 @@
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
-    "prisma": "5.13.0",
+    "prisma": "5.14.0",
     "react": "^18.2.0",
     "react-basics": "^0.123.0",
     "react-beautiful-dnd": "^13.1.0",
diff --git a/public/intl/messages/am-ET.json b/public/intl/messages/am-ET.json
index 931935a29..a3b652bbb 100644
--- a/public/intl/messages/am-ET.json
+++ b/public/intl/messages/am-ET.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Average visit time"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
index 300d3e1a6..15f9647ca 100644
--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@@ -83,12 +83,6 @@
       "value": "المتوسط"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "متوسط وقت الزيارة"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "متوسط وقت الزيارة"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
index 4b8c964fb..22557a24e 100644
--- a/public/intl/messages/be-BY.json
+++ b/public/intl/messages/be-BY.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Сярэдняя даўжыня наведвання"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Сярэдняя даўжыня наведвання"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json
index 05de48d27..81661e3b7 100644
--- a/public/intl/messages/bn-BD.json
+++ b/public/intl/messages/bn-BD.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "গড় পরিদর্শনের সময়"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "গড় পরিদর্শনের সময়"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/bs-BA.json b/public/intl/messages/bs-BA.json
index 1360efaba..314e689e4 100644
--- a/public/intl/messages/bs-BA.json
+++ b/public/intl/messages/bs-BA.json
@@ -83,12 +83,6 @@
       "value": "Prosjek"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Prosječno vrijeme posjete"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Pregledi po posjeti"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Prosječno vrijeme posjete"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index e6cb4c5ea..911dd04b5 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -83,12 +83,6 @@
       "value": "Mitjana"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Temps mitjà de visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Temps mitjà de visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index f87ddeda6..c329fa585 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Průměrný čas návštěvy"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Průměrný čas návštěvy"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json
index 332b98e8e..c242aaf3a 100644
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Gennemsnitlig besøgstid"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Gennemsnitlig besøgstid"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 9b913cea6..69c48a1fb 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Durchschn. Bsuechsziit"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Durchschn. Bsuechsziit"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 9a21c400a..2faf7770e 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -83,12 +83,6 @@
       "value": "Durchschnitt"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Durchschn. Besuchszeit"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Durchschn. Besuchszeit"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json
index 7c58f14c7..5c39e267c 100644
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Μέσος χρόνος επίσκεψης"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Μέσος χρόνος επίσκεψης"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.json
index 43c9019e9..b7beda36b 100644
--- a/public/intl/messages/en-GB.json
+++ b/public/intl/messages/en-GB.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Average visit time"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json
index 1cb11f91c..42f3bbd9d 100644
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Average visit time"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/es-ES.json b/public/intl/messages/es-ES.json
index 32b349402..be0835ae0 100644
--- a/public/intl/messages/es-ES.json
+++ b/public/intl/messages/es-ES.json
@@ -83,12 +83,6 @@
       "value": "Media"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Tiempo promedio de visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Tiempo promedio de visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/es-MX.json b/public/intl/messages/es-MX.json
index c3ef099df..8051cde5e 100644
--- a/public/intl/messages/es-MX.json
+++ b/public/intl/messages/es-MX.json
@@ -71,7 +71,7 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
+  "label.visit-duration": [
     {
       "type": 0,
       "value": "Tiempo promedio de visita"
diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json
index 8c894c6a3..cc0e81c09 100644
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "میانگین زمان بازدید"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "میانگین زمان بازدید"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json
index f855dba3f..13a597f4d 100644
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Keskimääräinen vierailuaika"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Keskimääräinen vierailuaika"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json
index be7442eb3..b3d625890 100644
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Miðal vitjurnartíð "
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Miðal vitjurnartíð "
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index e33b7bf2d..4e5f3ed55 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -83,12 +83,6 @@
       "value": "Moyenne"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Temps de visite moyen"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1237,6 +1231,12 @@
       "value": "Vues par visite"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Temps de visite moyen"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json
index 4bc03ce0b..1ce652f98 100644
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Tempo medio de visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1257,6 +1251,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Tempo medio de visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json
index 92aef8a03..af8a6fb1b 100644
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "זמן ביקור ממוצע"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "זמן ביקור ממוצע"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json
index ec4631814..e4c8a2ba5 100644
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "औसत दृश्य समय"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "औसत दृश्य समय"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/hr-HR.json b/public/intl/messages/hr-HR.json
index 032456f87..9933e8400 100644
--- a/public/intl/messages/hr-HR.json
+++ b/public/intl/messages/hr-HR.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Average visit time"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json
index 08fd319a4..3fccf7a74 100644
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Átlagos látogatási idő"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Átlagos látogatási idő"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json
index 8898f1ec0..7dfe2e2f6 100644
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Waktu kunjungan rata-rata"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Waktu kunjungan rata-rata"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json
index 471cf31f5..d1568bae8 100644
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Tempo medio di visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Tempo medio di visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index ed869857c..55c3cae0b 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -83,12 +83,6 @@
       "value": "平均"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "平均滞在時間"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "平均滞在時間"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json
index 63ad4841a..7ddac4686 100644
--- a/public/intl/messages/km-KH.json
+++ b/public/intl/messages/km-KH.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "មើលជាមធ្យម"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "មើលជាមធ្យម"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index e9fc0c0da..48dfbb3bf 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "평균 방문 시간"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1253,6 +1247,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "평균 방문 시간"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json
index 261e2f949..727e0c518 100644
--- a/public/intl/messages/lt-LT.json
+++ b/public/intl/messages/lt-LT.json
@@ -83,12 +83,6 @@
       "value": "Vidurkis"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Vidutinė vizito trukmė"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1354,6 +1348,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Vidutinė vizito trukmė"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index 483349020..484b6752d 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -83,12 +83,6 @@
       "value": "Дундаж"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Зочилсон дундаж хугацаа"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Зочилсон дундаж хугацаа"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json
index 58034742e..7d9b83699 100644
--- a/public/intl/messages/ms-MY.json
+++ b/public/intl/messages/ms-MY.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Purata tempoh masa lawatan"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Purata tempoh masa lawatan"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/my-MM.json b/public/intl/messages/my-MM.json
index 18c1a2b9a..f56429aa4 100644
--- a/public/intl/messages/my-MM.json
+++ b/public/intl/messages/my-MM.json
@@ -83,12 +83,6 @@
       "value": "ပျမ်းမျှ"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json
index 2f7132ef7..7b110ee4e 100644
--- a/public/intl/messages/nb-NO.json
+++ b/public/intl/messages/nb-NO.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Gjennomsnittlig besøkstid"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Gjennomsnittlig besøkstid"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index c0a3add4b..5b0cfdbf1 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -83,12 +83,6 @@
       "value": "Gemiddelde"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Gemiddelde bezoektijd"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Gemiddelde bezoektijd"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index 547a70a98..4a5a41ee6 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -83,12 +83,6 @@
       "value": "Średnia"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Średni czas wizyty"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Średni czas wizyty"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index 7c41e5eff..6e3bb03ef 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -83,12 +83,6 @@
       "value": "Média"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Tempo médio de visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Visualizações por visita"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Tempo médio de visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json
index 3e16a55e2..1b19e8d37 100644
--- a/public/intl/messages/pt-PT.json
+++ b/public/intl/messages/pt-PT.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Tempo médio de visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Tempo médio de visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index da1413f6c..6a0b77fe3 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -83,12 +83,6 @@
       "value": "Mediu"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Timp mediu de vizitare"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Timp mediu de vizitare"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 4b97f2254..4f851f469 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Среднее время посещения"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Среднее время посещения"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/si-LK.json b/public/intl/messages/si-LK.json
index 67e32f90c..749d830b1 100644
--- a/public/intl/messages/si-LK.json
+++ b/public/intl/messages/si-LK.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Average visit time"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json
index f4e8a5e46..ff9d4e65f 100644
--- a/public/intl/messages/sk-SK.json
+++ b/public/intl/messages/sk-SK.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Priemerný čas návštevy"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Priemerný čas návštevy"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json
index e96723ae0..b20911664 100644
--- a/public/intl/messages/sl-SI.json
+++ b/public/intl/messages/sl-SI.json
@@ -83,12 +83,6 @@
       "value": "Povprečno"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Povprečni čas obiska"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Povprečni čas obiska"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index 45dc754d7..28992e10f 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -83,12 +83,6 @@
       "value": "Genomsnitt"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Genomsnittlig besökstid"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Genomsnittlig besökstid"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json
index b1fcd700a..70d7b87eb 100644
--- a/public/intl/messages/ta-IN.json
+++ b/public/intl/messages/ta-IN.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "சராசரி வருகை நேரம்"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "சராசரி வருகை நேரம்"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.json
index 1206840bb..351d30f87 100644
--- a/public/intl/messages/th-TH.json
+++ b/public/intl/messages/th-TH.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "ระยะเวลาเข้าชมเฉลี่ย"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "ระยะเวลาเข้าชมเฉลี่ย"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index 224426122..c0caf470b 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -83,12 +83,6 @@
       "value": "Ortalama"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Ortalama ziyaret süresi"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Ziyaret başına görüntüleme"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Ortalama ziyaret süresi"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index ae947f9ab..4d6937560 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -83,12 +83,6 @@
       "value": "Середнє"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Середній час візиту"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Перегляди за візит"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Середній час візиту"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json
index 184043b44..0316d2994 100644
--- a/public/intl/messages/ur-PK.json
+++ b/public/intl/messages/ur-PK.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "وزٹ کا اوسط وقت"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "وزٹ کا اوسط وقت"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json
index fe5943ace..0cc0c183e 100644
--- a/public/intl/messages/vi-VN.json
+++ b/public/intl/messages/vi-VN.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Thời gian truy cập trung bình"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Thời gian truy cập trung bình"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index 144b4f170..e42400229 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -83,12 +83,6 @@
       "value": "平均"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "平均访问时间"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1257,6 +1251,12 @@
       "value": "每次访问的浏览量"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "平均访问时间"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index e703beb93..a39aea19b 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -83,12 +83,6 @@
       "value": "平均"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "平均造訪時間"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1253,6 +1247,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "平均造訪時間"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/src/app/(main)/profile/DateRangeSetting.tsx b/src/app/(main)/profile/DateRangeSetting.tsx
index c57a209a6..25b5afbd7 100644
--- a/src/app/(main)/profile/DateRangeSetting.tsx
+++ b/src/app/(main)/profile/DateRangeSetting.tsx
@@ -7,11 +7,11 @@ import styles from './DateRangeSetting.module.css';
 
 export function DateRangeSetting() {
   const { formatMessage, labels } = useMessages();
-  const [dateRange, setDateRange] = useDateRange();
+  const { dateRange, saveDateRange } = useDateRange();
   const { value } = dateRange;
 
-  const handleChange = (value: string | DateRange) => setDateRange(value);
-  const handleReset = () => setDateRange(DEFAULT_DATE_RANGE);
+  const handleChange = (value: string | DateRange) => saveDateRange(value);
+  const handleReset = () => saveDateRange(DEFAULT_DATE_RANGE);
 
   return (
     <Flexbox gap={10} width={300}>
diff --git a/src/app/(main)/reports/goals/GoalsAddForm.tsx b/src/app/(main)/reports/goals/GoalsAddForm.tsx
index a8a77c58e..a82eea28c 100644
--- a/src/app/(main)/reports/goals/GoalsAddForm.tsx
+++ b/src/app/(main)/reports/goals/GoalsAddForm.tsx
@@ -6,27 +6,48 @@ import styles from './GoalsAddForm.module.css';
 export function GoalsAddForm({
   type: defaultType = 'url',
   value: defaultValue = '',
+  property: defaultProperty = '',
+  operator: defaultAggregae = null,
   goal: defaultGoal = 10,
   onChange,
 }: {
   type?: string;
   value?: string;
+  operator?: string;
+  property?: string;
   goal?: number;
-  onChange?: (step: { type: string; value: string; goal: number }) => void;
+  onChange?: (step: {
+    type: string;
+    value: string;
+    goal: number;
+    operator?: string;
+    property?: string;
+  }) => void;
 }) {
   const [type, setType] = useState(defaultType);
   const [value, setValue] = useState(defaultValue);
+  const [operator, setOperator] = useState(defaultAggregae);
+  const [property, setProperty] = useState(defaultProperty);
   const [goal, setGoal] = useState(defaultGoal);
   const { formatMessage, labels } = useMessages();
   const items = [
     { label: formatMessage(labels.url), value: 'url' },
     { label: formatMessage(labels.event), value: 'event' },
+    { label: formatMessage(labels.eventData), value: 'event-data' },
+  ];
+  const operators = [
+    { label: formatMessage(labels.count), value: 'count' },
+    { label: formatMessage(labels.average), value: 'average' },
+    { label: formatMessage(labels.sum), value: 'sum' },
   ];
   const isDisabled = !type || !value;
 
   const handleSave = () => {
-    onChange({ type, value, goal });
+    onChange(
+      type === 'event-data' ? { type, value, goal, operator, property } : { type, value, goal },
+    );
     setValue('');
+    setProperty('');
     setGoal(10);
   };
 
@@ -45,6 +66,10 @@ export function GoalsAddForm({
     return items.find(item => item.value === value)?.label;
   };
 
+  const renderoperatorValue = (value: any) => {
+    return operators.find(item => item.value === value)?.label;
+  };
+
   return (
     <Flexbox direction="column" gap={10}>
       <FormRow label={formatMessage(defaultValue ? labels.update : labels.add)}>
@@ -70,6 +95,31 @@ export function GoalsAddForm({
           />
         </Flexbox>
       </FormRow>
+      {type === 'event-data' && (
+        <FormRow label={formatMessage(labels.property)}>
+          <Flexbox gap={10}>
+            <Dropdown
+              className={styles.dropdown}
+              items={operators}
+              value={operator}
+              renderValue={renderoperatorValue}
+              onChange={(value: any) => setOperator(value)}
+            >
+              {({ value, label }) => {
+                return <Item key={value}>{label}</Item>;
+              }}
+            </Dropdown>
+            <TextField
+              className={styles.input}
+              value={property}
+              onChange={e => handleChange(e, setProperty)}
+              autoFocus={true}
+              autoComplete="off"
+              onKeyDown={handleKeyDown}
+            />
+          </Flexbox>
+        </FormRow>
+      )}
       <FormRow label={formatMessage(labels.goal)}>
         <Flexbox gap={10}>
           <TextField
diff --git a/src/app/(main)/reports/goals/GoalsChart.tsx b/src/app/(main)/reports/goals/GoalsChart.tsx
index 247602343..dedbd07cb 100644
--- a/src/app/(main)/reports/goals/GoalsChart.tsx
+++ b/src/app/(main)/reports/goals/GoalsChart.tsx
@@ -11,19 +11,36 @@ export function GoalsChart({ className }: { className?: string; isLoading?: bool
 
   const { data } = report || {};
 
+  const getLabel = type => {
+    let label = '';
+    switch (type) {
+      case 'url':
+        label = labels.viewedPage;
+        break;
+      case 'event':
+        label = labels.triggeredEvent;
+        break;
+      default:
+        label = labels.collectedData;
+        break;
+    }
+
+    return label;
+  };
+
   return (
     <div className={classNames(styles.chart, className)}>
-      {data?.map(({ type, value, goal, result }, index: number) => {
+      {data?.map(({ type, value, goal, result, property, operator }, index: number) => {
         const percent = result > goal ? 100 : (result / goal) * 100;
 
         return (
           <div key={index} className={styles.goal}>
             <div className={styles.card}>
               <div className={styles.header}>
-                <span className={styles.label}>
-                  {formatMessage(type === 'url' ? labels.viewedPage : labels.triggeredEvent)}
-                </span>
-                <span className={styles.item}>{value}</span>
+                <span className={styles.label}>{formatMessage(getLabel(type))}</span>
+                <span className={styles.item}>{`${value}${
+                  type === 'event-data' ? `:(${operator}):${property}` : ''
+                }`}</span>
               </div>
               <div className={styles.track}>
                 <div
diff --git a/src/app/(main)/reports/goals/GoalsParameters.module.css b/src/app/(main)/reports/goals/GoalsParameters.module.css
index fbe47b84b..cd72f524e 100644
--- a/src/app/(main)/reports/goals/GoalsParameters.module.css
+++ b/src/app/(main)/reports/goals/GoalsParameters.module.css
@@ -4,6 +4,16 @@
   font-weight: 600;
 }
 
+.eventData {
+  color: var(--orange900);
+  background-color: var(--orange100);
+  font-size: 12px;
+  font-weight: 900;
+  padding: 2px 8px;
+  border-radius: 5px;
+  width: fit-content;
+}
+
 .goal {
   color: var(--blue900);
   background-color: var(--blue100);
@@ -11,4 +21,5 @@
   font-weight: 900;
   padding: 2px 8px;
   border-radius: 5px;
+  width: fit-content;
 }
diff --git a/src/app/(main)/reports/goals/GoalsParameters.tsx b/src/app/(main)/reports/goals/GoalsParameters.tsx
index 55955973b..8d85dc204 100644
--- a/src/app/(main)/reports/goals/GoalsParameters.tsx
+++ b/src/app/(main)/reports/goals/GoalsParameters.tsx
@@ -4,6 +4,7 @@ import { formatNumber } from 'lib/format';
 import { useContext } from 'react';
 import {
   Button,
+  Flexbox,
   Form,
   FormButtons,
   FormRow,
@@ -79,33 +80,53 @@ export function GoalsParameters() {
       <BaseParameters allowWebsiteSelect={!id} />
       <FormRow label={formatMessage(labels.goals)} action={<AddGoalsButton />}>
         <ParameterList>
-          {goals.map((goal: { type: string; value: string; goal: number }, index: number) => {
-            return (
-              <PopupTrigger key={index}>
-                <ParameterList.Item
-                  icon={goal.type === 'url' ? <Icons.Eye /> : <Icons.Bolt />}
-                  onRemove={() => handleRemoveGoals(index)}
-                >
-                  <div className={styles.value}>{goal.value}</div>
-                  <div className={styles.goal}>
-                    {formatMessage(labels.goal)}: {formatNumber(goal.goal)}
-                  </div>
-                </ParameterList.Item>
-                <Popup alignment="start">
-                  {(close: () => void) => (
-                    <PopupForm>
-                      <GoalsAddForm
-                        type={goal.type}
-                        value={goal.value}
-                        goal={goal.goal}
-                        onChange={handleUpdateGoals.bind(null, close, index)}
-                      />
-                    </PopupForm>
-                  )}
-                </Popup>
-              </PopupTrigger>
-            );
-          })}
+          {goals.map(
+            (
+              goal: {
+                type: string;
+                value: string;
+                goal: number;
+                operator?: string;
+                property?: string;
+              },
+              index: number,
+            ) => {
+              return (
+                <PopupTrigger key={index}>
+                  <ParameterList.Item
+                    icon={goal.type === 'url' ? <Icons.Eye /> : <Icons.Bolt />}
+                    onRemove={() => handleRemoveGoals(index)}
+                  >
+                    <Flexbox direction="column" gap={5}>
+                      <div className={styles.value}>{goal.value}</div>
+                      {goal.type === 'event-data' && (
+                        <div className={styles.eventData}>
+                          {formatMessage(labels[goal.operator])}: {goal.property}
+                        </div>
+                      )}
+                      <div className={styles.goal}>
+                        {formatMessage(labels.goal)}: {formatNumber(goal.goal)}
+                      </div>
+                    </Flexbox>
+                  </ParameterList.Item>
+                  <Popup alignment="start">
+                    {(close: () => void) => (
+                      <PopupForm>
+                        <GoalsAddForm
+                          type={goal.type}
+                          value={goal.value}
+                          goal={goal.goal}
+                          operator={goal.operator}
+                          property={goal.property}
+                          onChange={handleUpdateGoals.bind(null, close, index)}
+                        />
+                      </PopupForm>
+                    )}
+                  </Popup>
+                </PopupTrigger>
+              );
+            },
+          )}
         </ParameterList>
       </FormRow>
       <FormButtons>
diff --git a/src/app/(main)/reports/journey/JourneyParameters.tsx b/src/app/(main)/reports/journey/JourneyParameters.tsx
new file mode 100644
index 000000000..b0544168b
--- /dev/null
+++ b/src/app/(main)/reports/journey/JourneyParameters.tsx
@@ -0,0 +1,36 @@
+import { useContext } from 'react';
+import { useMessages } from 'components/hooks';
+import { Form, FormButtons, SubmitButton } from 'react-basics';
+import { ReportContext } from '../[reportId]/Report';
+import BaseParameters from '../[reportId]/BaseParameters';
+
+export function JourneyParameters() {
+  const { report, runReport, isRunning } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+
+  const { id, parameters } = report || {};
+  const { websiteId, dateRange } = parameters || {};
+  const queryDisabled = !websiteId || !dateRange;
+
+  const handleSubmit = (data: any, e: any) => {
+    e.stopPropagation();
+    e.preventDefault();
+
+    if (!queryDisabled) {
+      runReport(data);
+    }
+  };
+
+  return (
+    <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
+      <BaseParameters showDateSelect={true} allowWebsiteSelect={!id} />
+      <FormButtons>
+        <SubmitButton variant="primary" disabled={queryDisabled} isLoading={isRunning}>
+          {formatMessage(labels.runQuery)}
+        </SubmitButton>
+      </FormButtons>
+    </Form>
+  );
+}
+
+export default JourneyParameters;
diff --git a/src/app/(main)/reports/journey/JourneyReport.tsx b/src/app/(main)/reports/journey/JourneyReport.tsx
new file mode 100644
index 000000000..7b8927b4d
--- /dev/null
+++ b/src/app/(main)/reports/journey/JourneyReport.tsx
@@ -0,0 +1,28 @@
+'use client';
+import Report from '../[reportId]/Report';
+import ReportHeader from '../[reportId]/ReportHeader';
+import ReportMenu from '../[reportId]/ReportMenu';
+import ReportBody from '../[reportId]/ReportBody';
+import JourneyParameters from './JourneyParameters';
+import JourneyView from './JourneyView';
+import Path from 'assets/path.svg';
+import { REPORT_TYPES } from 'lib/constants';
+
+const defaultParameters = {
+  type: REPORT_TYPES.journey,
+  parameters: {},
+};
+
+export default function JourneyReport({ reportId }: { reportId?: string }) {
+  return (
+    <Report reportId={reportId} defaultParameters={defaultParameters}>
+      <ReportHeader icon={<Path />} />
+      <ReportMenu>
+        <JourneyParameters />
+      </ReportMenu>
+      <ReportBody>
+        <JourneyView />
+      </ReportBody>
+    </Report>
+  );
+}
diff --git a/src/app/(main)/reports/journey/JourneyReportPage.tsx b/src/app/(main)/reports/journey/JourneyReportPage.tsx
new file mode 100644
index 000000000..0f4b78cad
--- /dev/null
+++ b/src/app/(main)/reports/journey/JourneyReportPage.tsx
@@ -0,0 +1,5 @@
+import JourneyReport from './JourneyReport';
+
+export default function JourneyReportPage() {
+  return <JourneyReport />;
+}
diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
new file mode 100644
index 000000000..fa7cc0b42
--- /dev/null
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -0,0 +1,14 @@
+.title {
+  font-size: 24px;
+  line-height: 36px;
+  font-weight: 700;
+}
+
+.row {
+  display: grid;
+  grid-template-columns: 50% 50%;
+  gap: 20px;
+  border-bottom: 1px solid var(--base300);
+  padding-bottom: 30px;
+  margin-bottom: 30px;
+}
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
new file mode 100644
index 000000000..6905d74cb
--- /dev/null
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -0,0 +1,13 @@
+import { useContext } from 'react';
+import { ReportContext } from '../[reportId]/Report';
+
+export default function JourneyView() {
+  const { report } = useContext(ReportContext);
+  const { data } = report || {};
+
+  if (!data) {
+    return null;
+  }
+
+  return <div>{JSON.stringify(data)}</div>;
+}
diff --git a/src/app/(main)/reports/journey/page.tsx b/src/app/(main)/reports/journey/page.tsx
new file mode 100644
index 000000000..447747cc3
--- /dev/null
+++ b/src/app/(main)/reports/journey/page.tsx
@@ -0,0 +1,10 @@
+import { Metadata } from 'next';
+import JourneyReportPage from './JourneyReportPage';
+
+export default function () {
+  return <JourneyReportPage />;
+}
+
+export const metadata: Metadata = {
+  title: 'Journey Report',
+};
diff --git a/src/app/(main)/reports/utm/UTMView.tsx b/src/app/(main)/reports/utm/UTMView.tsx
index e59b60ebe..f10a68d8c 100644
--- a/src/app/(main)/reports/utm/UTMView.tsx
+++ b/src/app/(main)/reports/utm/UTMView.tsx
@@ -34,6 +34,7 @@ export default function UTMView() {
             {
               data: items.map(({ value }) => value),
               backgroundColor: CHART_COLORS,
+              borderWidth: 0,
             },
           ],
         };
diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
index 1a92f1f11..11f662b19 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
@@ -61,7 +61,7 @@ export function WebsiteSettings({
       </Tabs>
       {tab === 'details' && <WebsiteEditForm websiteId={websiteId} onSave={handleSave} />}
       {tab === 'tracking' && <TrackingCode websiteId={websiteId} />}
-      {tab === 'share' && <ShareUrl websiteId={websiteId} onSave={handleSave} />}
+      {tab === 'share' && <ShareUrl onSave={handleSave} />}
       {tab === 'data' && <WebsiteData websiteId={websiteId} onSave={handleSave} />}
     </>
   );
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
index 470bd7922..48da23776 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
@@ -4,17 +4,41 @@ import { getDateArray } from 'lib/date';
 import useWebsitePageviews from 'components/hooks/queries/useWebsitePageviews';
 import { useDateRange } from 'components/hooks';
 
-export function WebsiteChart({ websiteId }: { websiteId: string }) {
-  const [dateRange] = useDateRange(websiteId);
+export function WebsiteChart({
+  websiteId,
+  compareMode = false,
+}: {
+  websiteId: string;
+  compareMode?: boolean;
+}) {
+  const { dateRange, dateCompare } = useDateRange(websiteId);
   const { startDate, endDate, unit } = dateRange;
-  const { data, isLoading } = useWebsitePageviews(websiteId);
+  const { data, isLoading } = useWebsitePageviews(websiteId, compareMode ? dateCompare : undefined);
+  const { pageviews, sessions, compare } = (data || {}) as any;
 
   const chartData = useMemo(() => {
     if (data) {
-      return {
-        pageviews: getDateArray(data.pageviews, startDate, endDate, unit),
-        sessions: getDateArray(data.sessions, startDate, endDate, unit),
+      const result = {
+        pageviews: getDateArray(pageviews, startDate, endDate, unit),
+        sessions: getDateArray(sessions, startDate, endDate, unit),
       };
+
+      if (compare) {
+        result['compare'] = {
+          pageviews: result.pageviews.map(({ x }, i) => ({
+            x,
+            y: compare.pageviews[i]?.y,
+            d: compare.pageviews[i]?.x,
+          })),
+          sessions: result.sessions.map(({ x }, i) => ({
+            x,
+            y: compare.sessions[i]?.y,
+            d: compare.sessions[i]?.x,
+          })),
+        };
+      }
+
+      return result;
     }
     return { pageviews: [], sessions: [] };
   }, [data, startDate, endDate, unit]);
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx b/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx
deleted file mode 100644
index 1a131da13..000000000
--- a/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-'use client';
-import { Loading } from 'react-basics';
-import { usePathname } from 'next/navigation';
-import Page from 'components/layout/Page';
-import FilterTags from 'components/metrics/FilterTags';
-import { useNavigation, useWebsite } from 'components/hooks';
-import WebsiteChart from './WebsiteChart';
-import WebsiteExpandedView from './WebsiteExpandedView';
-import WebsiteHeader from './WebsiteHeader';
-import WebsiteMetricsBar from './WebsiteMetricsBar';
-import WebsiteTableView from './WebsiteTableView';
-
-export default function WebsiteDetails({ websiteId }: { websiteId: string }) {
-  const { data: website, isLoading, error } = useWebsite(websiteId);
-  const pathname = usePathname();
-  const { query } = useNavigation();
-
-  if (isLoading || error) {
-    return <Page isLoading={isLoading} error={error} />;
-  }
-
-  const showLinks = !pathname.includes('/share/');
-  const { view, ...params } = query;
-
-  return (
-    <>
-      <WebsiteHeader websiteId={websiteId} showLinks={showLinks} />
-      <FilterTags websiteId={websiteId} params={params} />
-      <WebsiteMetricsBar websiteId={websiteId} sticky={true} />
-      <WebsiteChart websiteId={websiteId} />
-      {!website && <Loading icon="dots" style={{ minHeight: 300 }} />}
-      {website && (
-        <>
-          {!view && <WebsiteTableView websiteId={websiteId} domainName={website.domain} />}
-          {view && <WebsiteExpandedView websiteId={websiteId} domainName={website.domain} />}
-        </>
-      )}
-    </>
-  );
-}
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
new file mode 100644
index 000000000..2988494e7
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
@@ -0,0 +1,37 @@
+'use client';
+import { usePathname } from 'next/navigation';
+import FilterTags from 'components/metrics/FilterTags';
+import { useNavigation } from 'components/hooks';
+import WebsiteChart from './WebsiteChart';
+import WebsiteExpandedView from './WebsiteExpandedView';
+import WebsiteHeader from './WebsiteHeader';
+import WebsiteMetricsBar from './WebsiteMetricsBar';
+import WebsiteTableView from './WebsiteTableView';
+import WebsiteProvider from './WebsiteProvider';
+import { FILTER_COLUMNS } from 'lib/constants';
+
+export default function WebsiteDetailsPage({ websiteId }: { websiteId: string }) {
+  const pathname = usePathname();
+  const { query } = useNavigation();
+
+  const showLinks = !pathname.includes('/share/');
+  const { view } = query;
+
+  const params = Object.keys(query).reduce((obj, key) => {
+    if (FILTER_COLUMNS[key]) {
+      obj[key] = query[key];
+    }
+    return obj;
+  }, {});
+
+  return (
+    <WebsiteProvider websiteId={websiteId}>
+      <WebsiteHeader websiteId={websiteId} showLinks={showLinks} />
+      <FilterTags websiteId={websiteId} params={params} />
+      <WebsiteMetricsBar websiteId={websiteId} showChange={true} sticky={true} />
+      <WebsiteChart websiteId={websiteId} />
+      {!view && <WebsiteTableView websiteId={websiteId} />}
+      {view && <WebsiteExpandedView websiteId={websiteId} />}
+    </WebsiteProvider>
+  );
+}
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
index a96717571..a6229e958 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
@@ -1,4 +1,3 @@
-import classNames from 'classnames';
 import { Button, Icon, Icons, Popup, PopupTrigger, Text } from 'react-basics';
 import PopupForm from 'app/(main)/reports/[reportId]/PopupForm';
 import FilterSelectForm from 'app/(main)/reports/[reportId]/FilterSelectForm';
@@ -9,14 +8,22 @@ import styles from './WebsiteFilterButton.module.css';
 export function WebsiteFilterButton({
   websiteId,
   className,
+  position = 'bottom',
+  alignment = 'end',
+  showText = true,
 }: {
   websiteId: string;
   className?: string;
+  position?: 'bottom' | 'top' | 'left' | 'right';
+  alignment?: 'end' | 'center' | 'start';
+  showText?: boolean;
 }) {
   const { formatMessage, labels } = useMessages();
   const { renderUrl, router } = useNavigation();
   const { fields } = useFields();
-  const [{ startDate, endDate }] = useDateRange(websiteId);
+  const {
+    dateRange: { startDate, endDate },
+  } = useDateRange(websiteId);
 
   const handleAddFilter = ({ name, operator, value }) => {
     const prefix = OPERATOR_PREFIXES[operator];
@@ -25,14 +32,14 @@ export function WebsiteFilterButton({
   };
 
   return (
-    <PopupTrigger>
-      <Button className={classNames(className, styles.button)} variant="quiet">
+    <PopupTrigger className={className}>
+      <Button className={styles.button} variant="quiet">
         <Icon>
           <Icons.Plus />
         </Icon>
-        <Text>{formatMessage(labels.filter)}</Text>
+        {showText && <Text>{formatMessage(labels.filter)}</Text>}
       </Button>
-      <Popup position="bottom" alignment="end">
+      <Popup position={position} alignment={alignment}>
         {(close: () => void) => {
           return (
             <PopupForm>
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index dc0f4338e..0cbaeb44d 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -30,6 +30,11 @@ export function WebsiteHeader({
       icon: <Icons.Overview />,
       path: '',
     },
+    {
+      label: formatMessage(labels.compare),
+      icon: <Icons.Compare />,
+      path: '/compare',
+    },
     {
       label: formatMessage(labels.realtime),
       icon: <Icons.Clock />,
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
index db48bd550..6c5a0e569 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
@@ -1,6 +1,6 @@
 .container {
   display: grid;
-  grid-template-columns: 1fr max-content;
+  grid-template-columns: 2fr 1fr;
   justify-content: space-between;
   align-items: center;
   background: var(--base50);
@@ -11,10 +11,22 @@
 
 .actions {
   display: flex;
-  align-items: center;
-  flex-direction: row;
-  justify-content: flex-end;
+  flex-direction: column;
+  align-items: flex-end;
   gap: 10px;
+  flex-wrap: wrap;
+}
+
+.vs {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  flex-basis: 100%;
+  gap: 10px;
+}
+
+.dropdown {
+  min-width: 200px;
 }
 
 @media screen and (max-width: 1200px) {
@@ -38,9 +50,3 @@
     border-bottom: 1px solid var(--base300);
   }
 }
-
-@media screen and (max-width: 768px) {
-  .button {
-    display: none;
-  }
-}
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index e4acea3bf..b74482a47 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -3,94 +3,127 @@ import { useMessages, useSticky } from 'components/hooks';
 import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
 import MetricCard from 'components/metrics/MetricCard';
 import MetricsBar from 'components/metrics/MetricsBar';
-import { formatShortTime } from 'lib/format';
+import { formatShortTime, formatLongNumber } from 'lib/format';
 import WebsiteFilterButton from './WebsiteFilterButton';
-import styles from './WebsiteMetricsBar.module.css';
 import useWebsiteStats from 'components/hooks/queries/useWebsiteStats';
+import styles from './WebsiteMetricsBar.module.css';
+import { Dropdown, Item } from 'react-basics';
+import useStore, { setWebsiteDateCompare } from 'store/websites';
 
 export function WebsiteMetricsBar({
   websiteId,
-  showFilter = true,
   sticky,
+  showChange = false,
+  compareMode = false,
 }: {
   websiteId: string;
-  showFilter?: boolean;
   sticky?: boolean;
+  showChange?: boolean;
+  compareMode?: boolean;
 }) {
   const { formatMessage, labels } = useMessages();
+  const dateCompare = useStore(state => state[websiteId]?.dateCompare);
   const { ref, isSticky } = useSticky({ enabled: sticky });
-  const { data, isLoading, isFetched, error } = useWebsiteStats(websiteId);
+  const { data, isLoading, isFetched, error } = useWebsiteStats(
+    websiteId,
+    compareMode && dateCompare,
+  );
 
   const { pageviews, visitors, visits, bounces, totaltime } = data || {};
-  const num = Math.min(data && visitors.value, data && bounces.value);
-  const diffs = data && {
-    pageviews: pageviews.value - pageviews.change,
-    visitors: visitors.value - visitors.change,
-    visits: visits.value - visits.change,
-    bounces: bounces.value - bounces.change,
-    totaltime: totaltime.value - totaltime.change,
-  };
+
+  const metrics = data
+    ? [
+        {
+          ...pageviews,
+          label: formatMessage(labels.views),
+          change: pageviews.value - pageviews.prev,
+          formatValue: formatLongNumber,
+        },
+        {
+          ...visits,
+          label: formatMessage(labels.visits),
+          change: visits.value - visits.prev,
+          formatValue: formatLongNumber,
+        },
+        {
+          ...visitors,
+          label: formatMessage(labels.visitors),
+          change: visitors.value - visitors.prev,
+          formatValue: formatLongNumber,
+        },
+        {
+          label: formatMessage(labels.bounceRate),
+          value: (Math.min(visitors.value, bounces.value) / visitors.value) * 100,
+          prev: (Math.min(visitors.prev, bounces.prev) / visitors.prev) * 100,
+          change:
+            (Math.min(visitors.value, bounces.value) / visitors.value) * 100 -
+            (Math.min(visitors.prev, bounces.prev) / visitors.prev) * 100,
+          formatValue: n => Number(n).toFixed(0) + '%',
+          reverseColors: true,
+        },
+        {
+          label: formatMessage(labels.visitDuration),
+          value: totaltime.value / visits.value,
+          prev: totaltime.prev / visits.prev,
+          change: totaltime.value / visits.value - totaltime.prev / visits.prev,
+          formatValue: n =>
+            `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`,
+        },
+      ]
+    : [];
+
+  const items = [
+    { label: formatMessage(labels.previousPeriod), value: 'prev' },
+    { label: formatMessage(labels.previousYear), value: 'yoy' },
+  ];
 
   return (
     <div
       ref={ref}
       className={classNames(styles.container, {
         [styles.sticky]: sticky,
-        [styles.isSticky]: isSticky,
+        [styles.isSticky]: sticky && isSticky,
       })}
     >
-      <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
-        {pageviews && visitors && (
-          <>
-            <MetricCard
-              label={formatMessage(labels.views)}
-              value={pageviews.value}
-              change={pageviews.change}
-            />
-            <MetricCard
-              label={formatMessage(labels.visits)}
-              value={visits.value}
-              change={visits.change}
-            />
-            <MetricCard
-              label={formatMessage(labels.visitors)}
-              value={visitors.value}
-              change={visitors.change}
-            />
-            <MetricCard
-              label={formatMessage(labels.bounceRate)}
-              value={visitors.value ? (num / visitors.value) * 100 : 0}
-              change={
-                visitors.value && visitors.change
-                  ? (num / visitors.value) * 100 -
-                      (Math.min(diffs.visitors, diffs.bounces) / diffs.visitors) * 100 || 0
-                  : 0
-              }
-              format={n => Number(n).toFixed(0) + '%'}
-              reverseColors
-            />
-            <MetricCard
-              label={formatMessage(labels.averageVisitTime)}
-              value={
-                totaltime.value && pageviews.value
-                  ? totaltime.value / (pageviews.value - bounces.value)
-                  : 0
-              }
-              change={
-                totaltime.value && pageviews.value
-                  ? (diffs.totaltime / (diffs.pageviews - diffs.bounces) -
-                      totaltime.value / (pageviews.value - bounces.value)) *
-                      -1 || 0
-                  : 0
-              }
-              format={n => `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`}
-            />
-          </>
-        )}
-      </MetricsBar>
+      <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={compareMode || showChange}
+                showPrevious={compareMode}
+              />
+            );
+          })}
+        </MetricsBar>
+      </div>
       <div className={styles.actions}>
-        {showFilter && <WebsiteFilterButton websiteId={websiteId} className={styles.button} />}
+        <WebsiteFilterButton websiteId={websiteId} />
         <WebsiteDateFilter websiteId={websiteId} />
+        {compareMode && (
+          <div className={styles.vs}>
+            <b>VS</b>
+            <Dropdown
+              className={styles.dropdown}
+              items={items}
+              value={dateCompare || 'prev'}
+              renderValue={value => items.find(i => i.value === value)?.label}
+              alignment="end"
+              onChange={(value: any) => setWebsiteDateCompare(websiteId, value)}
+            >
+              {items.map(({ label, value }) => (
+                <Item key={value}>{label}</Item>
+              ))}
+            </Dropdown>
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
index 7cc415e5c..e530f2bae 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
@@ -10,17 +10,10 @@ import CountriesTable from 'components/metrics/CountriesTable';
 import EventsTable from 'components/metrics/EventsTable';
 import EventsChart from 'components/metrics/EventsChart';
 
-export default function WebsiteTableView({
-  websiteId,
-  domainName,
-}: {
-  websiteId: string;
-  domainName: string;
-}) {
+export default function WebsiteTableView({ websiteId }: { websiteId: string }) {
   const [countryData, setCountryData] = useState();
   const tableProps = {
     websiteId,
-    domainName,
     limit: 10,
   };
 
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
new file mode 100644
index 000000000..092ebe94b
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
@@ -0,0 +1,32 @@
+'use client';
+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';
+import WebsiteProvider from '../WebsiteProvider';
+
+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 (
+    <WebsiteProvider websiteId={websiteId}>
+      <WebsiteHeader websiteId={websiteId} />
+      <FilterTags websiteId={websiteId} params={params} />
+      <WebsiteMetricsBar websiteId={websiteId} compareMode={true} />
+      <WebsiteChart websiteId={websiteId} compareMode={true} />
+      <WebsiteCompareTables websiteId={websiteId} />
+    </WebsiteProvider>
+  );
+}
+
+export default WebsiteComparePage;
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.module.css b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.module.css
new file mode 100644
index 000000000..c4821e886
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.module.css
@@ -0,0 +1,14 @@
+.container {
+  margin-bottom: 60px;
+}
+
+.nav {
+  width: 200px;
+  margin-top: 40px;
+}
+
+.title {
+  color: var(--base800);
+  text-align: center;
+  font-weight: 700;
+}
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
new file mode 100644
index 000000000..1b21103da
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
@@ -0,0 +1,161 @@
+import { useState } from 'react';
+import SideNav from 'components/layout/SideNav';
+import { useDateRange, useMessages, useNavigation } from 'components/hooks';
+import PagesTable from 'components/metrics/PagesTable';
+import ReferrersTable from 'components/metrics/ReferrersTable';
+import BrowsersTable from 'components/metrics/BrowsersTable';
+import OSTable from 'components/metrics/OSTable';
+import DevicesTable from 'components/metrics/DevicesTable';
+import ScreenTable from 'components/metrics/ScreenTable';
+import CountriesTable from 'components/metrics/CountriesTable';
+import RegionsTable from 'components/metrics/RegionsTable';
+import CitiesTable from 'components/metrics/CitiesTable';
+import LanguagesTable from 'components/metrics/LanguagesTable';
+import EventsTable from 'components/metrics/EventsTable';
+import QueryParametersTable from 'components/metrics/QueryParametersTable';
+import { Grid, GridRow } from 'components/layout/Grid';
+import MetricsTable from 'components/metrics/MetricsTable';
+import useStore from 'store/websites';
+import { getCompareDate } from 'lib/date';
+import { formatNumber } from 'lib/format';
+import ChangeLabel from 'components/metrics/ChangeLabel';
+import styles from './WebsiteCompareTables.module.css';
+
+const views = {
+  url: PagesTable,
+  title: PagesTable,
+  referrer: ReferrersTable,
+  browser: BrowsersTable,
+  os: OSTable,
+  device: DevicesTable,
+  screen: ScreenTable,
+  country: CountriesTable,
+  region: RegionsTable,
+  city: CitiesTable,
+  language: LanguagesTable,
+  event: EventsTable,
+  query: QueryParametersTable,
+};
+
+export function WebsiteCompareTables({ websiteId }: { websiteId: string }) {
+  const [data, setData] = useState([]);
+  const { dateRange } = useDateRange(websiteId);
+  const dateCompare = useStore(state => state[websiteId]?.dateCompare);
+  const { formatMessage, labels } = useMessages();
+  const {
+    renderUrl,
+    query: { view },
+  } = useNavigation();
+  const Component: typeof MetricsTable = views[view || 'url'] || (() => null);
+
+  const items = [
+    {
+      key: 'url',
+      label: formatMessage(labels.pages),
+      url: renderUrl({ view: 'url' }),
+    },
+    {
+      key: 'referrer',
+      label: formatMessage(labels.referrers),
+      url: renderUrl({ view: 'referrer' }),
+    },
+    {
+      key: 'browser',
+      label: formatMessage(labels.browsers),
+      url: renderUrl({ view: 'browser' }),
+    },
+    {
+      key: 'os',
+      label: formatMessage(labels.os),
+      url: renderUrl({ view: 'os' }),
+    },
+    {
+      key: 'device',
+      label: formatMessage(labels.devices),
+      url: renderUrl({ view: 'device' }),
+    },
+    {
+      key: 'country',
+      label: formatMessage(labels.countries),
+      url: renderUrl({ view: 'country' }),
+    },
+    {
+      key: 'region',
+      label: formatMessage(labels.regions),
+      url: renderUrl({ view: 'region' }),
+    },
+    {
+      key: 'city',
+      label: formatMessage(labels.cities),
+      url: renderUrl({ view: 'city' }),
+    },
+    {
+      key: 'language',
+      label: formatMessage(labels.languages),
+      url: renderUrl({ view: 'language' }),
+    },
+    {
+      key: 'screen',
+      label: formatMessage(labels.screens),
+      url: renderUrl({ view: 'screen' }),
+    },
+    {
+      key: 'event',
+      label: formatMessage(labels.events),
+      url: renderUrl({ view: 'event' }),
+    },
+    {
+      key: 'query',
+      label: formatMessage(labels.queryParameters),
+      url: renderUrl({ view: 'query' }),
+    },
+  ];
+
+  const renderChange = ({ x, y }) => {
+    const prev = data.find(d => d.x === x)?.y;
+    const value = y - prev;
+    const change = Math.abs(((y - prev) / prev) * 100);
+
+    return !isNaN(change) && <ChangeLabel value={value}>{formatNumber(change)}%</ChangeLabel>;
+  };
+
+  const { startDate, endDate } = getCompareDate(
+    dateCompare,
+    dateRange.startDate,
+    dateRange.endDate,
+  );
+
+  const params = {
+    startAt: startDate.getTime(),
+    endAt: endDate.getTime(),
+  };
+
+  return (
+    <Grid className={styles.container}>
+      <GridRow columns="compare">
+        <SideNav className={styles.nav} items={items} selectedKey={view} shallow={true} />
+        <div>
+          <div className={styles.title}>{formatMessage(labels.previous)}</div>
+          <Component
+            websiteId={websiteId}
+            limit={20}
+            showMore={false}
+            onDataLoad={setData}
+            params={params}
+          />
+        </div>
+        <div>
+          <div className={styles.title}> {formatMessage(labels.current)}</div>
+          <Component
+            websiteId={websiteId}
+            limit={20}
+            showMore={false}
+            renderChange={renderChange}
+          />
+        </div>
+      </GridRow>
+    </Grid>
+  );
+}
+
+export default WebsiteCompareTables;
diff --git a/src/app/(main)/websites/[websiteId]/compare/page.tsx b/src/app/(main)/websites/[websiteId]/compare/page.tsx
new file mode 100644
index 000000000..b3009fcaa
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/compare/page.tsx
@@ -0,0 +1,10 @@
+import WebsiteComparePage from './WebsiteComparePage';
+import { Metadata } from 'next';
+
+export default function ({ params: { websiteId } }) {
+  return <WebsiteComparePage websiteId={websiteId} />;
+}
+
+export const metadata: Metadata = {
+  title: 'Website Comparison',
+};
diff --git a/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx
index fceb86aae..86417c96d 100644
--- a/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx
@@ -7,7 +7,7 @@ import styles from './EventDataMetricsBar.module.css';
 export function EventDataMetricsBar({ websiteId }: { websiteId: string }) {
   const { formatMessage, labels } = useMessages();
   const { get, useQuery } = useApi();
-  const [dateRange] = useDateRange(websiteId);
+  const { dateRange } = useDateRange(websiteId);
   const { startDate, endDate } = dateRange;
 
   const { data, error, isLoading, isFetched } = useQuery({
diff --git a/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx b/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx
index 27ccd96ca..d7d24ceed 100644
--- a/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx
+++ b/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx
@@ -6,7 +6,7 @@ import { useDateRange, useApi, useNavigation } from 'components/hooks';
 import styles from './WebsiteEventData.module.css';
 
 function useData(websiteId: string, event: string) {
-  const [dateRange] = useDateRange(websiteId);
+  const { dateRange } = useDateRange(websiteId);
   const { startDate, endDate } = dateRange;
   const { get, useQuery } = useApi();
   const { data, error, isLoading } = useQuery({
diff --git a/src/app/(main)/websites/[websiteId]/page.tsx b/src/app/(main)/websites/[websiteId]/page.tsx
index ddb6c833b..49bca9b6f 100644
--- a/src/app/(main)/websites/[websiteId]/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/page.tsx
@@ -1,8 +1,8 @@
-import WebsiteDetails from './WebsiteDetails';
+import WebsiteDetailsPage from './WebsiteDetailsPage';
 import { Metadata } from 'next';
 
 export default function WebsitePage({ params: { websiteId } }) {
-  return <WebsiteDetails websiteId={websiteId} />;
+  return <WebsiteDetailsPage websiteId={websiteId} />;
 }
 
 export const metadata: Metadata = {
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
index 80d3d8c62..cef6e7426 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
@@ -14,25 +14,25 @@ export function RealtimeHeader({ data }: { data: RealtimeData }) {
           className={styles.card}
           label={formatMessage(labels.views)}
           value={pageviews?.length}
-          hideComparison
+          showChange
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.visitors)}
           value={visitors?.length}
-          hideComparison
+          showChange
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.events)}
           value={events?.length}
-          hideComparison
+          showChange
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.countries)}
           value={countries?.length}
-          hideComparison
+          showChange
         />
       </div>
     </div>
diff --git a/src/app/share/[...shareId]/SharePage.tsx b/src/app/share/[...shareId]/SharePage.tsx
index b49d36ec6..4ac6af378 100644
--- a/src/app/share/[...shareId]/SharePage.tsx
+++ b/src/app/share/[...shareId]/SharePage.tsx
@@ -1,5 +1,5 @@
 'use client';
-import WebsiteDetails from 'app/(main)/websites/[websiteId]/WebsiteDetails';
+import WebsiteDetailsPage from '../../(main)/websites/[websiteId]/WebsiteDetailsPage';
 import { useShareToken } from 'components/hooks';
 import Page from 'components/layout/Page';
 import Header from './Header';
@@ -17,7 +17,7 @@ export default function SharePage({ shareId }) {
     <div className={styles.container}>
       <Page>
         <Header />
-        <WebsiteDetails websiteId={shareToken.websiteId} />
+        <WebsiteDetailsPage websiteId={shareToken.websiteId} />
         <Footer />
       </Page>
     </div>
diff --git a/src/assets/compare.svg b/src/assets/compare.svg
new file mode 100644
index 000000000..e037c2435
--- /dev/null
+++ b/src/assets/compare.svg
@@ -0,0 +1 @@
+<svg height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M6 22a1 1 0 0 1-.71-.29l-4-4a1 1 0 0 1 0-1.42l4-4a1 1 0 0 1 1.42 1.42L4.41 16H22a1 1 0 0 1 0 2H4.41l2.3 2.29a1 1 0 0 1 0 1.42A1 1 0 0 1 6 22zm12-10a1 1 0 0 1-.71-.29 1 1 0 0 1 0-1.42L19.59 8H2a1 1 0 0 1 0-2h17.59l-2.3-2.29a1 1 0 0 1 1.42-1.42l4 4a1 1 0 0 1 0 1.42l-4 4A1 1 0 0 1 18 12z"/></svg>
\ No newline at end of file
diff --git a/src/assets/logo-white.svg b/src/assets/logo-white.svg
new file mode 100644
index 000000000..12a76d347
--- /dev/null
+++ b/src/assets/logo-white.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 428 389.11">
+  <circle cx="214.15" cy="181" r="171" fill="none" stroke="white" stroke-miterlimit="10" stroke-width="20"/>
+  <path d="M413 134.11H15.29a15 15 0 0 0-15 15v15.3C.12 168 0 171.52 0 175.11c0 118.19 95.81 214 214 214 116.4 0 211.1-92.94 213.93-208.67 0-.44.07-.88.07-1.33v-30a15 15 0 0 0-15-15Z" fill="white"/>
+</svg>
diff --git a/src/assets/path.svg b/src/assets/path.svg
new file mode 100644
index 000000000..29501565e
--- /dev/null
+++ b/src/assets/path.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" fill="none" viewBox="0 0 64 64"><path fill="#000" d="m56.4 47.6-6-6c-.8-.8-2-.8-2.8 0s-.8 2 0 2.8l2.6 2.6H18.5c-3.6 0-6.5-2.9-6.5-6.5s2.9-6.5 6.5-6.5h27C51.3 34 56 29.3 56 23.5S51.3 13 45.5 13H22.7c-.9-3.4-4-6-7.7-6-4.4 0-8 3.6-8 8s3.6 8 8 8c3.7 0 6.8-2.6 7.7-6h22.8c3.6 0 6.5 2.9 6.5 6.5S49.1 30 45.5 30h-27C12.7 30 8 34.7 8 40.5S12.7 51 18.5 51h31.7l-2.6 2.6c-.8.8-.8 2 0 2.8.4.4.9.6 1.4.6s1-.2 1.4-.6l6-6c.8-.8.8-2 0-2.8M15 19c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4"/></svg>
\ No newline at end of file
diff --git a/src/assets/target.svg b/src/assets/target.svg
index 000f34c7d..c2e47e32d 100644
--- a/src/assets/target.svg
+++ b/src/assets/target.svg
@@ -1 +1 @@
-<svg clip-rule="evenodd" fill-rule="evenodd" height="512" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><g id="Icon"><path d="m19.393 10.825c-.097-.403.151-.808.553-.905.402-.098.808.15.905.553.181.75.277 1.533.277 2.338 0 5.485-4.453 9.939-9.939 9.939-5.485 0-9.939-4.454-9.939-9.939 0-5.486 4.454-9.939 9.939-9.939.805 0 1.588.096 2.338.277.403.097.651.503.553.905-.097.402-.502.65-.905.553-.637-.154-1.302-.235-1.986-.235-4.658 0-8.439 3.781-8.439 8.439s3.781 8.439 8.439 8.439 8.439-3.781 8.439-8.439c0-.684-.081-1.349-.235-1.986z"/><path d="m14.764 12.811c0-.414.336-.75.75-.75.413 0 .75.336.75.75 0 2.8-2.274 5.074-5.075 5.074-2.8 0-5.074-2.274-5.074-5.074 0-2.801 2.274-5.075 5.074-5.075.414 0 .75.337.75.75 0 .414-.336.75-.75.75-1.973 0-3.574 1.602-3.574 3.575s1.601 3.574 3.574 3.574 3.575-1.601 3.575-3.574z"/><path d="m22.53 5.588-3.057 3.058c-.141.141-.332.22-.531.22h-3.058c-.414 0-.75-.336-.75-.75v-3.058c0-.199.079-.39.22-.531l3.058-3.057c.184-.184.45-.26.703-.2s.457.246.539.493l.646 1.937 1.937.646c.247.082.433.286.493.539s-.016.519-.2.703zm-1.918-.202-1.142-.381c-.224-.075-.4-.251-.475-.475l-.381-1.142-1.98 1.98v1.998h1.998z"/><path d="m15.354 7.585c.293-.293.768-.293 1.061 0s.293.768 0 1.061l-4.587 4.586c-.293.293-.768.293-1.06 0-.293-.292-.293-.767 0-1.06z"/></g></svg>
\ No newline at end of file
+<svg clip-rule="evenodd" fill-rule="evenodd" height="512" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M19.393 10.825a.75.75 0 0 1 1.458-.352c.181.75.277 1.533.277 2.338 0 5.485-4.453 9.939-9.939 9.939-5.485 0-9.939-4.454-9.939-9.939 0-5.486 4.454-9.939 9.939-9.939.805 0 1.588.096 2.338.277a.75.75 0 1 1-.352 1.458A8.442 8.442 0 0 0 2.75 12.811a8.442 8.442 0 0 0 8.439 8.439 8.442 8.442 0 0 0 8.204-10.425z"/><path d="M14.764 12.811a.75.75 0 0 1 1.5 0c0 2.8-2.274 5.074-5.075 5.074a5.077 5.077 0 0 1-5.074-5.074 5.077 5.077 0 0 1 5.074-5.075.75.75 0 0 1 0 1.5 3.575 3.575 0 1 0 3.575 3.575zm7.766-7.223-3.057 3.058a.75.75 0 0 1-.531.22h-3.058a.75.75 0 0 1-.75-.75V5.058a.75.75 0 0 1 .22-.531l3.058-3.057a.75.75 0 0 1 1.242.293L20.3 3.7l1.937.646a.75.75 0 0 1 .293 1.242zm-1.918-.202-1.142-.381a.753.753 0 0 1-.475-.475l-.381-1.142-1.98 1.98v1.998h1.998z"/><path d="M15.354 7.585a.75.75 0 1 1 1.061 1.061l-4.587 4.586a.749.749 0 1 1-1.06-1.06z"/></svg>
\ No newline at end of file
diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx
index 635bb10de..cfcbe7435 100644
--- a/src/components/charts/BarChart.tsx
+++ b/src/components/charts/BarChart.tsx
@@ -26,7 +26,7 @@ export function BarChart(props: BarChartProps) {
     stacked = false,
   } = props;
 
-  const options = useMemo(() => {
+  const options: any = useMemo(() => {
     return {
       scales: {
         x: {
diff --git a/src/components/charts/BarChartTooltip.tsx b/src/components/charts/BarChartTooltip.tsx
index b81d55fe1..fed5af924 100644
--- a/src/components/charts/BarChartTooltip.tsx
+++ b/src/components/charts/BarChartTooltip.tsx
@@ -21,7 +21,9 @@ export default function BarChartTooltip({ tooltip, unit }) {
 
   return (
     <Flexbox direction="column" gap={10}>
-      <div>{formatDate(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
+      <div>
+        {formatDate(new Date(dataPoints[0].raw.d || dataPoints[0].raw.x), formats[unit], locale)}
+      </div>
       <div>
         <StatusLight color={labelColors?.[0]?.backgroundColor}>
           {formatLongNumber(dataPoints[0].raw.y)} {dataPoints[0].dataset.label}
diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsx
index 40829cac0..6ba601597 100644
--- a/src/components/charts/Chart.tsx
+++ b/src/components/charts/Chart.tsx
@@ -1,7 +1,7 @@
 import { useState, useRef, useEffect, useMemo, ReactNode } from 'react';
 import { Loading } from 'react-basics';
 import classNames from 'classnames';
-import ChartJS, { LegendItem } from 'chart.js/auto';
+import ChartJS, { LegendItem, ChartOptions } from 'chart.js/auto';
 import HoverTooltip from 'components/common/HoverTooltip';
 import Legend from 'components/metrics/Legend';
 import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
@@ -17,7 +17,7 @@ export interface ChartProps {
   onUpdate?: (chart: any) => void;
   onTooltip?: (model: any) => void;
   className?: string;
-  chartOptions?: { [key: string]: any };
+  chartOptions?: ChartOptions;
   tooltip?: ReactNode;
 }
 
@@ -79,24 +79,28 @@ export function Chart({
   };
 
   const updateChart = (data: any) => {
-    chart.current.data.datasets.forEach((dataset: { data: any }, index: string | number) => {
-      if (data?.datasets[index]) {
-        dataset.data = data?.datasets[index]?.data;
+    if (data.datasets.length === chart.current.data.datasets.length) {
+      chart.current.data.datasets.forEach((dataset: { data: any }, index: string | number) => {
+        if (data?.datasets[index]) {
+          dataset.data = data?.datasets[index]?.data;
 
-        if (chart.current.legend.legendItems[index]) {
-          chart.current.legend.legendItems[index].text = data?.datasets[index]?.label;
+          if (chart.current.legend.legendItems[index]) {
+            chart.current.legend.legendItems[index].text = data?.datasets[index]?.label;
+          }
         }
-      }
-    });
+      });
+    } else {
+      chart.current.data.datasets = data.datasets;
+    }
 
     chart.current.options = options;
 
     // Allow config changes before update
     onUpdate?.(chart.current);
 
-    setLegendItems(chart.current.legend.legendItems);
-
     chart.current.update(updateMode);
+
+    setLegendItems(chart.current.legend.legendItems);
   };
 
   useEffect(() => {
diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index dd201155b..088b31ac4 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -4,7 +4,7 @@ import { useFilterParams } from '../useFilterParams';
 
 export function useWebsiteMetrics(
   websiteId: string,
-  query: { type: string; limit: number; search: string },
+  queryParams: { type: string; limit: number; search: string; startAt?: number; endAt?: number },
   options?: Omit<UseQueryOptions & { onDataLoad?: (data: any) => void }, 'queryKey' | 'queryFn'>,
 ) {
   const { get, useQuery } = useApi();
@@ -16,17 +16,17 @@ export function useWebsiteMetrics(
       {
         websiteId,
         ...params,
-        ...query,
+        ...queryParams,
       },
     ],
     queryFn: async () => {
       const filters = { ...params };
 
-      filters[query.type] = undefined;
+      filters[queryParams.type] = undefined;
 
       const data = await get(`/websites/${websiteId}/metrics`, {
         ...filters,
-        ...query,
+        ...queryParams,
       });
 
       options?.onDataLoad?.(data);
diff --git a/src/components/hooks/queries/useWebsitePageviews.ts b/src/components/hooks/queries/useWebsitePageviews.ts
index 0db1fe638..c9260bcbf 100644
--- a/src/components/hooks/queries/useWebsitePageviews.ts
+++ b/src/components/hooks/queries/useWebsitePageviews.ts
@@ -4,14 +4,15 @@ import { useFilterParams } from '..//useFilterParams';
 
 export function useWebsitePageviews(
   websiteId: string,
+  compare?: string,
   options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
 ) {
   const { get, useQuery } = useApi();
   const params = useFilterParams(websiteId);
 
   return useQuery({
-    queryKey: ['websites:pageviews', { websiteId, ...params }],
-    queryFn: () => get(`/websites/${websiteId}/pageviews`, params),
+    queryKey: ['websites:pageviews', { websiteId, ...params, compare }],
+    queryFn: () => get(`/websites/${websiteId}/pageviews`, { ...params, compare }),
     enabled: !!websiteId,
     ...options,
   });
diff --git a/src/components/hooks/queries/useWebsiteStats.ts b/src/components/hooks/queries/useWebsiteStats.ts
index c2c4b74fd..b24399fa9 100644
--- a/src/components/hooks/queries/useWebsiteStats.ts
+++ b/src/components/hooks/queries/useWebsiteStats.ts
@@ -1,13 +1,17 @@
 import { useApi } from './useApi';
 import { useFilterParams } from '../useFilterParams';
 
-export function useWebsiteStats(websiteId: string, options?: { [key: string]: string }) {
+export function useWebsiteStats(
+  websiteId: string,
+  compare?: string,
+  options?: { [key: string]: string },
+) {
   const { get, useQuery } = useApi();
   const params = useFilterParams(websiteId);
 
   return useQuery({
-    queryKey: ['websites:stats', { websiteId, ...params }],
-    queryFn: () => get(`/websites/${websiteId}/stats`, params),
+    queryKey: ['websites:stats', { websiteId, ...params, compare }],
+    queryFn: () => get(`/websites/${websiteId}/stats`, { ...params, compare }),
     enabled: !!websiteId,
     ...options,
   });
diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.ts
index e022d9604..248070f47 100644
--- a/src/components/hooks/useDateRange.ts
+++ b/src/components/hooks/useDateRange.ts
@@ -1,19 +1,25 @@
 import { getMinimumUnit, parseDateRange } from 'lib/date';
 import { setItem } from 'next-basics';
-import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE } from 'lib/constants';
-import websiteStore, { setWebsiteDateRange } from 'store/websites';
+import { DATE_RANGE_CONFIG, DEFAULT_DATE_COMPARE, DEFAULT_DATE_RANGE } from 'lib/constants';
+import websiteStore, { setWebsiteDateRange, setWebsiteDateCompare } from 'store/websites';
 import appStore, { setDateRange } from 'store/app';
 import { DateRange } from 'lib/types';
 import { useLocale } from './useLocale';
 import { useApi } from './queries/useApi';
 
-export function useDateRange(websiteId?: string): [DateRange, (value: string | DateRange) => void] {
+export function useDateRange(websiteId?: string): {
+  dateRange: DateRange;
+  saveDateRange: (value: string | DateRange) => void;
+  dateCompare: string;
+  saveDateCompare: (value: string) => void;
+} {
   const { get } = useApi();
   const { locale } = useLocale();
   const websiteConfig = websiteStore(state => state[websiteId]?.dateRange);
   const defaultConfig = DEFAULT_DATE_RANGE;
   const globalConfig = appStore(state => state.dateRange);
   const dateRange = parseDateRange(websiteConfig || globalConfig || defaultConfig, locale);
+  const dateCompare = websiteStore(state => state[websiteId]?.dateCompare || DEFAULT_DATE_COMPARE);
 
   const saveDateRange = async (value: DateRange | string) => {
     if (websiteId) {
@@ -45,7 +51,11 @@ export function useDateRange(websiteId?: string): [DateRange, (value: string | D
     }
   };
 
-  return [dateRange, saveDateRange];
+  const saveDateCompare = (value: string) => {
+    setWebsiteDateCompare(websiteId, value);
+  };
+
+  return { dateRange, saveDateRange, dateCompare, saveDateCompare };
 }
 
 export default useDateRange;
diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts
index fd76fd478..ac934d8c8 100644
--- a/src/components/hooks/useFilterParams.ts
+++ b/src/components/hooks/useFilterParams.ts
@@ -4,7 +4,7 @@ import { useTimezone } from './useTimezone';
 import { zonedTimeToUtc } from 'date-fns-tz';
 
 export function useFilterParams(websiteId: string) {
-  const [dateRange] = useDateRange(websiteId);
+  const { dateRange } = useDateRange(websiteId);
   const { startDate, endDate, unit } = dateRange;
   const { timezone } = useTimezone();
   const {
diff --git a/src/components/icons.ts b/src/components/icons.ts
index 3cbb09d25..8e5a481cb 100644
--- a/src/components/icons.ts
+++ b/src/components/icons.ts
@@ -6,6 +6,7 @@ import Bolt from 'assets/bolt.svg';
 import Calendar from 'assets/calendar.svg';
 import Change from 'assets/change.svg';
 import Clock from 'assets/clock.svg';
+import Compare from 'assets/compare.svg';
 import Dashboard from 'assets/dashboard.svg';
 import Eye from 'assets/eye.svg';
 import Gear from 'assets/gear.svg';
@@ -32,6 +33,7 @@ const icons = {
   Calendar,
   Change,
   Clock,
+  Compare,
   Dashboard,
   Eye,
   Gear,
diff --git a/src/components/input/RefreshButton.tsx b/src/components/input/RefreshButton.tsx
index 4515a5749..cd68c40af 100644
--- a/src/components/input/RefreshButton.tsx
+++ b/src/components/input/RefreshButton.tsx
@@ -12,7 +12,7 @@ export function RefreshButton({
   isLoading?: boolean;
 }) {
   const { formatMessage, labels } = useMessages();
-  const [dateRange] = useDateRange(websiteId);
+  const { dateRange } = useDateRange(websiteId);
 
   function handleClick() {
     if (!isLoading && dateRange) {
diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsx
index 3cb887662..4f2dee0ae 100644
--- a/src/components/input/WebsiteDateFilter.tsx
+++ b/src/components/input/WebsiteDateFilter.tsx
@@ -8,21 +8,30 @@ import { DateRange } from 'lib/types';
 
 export function WebsiteDateFilter({ websiteId }: { websiteId: string }) {
   const { dir } = useLocale();
-  const [dateRange, setDateRange] = useDateRange(websiteId);
+  const { dateRange, saveDateRange } = useDateRange(websiteId);
   const { value, startDate, endDate, offset } = dateRange;
   const disableForward =
     value === 'all' || isAfter(getOffsetDateRange(dateRange, 1).startDate, new Date());
 
   const handleChange = (value: string | DateRange) => {
-    setDateRange(value);
+    saveDateRange(value);
   };
 
   const handleIncrement = (increment: number) => {
-    setDateRange(getOffsetDateRange(dateRange, increment));
+    saveDateRange(getOffsetDateRange(dateRange, increment));
   };
 
   return (
     <div className={styles.container}>
+      <DateFilter
+        className={styles.dropdown}
+        value={value}
+        startDate={startDate}
+        endDate={endDate}
+        offset={offset}
+        onChange={handleChange}
+        showAllTime={true}
+      />
       {value !== 'all' && !value.startsWith('range') && (
         <div className={styles.buttons}>
           <Button onClick={() => handleIncrement(-1)}>
@@ -37,15 +46,6 @@ export function WebsiteDateFilter({ websiteId }: { websiteId: string }) {
           </Button>
         </div>
       )}
-      <DateFilter
-        className={styles.dropdown}
-        value={value}
-        startDate={startDate}
-        endDate={endDate}
-        offset={offset}
-        onChange={handleChange}
-        showAllTime={true}
-      />
     </div>
   );
 }
diff --git a/src/components/layout/Grid.module.css b/src/components/layout/Grid.module.css
index f72a5f126..de99b7526 100644
--- a/src/components/layout/Grid.module.css
+++ b/src/components/layout/Grid.module.css
@@ -8,6 +8,10 @@
   border-top: 1px solid var(--base300);
 }
 
+.row.compare {
+  grid-template-columns: max-content 1fr 1fr;
+}
+
 .col {
   padding: 20px;
   min-height: 430px;
diff --git a/src/components/layout/Grid.tsx b/src/components/layout/Grid.tsx
index 2a34fdc4f..ec7f4fda1 100644
--- a/src/components/layout/Grid.tsx
+++ b/src/components/layout/Grid.tsx
@@ -1,6 +1,7 @@
 import { CSSProperties } from 'react';
 import classNames from 'classnames';
 import { mapChildren } from 'react-basics';
+// eslint-disable-next-line css-modules/no-unused-class
 import styles from './Grid.module.css';
 
 export interface GridProps {
@@ -19,13 +20,13 @@ export function Grid({ className, style, children }: GridProps) {
 
 export function GridRow(props: {
   [x: string]: any;
-  columns?: 'one' | 'two' | 'three' | 'one-two' | 'two-one';
+  columns?: 'one' | 'two' | 'three' | 'one-two' | 'two-one' | 'compare';
   className?: string;
   children?: any;
 }) {
   const { columns = 'two', className, children, ...otherProps } = props;
   return (
-    <div {...otherProps} className={classNames(styles.row, className)}>
+    <div {...otherProps} className={classNames(styles.row, className, { [styles[columns]]: true })}>
       {mapChildren(children, child => {
         return <div className={classNames(styles.col, { [styles[columns]]: true })}>{child}</div>;
       })}
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 1413549fd..53e69401c 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -95,6 +95,9 @@ export const labels = defineMessages({
   devices: { id: 'label.devices', defaultMessage: 'Devices' },
   countries: { id: 'label.countries', defaultMessage: 'Countries' },
   languages: { id: 'label.languages', defaultMessage: 'Languages' },
+  count: { id: 'label.count', defaultMessage: 'Count' },
+  average: { id: 'label.average', defaultMessage: 'Average' },
+  sum: { id: 'label.sum', defaultMessage: 'Sum' },
   event: { id: 'label.event', defaultMessage: 'Event' },
   events: { id: 'label.events', defaultMessage: 'Events' },
   query: { id: 'label.query', defaultMessage: 'Query' },
@@ -107,6 +110,7 @@ export const labels = defineMessages({
   views: { id: 'label.views', defaultMessage: 'Views' },
   none: { id: 'label.none', defaultMessage: 'None' },
   clearAll: { id: 'label.clear-all', defaultMessage: 'Clear all' },
+  property: { id: 'label.property', defaultMessage: 'Property' },
   today: { id: 'label.today', defaultMessage: 'Today' },
   lastHours: { id: 'label.last-hours', defaultMessage: 'Last {x} hours' },
   yesterday: { id: 'label.yesterday', defaultMessage: 'Yesterday' },
@@ -130,7 +134,7 @@ export const labels = defineMessages({
   uniqueVisitors: { id: 'label.unique-visitors', defaultMessage: 'Unique visitors' },
   bounceRate: { id: 'label.bounce-rate', defaultMessage: 'Bounce rate' },
   viewsPerVisit: { id: 'label.views-per-visit', defaultMessage: 'Views per visit' },
-  averageVisitTime: { id: 'label.average-visit-time', defaultMessage: 'Average visit time' },
+  visitDuration: { id: 'label.visit-duration', defaultMessage: 'Visit duration' },
   desktop: { id: 'label.desktop', defaultMessage: 'Desktop' },
   laptop: { id: 'label.laptop', defaultMessage: 'Laptop' },
   tablet: { id: 'label.tablet', defaultMessage: 'Tablet' },
@@ -178,8 +182,6 @@ export const labels = defineMessages({
   before: { id: 'label.before', defaultMessage: 'Before' },
   after: { id: 'label.after', defaultMessage: 'After' },
   total: { id: 'label.total', defaultMessage: 'Total' },
-  sum: { id: 'label.sum', defaultMessage: 'Sum' },
-  average: { id: 'label.average', defaultMessage: 'Average' },
   min: { id: 'label.min', defaultMessage: 'Min' },
   max: { id: 'label.max', defaultMessage: 'Max' },
   unique: { id: 'label.unique', defaultMessage: 'Unique' },
@@ -220,6 +222,10 @@ export const labels = defineMessages({
     id: 'message.viewed-page',
     defaultMessage: 'Viewed page',
   },
+  collectedData: {
+    id: 'message.collected-data',
+    defaultMessage: 'Collected data',
+  },
   triggeredEvent: {
     id: 'message.triggered-event',
     defaultMessage: 'Triggered event',
@@ -239,9 +245,18 @@ export const labels = defineMessages({
   goals: { id: 'label.goals', defaultMessage: 'Goals' },
   goalsDescription: {
     id: 'label.goals-description',
-    defaultMessage: 'Track your goals for pageviews or events.',
+    defaultMessage: 'Track your goals for pageviews and events.',
   },
-  count: { id: 'label.count', defaultMessage: 'Count' },
+  journey: { id: 'label.journey', defaultMessage: 'Journey' },
+  journeyDescription: {
+    id: 'label.journey-description',
+    defaultMessage: 'Understand how users nagivate through your website.',
+  },
+  compare: { id: 'label.compare', defaultMessage: 'Compare' },
+  current: { id: 'label.current', defaultMessage: 'Current' },
+  previous: { id: 'label.previous', defaultMessage: 'Previous' },
+  previousPeriod: { id: 'label.previous-period', defaultMessage: 'Previous period' },
+  previousYear: { id: 'label.previous-year', defaultMessage: 'Previous year' },
 });
 
 export const messages = defineMessages({
diff --git a/src/components/metrics/ChangeLabel.module.css b/src/components/metrics/ChangeLabel.module.css
new file mode 100644
index 000000000..110f9a0da
--- /dev/null
+++ b/src/components/metrics/ChangeLabel.module.css
@@ -0,0 +1,31 @@
+.label {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  font-size: 13px;
+  font-weight: 700;
+  padding: 0.1em 0.5em;
+  border-radius: 5px;
+  color: var(--base500);
+  align-self: flex-start;
+}
+
+.positive {
+  color: var(--green700);
+  background: var(--green100);
+}
+
+.negative {
+  color: var(--red700);
+  background: var(--red100);
+}
+
+.neutral {
+  color: var(--base700);
+  background: var(--base100);
+}
+
+.new {
+  color: var(--blue900);
+  background: var(--blue100);
+}
diff --git a/src/components/metrics/ChangeLabel.tsx b/src/components/metrics/ChangeLabel.tsx
new file mode 100644
index 000000000..6eefc55ba
--- /dev/null
+++ b/src/components/metrics/ChangeLabel.tsx
@@ -0,0 +1,44 @@
+import classNames from 'classnames';
+import { Icon, Icons } from 'react-basics';
+import { ReactNode } from 'react';
+import styles from './ChangeLabel.module.css';
+
+export function ChangeLabel({
+  value,
+  size,
+  reverseColors,
+  className,
+  children,
+}: {
+  value: number;
+  size?: 'xs' | 'sm' | 'md' | 'lg';
+  reverseColors?: boolean;
+  showPercentage?: boolean;
+  className?: string;
+  children?: ReactNode;
+}) {
+  const positive = value * (reverseColors ? -1 : 1) >= 0;
+  const negative = value * (reverseColors ? -1 : 1) < 0;
+  const isNew = isNaN(value);
+
+  return (
+    <div
+      className={classNames(styles.label, className, {
+        [styles.positive]: positive,
+        [styles.negative]: negative,
+        [styles.neutral]: value === 0,
+        [styles.new]: isNew,
+      })}
+      title={value.toString()}
+    >
+      {!isNew && (
+        <Icon rotate={value === 0 ? 0 : positive || reverseColors ? -45 : 45} size={size}>
+          <Icons.ArrowRight />
+        </Icon>
+      )}
+      {children || value}
+    </div>
+  );
+}
+
+export default ChangeLabel;
diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx
index eb2fb703c..842ae6056 100644
--- a/src/components/metrics/EventsChart.tsx
+++ b/src/components/metrics/EventsChart.tsx
@@ -13,7 +13,9 @@ export interface EventsChartProps {
 }
 
 export function EventsChart({ websiteId, className }: EventsChartProps) {
-  const [{ startDate, endDate, unit }] = useDateRange(websiteId);
+  const {
+    dateRange: { startDate, endDate, unit },
+  } = useDateRange(websiteId);
   const { locale } = useLocale();
   const { data, isLoading } = useWebsiteEvents(websiteId);
 
diff --git a/src/components/metrics/FilterTags.module.css b/src/components/metrics/FilterTags.module.css
index fe5c345ce..ea7714f47 100644
--- a/src/components/metrics/FilterTags.module.css
+++ b/src/components/metrics/FilterTags.module.css
@@ -2,6 +2,12 @@
   display: flex;
   align-items: center;
   gap: 10px;
+  background: var(--base75);
+  padding: 10px 20px;
+  border: 1px solid var(--base400);
+  border-radius: 8px;
+  margin-bottom: 20px;
+  flex-wrap: wrap;
 }
 
 .label {
@@ -12,12 +18,13 @@
   display: flex;
   flex-direction: row;
   align-items: center;
-  gap: 10px;
-  background: var(--base75);
+  gap: 4px;
+  font-size: 12px;
+  background: var(--base50);
   border: 1px solid var(--base400);
   border-radius: var(--border-radius);
   box-shadow: 1px 1px 1px var(--base500);
-  padding: 8px 16px;
+  padding: 6px 14px;
   cursor: pointer;
 }
 
@@ -27,6 +34,8 @@
 
 .close {
   font-weight: 700;
+  align-self: center;
+  margin-left: auto;
 }
 
 .name,
diff --git a/src/components/metrics/FilterTags.tsx b/src/components/metrics/FilterTags.tsx
index 35d12556a..60cf90c18 100644
--- a/src/components/metrics/FilterTags.tsx
+++ b/src/components/metrics/FilterTags.tsx
@@ -13,6 +13,7 @@ import FieldFilterEditForm from 'app/(main)/reports/[reportId]/FieldFilterEditFo
 import { 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,
@@ -23,7 +24,7 @@ export function FilterTags({
 }) {
   const { formatMessage, labels } = useMessages();
   const { formatValue } = useFormat();
-  const [dateRange] = useDateRange(websiteId);
+  const { dateRange } = useDateRange(websiteId);
   const {
     router,
     renderUrl,
@@ -100,6 +101,7 @@ export function FilterTags({
           </PopupTrigger>
         );
       })}
+      <WebsiteFilterButton websiteId={websiteId} alignment="center" showText={false} />
       <Button className={styles.close} variant="quiet" onClick={handleResetFilter}>
         <Icon>
           <Icons.Close />
diff --git a/src/components/metrics/ListTable.module.css b/src/components/metrics/ListTable.module.css
index 9c3d5cff6..405819b1c 100644
--- a/src/components/metrics/ListTable.module.css
+++ b/src/components/metrics/ListTable.module.css
@@ -72,9 +72,11 @@
 }
 
 .value {
-  width: 50px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
   text-align: end;
-  margin-inline-end: 10px;
+  margin-inline-end: 5px;
   font-weight: 600;
 }
 
diff --git a/src/components/metrics/ListTable.tsx b/src/components/metrics/ListTable.tsx
index 133905e13..59ded4917 100644
--- a/src/components/metrics/ListTable.tsx
+++ b/src/components/metrics/ListTable.tsx
@@ -14,7 +14,8 @@ export interface ListTableProps {
   title?: string;
   metric?: string;
   className?: string;
-  renderLabel?: (row: any) => ReactNode;
+  renderLabel?: (row: any, index: number) => ReactNode;
+  renderChange?: (row: any, index: number) => ReactNode;
   animate?: boolean;
   virtualize?: boolean;
   showPercentage?: boolean;
@@ -27,6 +28,7 @@ export function ListTable({
   metric,
   className,
   renderLabel,
+  renderChange,
   animate = true,
   virtualize = false,
   showPercentage = true,
@@ -34,23 +36,24 @@ export function ListTable({
 }: ListTableProps) {
   const { formatMessage, labels } = useMessages();
 
-  const getRow = row => {
+  const getRow = (row: { x: any; y: any; z: any }, index: number) => {
     const { x: label, y: value, z: percent } = row;
 
     return (
       <AnimatedRow
         key={label}
-        label={renderLabel ? renderLabel(row) : label ?? formatMessage(labels.unknown)}
+        label={renderLabel ? renderLabel(row, index) : label ?? formatMessage(labels.unknown)}
         value={value}
         percent={percent}
         animate={animate && !virtualize}
         showPercentage={showPercentage}
+        change={renderChange ? renderChange(row, index) : null}
       />
     );
   };
 
   const Row = ({ index, style }) => {
-    return <div style={style}>{getRow(data[index])}</div>;
+    return <div style={style}>{getRow(data[index], index)}</div>;
   };
 
   return (
@@ -71,14 +74,14 @@ export function ListTable({
             {Row}
           </FixedSizeList>
         ) : (
-          data.map(row => getRow(row))
+          data.map(getRow)
         )}
       </div>
     </div>
   );
 }
 
-const AnimatedRow = ({ label, value = 0, percent, animate, showPercentage = true }) => {
+const AnimatedRow = ({ label, value = 0, percent, change, animate, showPercentage = true }) => {
   const props = useSpring({
     width: percent,
     y: value,
@@ -90,6 +93,7 @@ const AnimatedRow = ({ label, value = 0, percent, animate, showPercentage = true
     <div className={styles.row}>
       <div className={styles.label}>{label}</div>
       <div className={styles.value}>
+        {change}
         <animated.div className={styles.value} title={props?.y as any}>
           {props.y?.to(formatLongNumber)}
         </animated.div>
@@ -97,9 +101,7 @@ const AnimatedRow = ({ label, value = 0, percent, animate, showPercentage = true
       {showPercentage && (
         <div className={styles.percent}>
           <animated.div className={styles.bar} style={{ width: props.width.to(n => `${n}%`) }} />
-          <animated.span className={styles.percentValue}>
-            {props.width.to(n => `${n?.toFixed?.(0)}%`)}
-          </animated.span>
+          <animated.span>{props.width.to(n => `${n?.toFixed?.(0)}%`)}</animated.span>
         </div>
       )}
     </div>
diff --git a/src/components/metrics/MetricCard.module.css b/src/components/metrics/MetricCard.module.css
index 8ddecc104..93e6c6d72 100644
--- a/src/components/metrics/MetricCard.module.css
+++ b/src/components/metrics/MetricCard.module.css
@@ -2,47 +2,36 @@
   display: flex;
   flex-direction: column;
   justify-content: center;
-  min-height: 90px;
-  min-width: 140px;
+  min-width: 150px;
+}
+
+.card.compare .change {
+  font-size: 16px;
+  margin: 10px 0;
+}
+
+.card:first-child {
+  padding-left: 0;
+}
+
+.card:last-child {
+  border: 0;
 }
 
 .value {
-  display: flex;
-  align-items: center;
   font-size: 36px;
   font-weight: 700;
   white-space: nowrap;
-  min-height: 60px;
   color: var(--base900);
+  line-height: 1.5;
 }
 
-.label {
-  display: flex;
-  align-items: center;
-  font-weight: 700;
-  gap: 10px;
-  white-space: nowrap;
-  min-height: 30px;
+.value.prev {
   color: var(--base800);
 }
 
-.change {
-  font-size: 12px;
-  padding: 0 5px;
-  border-radius: 5px;
-  color: var(--base500);
-}
-
-.change.positive {
-  color: var(--green700);
-  background: var(--green100);
-}
-
-.change.negative {
-  color: var(--red700);
-  background: var(--red100);
-}
-
-.change.plusSign::before {
-  content: '+';
+.label {
+  font-weight: 700;
+  white-space: nowrap;
+  color: var(--base800);
 }
diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx
index 2359b0e20..3c4899c4f 100644
--- a/src/components/metrics/MetricCard.tsx
+++ b/src/components/metrics/MetricCard.tsx
@@ -1,15 +1,19 @@
 import classNames from 'classnames';
 import { useSpring, animated } from '@react-spring/web';
 import { formatNumber } from 'lib/format';
+import ChangeLabel from 'components/metrics/ChangeLabel';
 import styles from './MetricCard.module.css';
 
 export interface MetricCardProps {
   value: number;
+  previousValue?: number;
   change?: number;
-  label: string;
+  label?: string;
   reverseColors?: boolean;
-  format?: typeof formatNumber;
-  hideComparison?: boolean;
+  formatValue?: typeof formatNumber;
+  showLabel?: boolean;
+  showChange?: boolean;
+  showPrevious?: boolean;
   className?: string;
 }
 
@@ -18,33 +22,37 @@ export const MetricCard = ({
   change = 0,
   label,
   reverseColors = false,
-  format = formatNumber,
-  hideComparison = false,
+  formatValue = formatNumber,
+  showLabel = true,
+  showChange = false,
+  showPrevious = false,
   className,
 }: MetricCardProps) => {
+  const diff = value - change;
+  const pct = ((value - diff) / diff) * 100;
   const props = useSpring({ x: Number(value) || 0, from: { x: 0 } });
-  const changeProps = useSpring({ x: Number(change) || 0, from: { x: 0 } });
+  const changeProps = useSpring({ x: Number(pct) || 0, from: { x: 0 } });
+  const prevProps = useSpring({ x: Number(diff) || 0, from: { x: 0 } });
 
   return (
-    <div className={classNames(styles.card, className)}>
-      <animated.div className={styles.value} title={props?.x as any}>
-        {props?.x?.to(x => format(x))}
+    <div className={classNames(styles.card, className, showPrevious && styles.compare)}>
+      {showLabel && <div className={styles.label}>{label}</div>}
+      <animated.div className={styles.value} title={formatValue(value)}>
+        {props?.x?.to(x => formatValue(x))}
       </animated.div>
-      <div className={styles.label}>
-        {label}
-        {~~change !== 0 && !hideComparison && (
-          <animated.span
-            className={classNames(styles.change, {
-              [styles.positive]: change * (reverseColors ? -1 : 1) >= 0,
-              [styles.negative]: change * (reverseColors ? -1 : 1) < 0,
-              [styles.plusSign]: change > 0,
-            })}
-            title={changeProps?.x as any}
-          >
-            {changeProps?.x?.to(x => format(x))}
+      {showChange && (
+        <ChangeLabel className={styles.change} value={change} reverseColors={reverseColors}>
+          <animated.span title={formatValue(change)}>
+            {changeProps?.x?.to(x => Math.abs(~~x))}
           </animated.span>
-        )}
-      </div>
+          %
+        </ChangeLabel>
+      )}
+      {showPrevious && (
+        <animated.div className={classNames(styles.value, styles.prev)} title={formatValue(diff)}>
+          {prevProps?.x?.to(x => formatValue(x))}
+        </animated.div>
+      )}
     </div>
   );
 };
diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsx
index 857c136b2..4ca3ff522 100644
--- a/src/components/metrics/MetricsTable.tsx
+++ b/src/components/metrics/MetricsTable.tsx
@@ -18,7 +18,6 @@ import styles from './MetricsTable.module.css';
 
 export interface MetricsTableProps extends ListTableProps {
   websiteId: string;
-  domainName: string;
   type?: string;
   className?: string;
   dataFilter?: (data: any) => any;
@@ -27,6 +26,8 @@ export interface MetricsTableProps extends ListTableProps {
   onDataLoad?: (data: any) => void;
   onSearch?: (search: string) => void;
   allowSearch?: boolean;
+  showMore?: boolean;
+  params?: { [key: string]: any };
   children?: ReactNode;
 }
 
@@ -39,6 +40,8 @@ export function MetricsTable({
   onDataLoad,
   delay = null,
   allowSearch = false,
+  showMore = true,
+  params,
   children,
   ...props
 }: MetricsTableProps) {
@@ -50,7 +53,7 @@ export function MetricsTable({
 
   const { data, isLoading, isFetched, error } = useWebsiteMetrics(
     websiteId,
-    { type, limit, search },
+    { type, limit, search, ...params },
     {
       retryDelay: delay || DEFAULT_ANIMATION_DURATION,
       onDataLoad,
@@ -98,7 +101,7 @@ export function MetricsTable({
       )}
       {!data && isLoading && !isFetched && <Loading icon="dots" />}
       <div className={styles.footer}>
-        {data && !error && limit && (
+        {showMore && data && !error && limit && (
           <LinkButton href={renderUrl({ view: type })} variant="quiet">
             <Text>{formatMessage(labels.more)}</Text>
             <Icon size="sm" rotate={dir === 'rtl' ? 180 : 0}>
diff --git a/src/components/metrics/PagesTable.tsx b/src/components/metrics/PagesTable.tsx
index b0da80806..d29952d4f 100644
--- a/src/components/metrics/PagesTable.tsx
+++ b/src/components/metrics/PagesTable.tsx
@@ -4,18 +4,21 @@ import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import { useMessages } from 'components/hooks';
 import { useNavigation } from 'components/hooks';
 import { emptyFilter } from 'lib/filters';
+import { useContext } from 'react';
+import { WebsiteContext } from 'app/(main)/websites/[websiteId]/WebsiteProvider';
 
 export interface PagesTableProps extends MetricsTableProps {
   allowFilter?: boolean;
 }
 
-export function PagesTable({ allowFilter, domainName, ...props }: PagesTableProps) {
+export function PagesTable({ allowFilter, ...props }: PagesTableProps) {
   const {
     router,
     renderUrl,
     query: { view = 'url' },
   } = useNavigation();
   const { formatMessage, labels } = useMessages();
+  const { domain } = useContext(WebsiteContext);
 
   const handleSelect = (key: any) => {
     router.push(renderUrl({ view: key }), { scroll: true });
@@ -39,9 +42,7 @@ export function PagesTable({ allowFilter, domainName, ...props }: PagesTableProp
         value={x}
         label={!x && formatMessage(labels.none)}
         externalUrl={
-          view === 'url'
-            ? `${domainName.startsWith('http') ? domainName : `https://${domainName}`}${x}`
-            : null
+          view === 'url' ? `${domain.startsWith('http') ? domain : `https://${domain}`}${x}` : null
         }
       />
     );
@@ -50,7 +51,6 @@ export function PagesTable({ allowFilter, domainName, ...props }: PagesTableProp
   return (
     <MetricsTable
       {...props}
-      domainName={domainName}
       title={formatMessage(labels.pages)}
       type={view}
       metric={formatMessage(labels.views)}
diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx
index 347bf155f..400b96ba3 100644
--- a/src/components/metrics/PageviewsChart.tsx
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -5,8 +5,12 @@ import { renderDateLabels } from 'lib/charts';
 
 export interface PageviewsChartProps extends BarChartProps {
   data: {
-    sessions: any[];
     pageviews: any[];
+    sessions: any[];
+    compare?: {
+      pageviews: any[];
+      sessions: any[];
+    };
   };
   unit: string;
   isLoading?: boolean;
@@ -29,13 +33,37 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
           data: data.sessions,
           borderWidth: 1,
           ...colors.chart.visitors,
+          order: 3,
         },
         {
           label: formatMessage(labels.views),
           data: data.pageviews,
           borderWidth: 1,
           ...colors.chart.views,
+          order: 4,
         },
+        ...(data.compare
+          ? [
+              {
+                type: 'line',
+                label: `${formatMessage(labels.views)} (${formatMessage(labels.previous)})`,
+                data: data.compare.pageviews,
+                borderWidth: 2,
+                backgroundColor: '#8601B0',
+                borderColor: '#8601B0',
+                order: 1,
+              },
+              {
+                type: 'line',
+                label: `${formatMessage(labels.visitors)} (${formatMessage(labels.previous)})`,
+                data: data.compare.sessions,
+                borderWidth: 2,
+                backgroundColor: '#f15bb5',
+                borderColor: '#f15bb5',
+                order: 2,
+              },
+            ]
+          : []),
       ],
     };
   }, [data, locale]);
diff --git a/src/declaration.d.ts b/src/declaration.d.ts
index 986adf272..d968c14d5 100644
--- a/src/declaration.d.ts
+++ b/src/declaration.d.ts
@@ -1,4 +1,5 @@
 declare module 'cors';
+declare module 'dateformat';
 declare module 'debug';
 declare module 'chartjs-adapter-date-fns';
 declare module 'md5';
diff --git a/src/lang/am-ET.json b/src/lang/am-ET.json
index e289ddc5f..9546ffdd9 100644
--- a/src/lang/am-ET.json
+++ b/src/lang/am-ET.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Average visit time",
+  "label.visit-duration": "Average visit time",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/ar-SA.json b/src/lang/ar-SA.json
index d01ff65fd..aff31f678 100644
--- a/src/lang/ar-SA.json
+++ b/src/lang/ar-SA.json
@@ -13,7 +13,7 @@
   "label.all-time": "كل الوقت",
   "label.analytics": "تحليلات",
   "label.average": "المتوسط",
-  "label.average-visit-time": "متوسط وقت الزيارة",
+  "label.visit-duration": "متوسط وقت الزيارة",
   "label.back": "للخلف",
   "label.before": "قبل",
   "label.bounce-rate": "معدل الارتداد",
diff --git a/src/lang/be-BY.json b/src/lang/be-BY.json
index b68c8dab4..a831fe0fa 100644
--- a/src/lang/be-BY.json
+++ b/src/lang/be-BY.json
@@ -13,7 +13,7 @@
   "label.all-time": "Увесь час",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Сярэдняя даўжыня наведвання",
+  "label.visit-duration": "Сярэдняя даўжыня наведвання",
   "label.back": "Назад",
   "label.before": "Before",
   "label.bounce-rate": "Паказчык адмоваў",
diff --git a/src/lang/bn-BD.json b/src/lang/bn-BD.json
index f94292159..7436a002b 100644
--- a/src/lang/bn-BD.json
+++ b/src/lang/bn-BD.json
@@ -13,7 +13,7 @@
   "label.all-time": "সব সময়",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "গড় পরিদর্শনের সময়",
+  "label.visit-duration": "গড় পরিদর্শনের সময়",
   "label.back": "পেছনে",
   "label.before": "Before",
   "label.bounce-rate": "বহিষ্কারের হার",
diff --git a/src/lang/bs-BA.json b/src/lang/bs-BA.json
index 27318df0d..3eda0f854 100644
--- a/src/lang/bs-BA.json
+++ b/src/lang/bs-BA.json
@@ -13,7 +13,7 @@
   "label.all-time": "Cijelo vrijeme",
   "label.analytics": "Analitike",
   "label.average": "Prosjek",
-  "label.average-visit-time": "Prosječno vrijeme posjete",
+  "label.visit-duration": "Prosječno vrijeme posjete",
   "label.back": "Nazad",
   "label.before": "Prije",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/ca-ES.json b/src/lang/ca-ES.json
index 4a1dee619..a12fd3c8e 100644
--- a/src/lang/ca-ES.json
+++ b/src/lang/ca-ES.json
@@ -13,7 +13,7 @@
   "label.all-time": "Sempre",
   "label.analytics": "Analítiques",
   "label.average": "Mitjana",
-  "label.average-visit-time": "Temps mitjà de visita",
+  "label.visit-duration": "Temps mitjà de visita",
   "label.back": "Enrere",
   "label.before": "Abans",
   "label.bounce-rate": "Percentatge de rebot",
diff --git a/src/lang/cs-CZ.json b/src/lang/cs-CZ.json
index 7f3599c9b..64153d7d0 100644
--- a/src/lang/cs-CZ.json
+++ b/src/lang/cs-CZ.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Průměrný čas návštěvy",
+  "label.visit-duration": "Průměrný čas návštěvy",
   "label.back": "Zpět",
   "label.before": "Before",
   "label.bounce-rate": "Okamžité opuštění",
diff --git a/src/lang/da-DK.json b/src/lang/da-DK.json
index fe6d483f0..d38d2a821 100644
--- a/src/lang/da-DK.json
+++ b/src/lang/da-DK.json
@@ -13,7 +13,7 @@
   "label.all-time": "Altid",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Gennemsnitlig besøgstid",
+  "label.visit-duration": "Gennemsnitlig besøgstid",
   "label.back": "Tilbage",
   "label.before": "Before",
   "label.bounce-rate": "Afvisningsprocent",
diff --git a/src/lang/de-CH.json b/src/lang/de-CH.json
index a99826310..dca1e3516 100644
--- a/src/lang/de-CH.json
+++ b/src/lang/de-CH.json
@@ -13,7 +13,7 @@
   "label.all-time": "Gesamte Zitruum",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Durchschn. Bsuechsziit",
+  "label.visit-duration": "Durchschn. Bsuechsziit",
   "label.back": "Zrugg",
   "label.before": "Before",
   "label.bounce-rate": "Absprungsrate",
diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index 3272abaf1..b0a296b51 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -13,7 +13,7 @@
   "label.all-time": "Gesamter Zeitraum",
   "label.analytics": "Analytics",
   "label.average": "Durchschnitt",
-  "label.average-visit-time": "Durchschn. Besuchszeit",
+  "label.visit-duration": "Durchschn. Besuchszeit",
   "label.back": "Zurück",
   "label.before": "Vor",
   "label.bounce-rate": "Absprungrate",
diff --git a/src/lang/el-GR.json b/src/lang/el-GR.json
index 1c1fd1b22..3d44bd005 100644
--- a/src/lang/el-GR.json
+++ b/src/lang/el-GR.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Μέσος χρόνος επίσκεψης",
+  "label.visit-duration": "Μέσος χρόνος επίσκεψης",
   "label.back": "Πίσω",
   "label.before": "Before",
   "label.bounce-rate": "Ποσοστό αναπήδησης",
diff --git a/src/lang/en-GB.json b/src/lang/en-GB.json
index 3df625f8e..82e60c5e0 100644
--- a/src/lang/en-GB.json
+++ b/src/lang/en-GB.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Average visit time",
+  "label.visit-duration": "Average visit time",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index 5ceb39d18..77e6daa1e 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Average visit time",
+  "label.visit-duration": "Average visit time",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 43e74e214..85796f426 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -13,7 +13,7 @@
   "label.all-time": "Todos los tiempos",
   "label.analytics": "Analíticas",
   "label.average": "Media",
-  "label.average-visit-time": "Tiempo promedio de visita",
+  "label.visit-duration": "Tiempo promedio de visita",
   "label.back": "Atrás",
   "label.before": "Antes",
   "label.bounce-rate": "Porcentaje de rebote",
diff --git a/src/lang/fa-IR.json b/src/lang/fa-IR.json
index 70c60f018..cab0ffa41 100644
--- a/src/lang/fa-IR.json
+++ b/src/lang/fa-IR.json
@@ -13,7 +13,7 @@
   "label.all-time": "همه زمان",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "میانگین زمان بازدید",
+  "label.visit-duration": "میانگین زمان بازدید",
   "label.back": "برگشت",
   "label.before": "Before",
   "label.bounce-rate": "نرخ Bounce",
diff --git a/src/lang/fi-FI.json b/src/lang/fi-FI.json
index f827c482a..0389cf82b 100644
--- a/src/lang/fi-FI.json
+++ b/src/lang/fi-FI.json
@@ -13,7 +13,7 @@
   "label.all-time": "Alusta lähtien",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Keskimääräinen vierailuaika",
+  "label.visit-duration": "Keskimääräinen vierailuaika",
   "label.back": "Takaisin",
   "label.before": "Before",
   "label.bounce-rate": "Välitön poistuminen",
diff --git a/src/lang/fo-FO.json b/src/lang/fo-FO.json
index 6b9e42d0c..d13d40ec6 100644
--- a/src/lang/fo-FO.json
+++ b/src/lang/fo-FO.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Miðal vitjurnartíð ",
+  "label.visit-duration": "Miðal vitjurnartíð ",
   "label.back": "Aftur",
   "label.before": "Before",
   "label.bounce-rate": "Bounce prosenttal",
diff --git a/src/lang/fr-FR.json b/src/lang/fr-FR.json
index bd71a85f8..b52ae875a 100644
--- a/src/lang/fr-FR.json
+++ b/src/lang/fr-FR.json
@@ -13,7 +13,7 @@
   "label.all-time": "Toutes les données",
   "label.analytics": "Analytics",
   "label.average": "Moyenne",
-  "label.average-visit-time": "Temps de visite moyen",
+  "label.visit-duration": "Temps de visite moyen",
   "label.back": "Retour",
   "label.before": "Avant",
   "label.bounce-rate": "Taux de rebond",
diff --git a/src/lang/ga-ES.json b/src/lang/ga-ES.json
index fa9a1cc5a..cdf139324 100644
--- a/src/lang/ga-ES.json
+++ b/src/lang/ga-ES.json
@@ -13,7 +13,7 @@
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Tempo medio de visita",
+  "label.visit-duration": "Tempo medio de visita",
   "label.back": "Atrás",
   "label.before": "Before",
   "label.bounce-rate": "Proporción de rebote",
diff --git a/src/lang/he-IL.json b/src/lang/he-IL.json
index 3c422a76f..f513c807e 100644
--- a/src/lang/he-IL.json
+++ b/src/lang/he-IL.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "זמן ביקור ממוצע",
+  "label.visit-duration": "זמן ביקור ממוצע",
   "label.back": "חזרה",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/hi-IN.json b/src/lang/hi-IN.json
index 791111c83..2e2e79f71 100644
--- a/src/lang/hi-IN.json
+++ b/src/lang/hi-IN.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "औसत दृश्य समय",
+  "label.visit-duration": "औसत दृश्य समय",
   "label.back": "पीछे",
   "label.before": "Before",
   "label.bounce-rate": "उछाल दर",
diff --git a/src/lang/hr-HR.json b/src/lang/hr-HR.json
index 7ba496c75..ea4884903 100644
--- a/src/lang/hr-HR.json
+++ b/src/lang/hr-HR.json
@@ -13,7 +13,7 @@
   "label.all-time": "Svo vrijeme",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Average visit time",
+  "label.visit-duration": "Average visit time",
   "label.back": "Natrag ",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/hu-HU.json b/src/lang/hu-HU.json
index b73b36a77..74f0ce6fe 100644
--- a/src/lang/hu-HU.json
+++ b/src/lang/hu-HU.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Átlagos látogatási idő",
+  "label.visit-duration": "Átlagos látogatási idő",
   "label.back": "Vissza",
   "label.before": "Before",
   "label.bounce-rate": "Visszafordulási arány",
diff --git a/src/lang/id-ID.json b/src/lang/id-ID.json
index 64d17d9a9..faf773157 100644
--- a/src/lang/id-ID.json
+++ b/src/lang/id-ID.json
@@ -13,7 +13,7 @@
   "label.all-time": "Semua waktu",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Waktu kunjungan rata-rata",
+  "label.visit-duration": "Waktu kunjungan rata-rata",
   "label.back": "Kembali",
   "label.before": "Before",
   "label.bounce-rate": "Rasio pentalan",
diff --git a/src/lang/it-IT.json b/src/lang/it-IT.json
index 9425d5e69..084f86eef 100644
--- a/src/lang/it-IT.json
+++ b/src/lang/it-IT.json
@@ -13,7 +13,7 @@
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Tempo medio di visita",
+  "label.visit-duration": "Tempo medio di visita",
   "label.back": "Indietro",
   "label.before": "Before",
   "label.bounce-rate": "Frequenza di rimbalzo",
diff --git a/src/lang/ja-JP.json b/src/lang/ja-JP.json
index b646bd51e..5c8747ba9 100644
--- a/src/lang/ja-JP.json
+++ b/src/lang/ja-JP.json
@@ -13,7 +13,7 @@
   "label.all-time": "すべての時間帯",
   "label.analytics": "アナリティクス",
   "label.average": "平均",
-  "label.average-visit-time": "平均滞在時間",
+  "label.visit-duration": "平均滞在時間",
   "label.back": "戻る",
   "label.before": "直前",
   "label.bounce-rate": "直帰率",
diff --git a/src/lang/km-KH.json b/src/lang/km-KH.json
index 17ddd9145..6bb9f4763 100644
--- a/src/lang/km-KH.json
+++ b/src/lang/km-KH.json
@@ -13,7 +13,7 @@
   "label.all-time": "គ្រប់ពេល",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "មើលជាមធ្យម",
+  "label.visit-duration": "មើលជាមធ្យម",
   "label.back": "ថយក្រោយ",
   "label.before": "Before",
   "label.bounce-rate": "ចំនួនវិលត្រឡប់",
diff --git a/src/lang/ko-KR.json b/src/lang/ko-KR.json
index f64f03aa6..1bfb9ca06 100644
--- a/src/lang/ko-KR.json
+++ b/src/lang/ko-KR.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "평균 방문 시간",
+  "label.visit-duration": "평균 방문 시간",
   "label.back": "뒤로",
   "label.before": "Before",
   "label.bounce-rate": "이탈률",
diff --git a/src/lang/lt-LT.json b/src/lang/lt-LT.json
index 0d8f53e99..2fc0f5e13 100644
--- a/src/lang/lt-LT.json
+++ b/src/lang/lt-LT.json
@@ -13,7 +13,7 @@
   "label.all-time": "Visas laikotarpis",
   "label.analytics": "Analytics",
   "label.average": "Vidurkis",
-  "label.average-visit-time": "Vidutinė vizito trukmė",
+  "label.visit-duration": "Vidutinė vizito trukmė",
   "label.back": "Atgal",
   "label.before": "Prieš",
   "label.bounce-rate": "Atmetimo rodiklis",
diff --git a/src/lang/mn-MN.json b/src/lang/mn-MN.json
index bd001adde..340f4bcd7 100644
--- a/src/lang/mn-MN.json
+++ b/src/lang/mn-MN.json
@@ -13,7 +13,7 @@
   "label.all-time": "Бүх цаг үеийн",
   "label.analytics": "Analytics",
   "label.average": "Дундаж",
-  "label.average-visit-time": "Зочилсон дундаж хугацаа",
+  "label.visit-duration": "Зочилсон дундаж хугацаа",
   "label.back": "Буцах",
   "label.before": "Өмнө",
   "label.bounce-rate": "Нэг хуудас үзээд гарсан",
diff --git a/src/lang/ms-MY.json b/src/lang/ms-MY.json
index 6fef99314..73124486c 100644
--- a/src/lang/ms-MY.json
+++ b/src/lang/ms-MY.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Purata tempoh masa lawatan",
+  "label.visit-duration": "Purata tempoh masa lawatan",
   "label.back": "Kembali",
   "label.before": "Before",
   "label.bounce-rate": "Kadar lantunan",
diff --git a/src/lang/my-MM.json b/src/lang/my-MM.json
index bf8e0217e..8883c71e4 100644
--- a/src/lang/my-MM.json
+++ b/src/lang/my-MM.json
@@ -13,7 +13,7 @@
   "label.all-time": "အချိန်အစမှအခုထိ",
   "label.analytics": "အန်နလစ်တစ်",
   "label.average": "ပျမ်းမျှ",
-  "label.average-visit-time": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်",
+  "label.visit-duration": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်",
   "label.back": "နောက်သို့",
   "label.before": "မတိုင်မီ",
   "label.bounce-rate": "Bounce နှုန်း",
diff --git a/src/lang/nb-NO.json b/src/lang/nb-NO.json
index a0fe6575f..491597236 100644
--- a/src/lang/nb-NO.json
+++ b/src/lang/nb-NO.json
@@ -13,7 +13,7 @@
   "label.all-time": "Noensinne",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Gjennomsnittlig besøkstid",
+  "label.visit-duration": "Gjennomsnittlig besøkstid",
   "label.back": "Tilbake",
   "label.before": "Before",
   "label.bounce-rate": "Avvisningsfrekvens",
diff --git a/src/lang/nl-NL.json b/src/lang/nl-NL.json
index 4335345a7..1d11ed5a5 100644
--- a/src/lang/nl-NL.json
+++ b/src/lang/nl-NL.json
@@ -13,7 +13,7 @@
   "label.all-time": "Onbeperkt",
   "label.analytics": "Analytics",
   "label.average": "Gemiddelde",
-  "label.average-visit-time": "Gemiddelde bezoektijd",
+  "label.visit-duration": "Gemiddelde bezoektijd",
   "label.back": "Terug",
   "label.before": "Voor",
   "label.bounce-rate": "Bouncepercentage",
diff --git a/src/lang/pl-PL.json b/src/lang/pl-PL.json
index 7eae7baaf..bd649cfd2 100644
--- a/src/lang/pl-PL.json
+++ b/src/lang/pl-PL.json
@@ -13,7 +13,7 @@
   "label.all-time": "Cały czas",
   "label.analytics": "Analityka",
   "label.average": "Średnia",
-  "label.average-visit-time": "Średni czas wizyty",
+  "label.visit-duration": "Średni czas wizyty",
   "label.back": "Powrót",
   "label.before": "Przed",
   "label.bounce-rate": "Współczynnik odrzuceń",
diff --git a/src/lang/pt-BR.json b/src/lang/pt-BR.json
index 5c0425ea6..b84deb2d3 100644
--- a/src/lang/pt-BR.json
+++ b/src/lang/pt-BR.json
@@ -13,7 +13,7 @@
   "label.all-time": "Todos os períodos",
   "label.analytics": "Análise",
   "label.average": "Média",
-  "label.average-visit-time": "Tempo médio de visita",
+  "label.visit-duration": "Tempo médio de visita",
   "label.back": "Voltar",
   "label.before": "Antes",
   "label.bounce-rate": "Taxa de rejeição",
@@ -78,31 +78,31 @@
   "label.greater-than": "Maior que",
   "label.greater-than-equals": "Maior ou igual a",
   "label.insights": "Insights",
-    "label.insights-description": "Explore seus dados em mais detalhes usando filtros",
+  "label.insights-description": "Explore seus dados em mais detalhes usando filtros",
   "label.is": "É igual a",
   "label.is-not": "Não é igual a",
   "label.is-not-set": "Não definido",
   "label.is-set": "Definido",
   "label.join": "Participar",
   "label.join-team": "Participar da equipe",
-  "label.language": "Idioma", 
+  "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Notebook",
   "label.last-days": "Últimos {x} dias",
   "label.last-hours": "Últimas {x} horas",
   "label.last-months": "Últimos {x} meses",
-  "label.leave": "Sair", 
+  "label.leave": "Sair",
   "label.leave-team": "Sair da equipe",
   "label.less-than": "Menor que",
   "label.less-than-equals": "Menor ou igual a",
-  "label.login": "Entrar", 
+  "label.login": "Entrar",
   "label.logout": "Sair",
   "label.manage": "Gerenciar",
   "label.max": "Máximo",
   "label.member": "Membro",
   "label.members": "Membros",
   "label.min": "Mínimo",
-  "label.mobile": "Celular", 
+  "label.mobile": "Celular",
   "label.more": "Mais",
   "label.my-account": "Minha conta",
   "label.my-websites": "Meus sites",
@@ -114,15 +114,15 @@
   "label.os": "Sistema operacional",
   "label.overview": "Visão geral",
   "label.owner": "Proprietário",
-  "label.page-of": "Página {current} de {total}", 
+  "label.page-of": "Página {current} de {total}",
   "label.page-views": "Visualizações de página",
-  "label.pageTitle": "Título", 
+  "label.pageTitle": "Título",
   "label.pages": "Páginas",
-  "label.password": "Senha", 
-  "label.powered-by": "Desenvolvido por {name}", 
+  "label.password": "Senha",
+  "label.powered-by": "Desenvolvido por {name}",
   "label.profile": "Perfil",
   "label.queries": "Consultas",
-  "label.query": "Consulta", 
+  "label.query": "Consulta",
   "label.query-parameters": "Parâmetros da consulta",
   "label.realtime": "Tempo real",
   "label.referrer": "Referência",
@@ -132,17 +132,17 @@
   "label.region": "Estado",
   "label.regions": "Estados",
   "label.remove": "Remover",
-  "label.remove-member": "Remover membro", 
+  "label.remove-member": "Remover membro",
   "label.reports": "Relatórios",
   "label.required": "Obrigatório",
   "label.reset": "Redefinir",
   "label.reset-website": "Redefinir dados",
   "label.retention": "Retenção",
   "label.retention-description": "Avalie a fidelidade dos seus usuários medindo a frequência com que eles retornam.",
-  "label.role": "Função", 
-  "label.run-query": "Executar consulta", 
+  "label.role": "Função",
+  "label.run-query": "Executar consulta",
   "label.save": "Salvar",
-  "label.screens": "Tamanhos de tela", 
+  "label.screens": "Tamanhos de tela",
   "label.search": "Pesquisar",
   "label.select": "Selecionar",
   "label.select-date": "Selecionar data",
@@ -150,7 +150,7 @@
   "label.select-website": "Selecionar site",
   "label.sessions": "Sessões",
   "label.settings": "Configurações",
-  "label.share-url": "Link para compartilhar", 
+  "label.share-url": "Link para compartilhar",
   "label.single-day": "Apenas um dia",
   "label.steps": "Etapas",
   "label.sum": "Soma",
@@ -158,56 +158,56 @@
   "label.team": "Equipe",
   "label.team-id": "ID da equipe",
   "label.team-member": "Membro da equipe",
-  "label.team-name": "Nome da equipe", 
-  "label.team-owner": "Proprietário da equipe", 
-  "label.team-view-only": "Apenas visualização da equipe", 
+  "label.team-name": "Nome da equipe",
+  "label.team-owner": "Proprietário da equipe",
+  "label.team-view-only": "Apenas visualização da equipe",
   "label.team-websites": "Sites da equipe",
   "label.teams": "Equipes",
   "label.theme": "Tema",
-  "label.this-month": "Este mês", 
-  "label.this-week": "Esta semana", 
+  "label.this-month": "Este mês",
+  "label.this-week": "Esta semana",
   "label.this-year": "Este ano",
   "label.timezone": "Fuso horário",
   "label.title": "Título",
-  "label.today": "Hoje",    
+  "label.today": "Hoje",
   "label.toggle-charts": "Alternar gráficos",
   "label.total": "Total",
-  "label.total-records": "Total de registros", 
+  "label.total-records": "Total de registros",
   "label.tracking-code": "Código de rastreamento",
   "label.transfer": "Transferir",
   "label.transfer-website": "Transferir site",
   "label.true": "Sim",
-  "label.type": "Tipo", 
-  "label.unique": "Únicos", 
+  "label.type": "Tipo",
+  "label.unique": "Únicos",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconhecido",
   "label.untitled": "Sem título",
-  "label.update": "Atualizar", 
-  "label.url": "URL", 
+  "label.update": "Atualizar",
+  "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuário",
-  "label.username": "Nome de usuário", 
+  "label.username": "Nome de usuário",
   "label.users": "Usuários",
   "label.utm": "UTM",
   "label.utm-description": "Acompanhe suas campanhas de publicidade através de parâmetros UTM.",
-  "label.value": "Valor", 
+  "label.value": "Valor",
   "label.view": "Visualizar",
   "label.view-details": "Ver mais",
   "label.view-only": "Somente visualização",
   "label.views": "Visualizações",
-  "label.views-per-visit": "Visualizações por visita", 
-  "label.visitors": "Visitantes", 
+  "label.views-per-visit": "Visualizações por visita",
+  "label.visitors": "Visitantes",
   "label.visits": "Visitas",
   "label.website": "Site",
-  "label.website-id": "ID do site", 
+  "label.website-id": "ID do site",
   "label.websites": "Sites",
   "label.window": "Janela",
-  "label.yesterday": "Ontem", 
-  "message.action-confirmation": "Digite {confirmation} na caixa abaixo para confirmar.", 
+  "label.yesterday": "Ontem",
+  "message.action-confirmation": "Digite {confirmation} na caixa abaixo para confirmar.",
   "message.active-users": " Atualmente {x} usuários ativos",
   "message.confirm-delete": "Tem certeza de que deseja excluir {target}?",
-  "message.confirm-leave": "Tem certeza de que deseja sair de {target}?", 
-  "message.confirm-remove": "Tem certeza que deseja remover {target}?", 
+  "message.confirm-leave": "Tem certeza de que deseja sair de {target}?",
+  "message.confirm-remove": "Tem certeza que deseja remover {target}?",
   "message.confirm-reset": "Tem certeza que deseja redefinir os dados de {target}?",
   "message.delete-team-warning": "Excluir a equipe também excluirá todos os sites da equipe.",
   "message.delete-website-warning": "Todos os dados relacionados serão excluídos.",
@@ -243,4 +243,4 @@
   "message.viewed-page": "Página visualizada",
   "message.visitor-log": "Visitante de {country} usando o navegador {browser} em um {device} com sistema operacional {os}.",
   "message.visitors-dropped-off": "Visitantes abandonados"
-  }
+}
diff --git a/src/lang/pt-PT.json b/src/lang/pt-PT.json
index 36966c983..02504a9a4 100644
--- a/src/lang/pt-PT.json
+++ b/src/lang/pt-PT.json
@@ -13,7 +13,7 @@
   "label.all-time": "Todo o tempo",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Tempo médio de visita",
+  "label.visit-duration": "Tempo médio de visita",
   "label.back": "Voltar",
   "label.before": "Before",
   "label.bounce-rate": "Taxa de rejeição",
diff --git a/src/lang/ro-RO.json b/src/lang/ro-RO.json
index 296f51b77..e6c9cad45 100644
--- a/src/lang/ro-RO.json
+++ b/src/lang/ro-RO.json
@@ -13,7 +13,7 @@
   "label.all-time": "Pentru tot timpul",
   "label.analytics": "Analytics",
   "label.average": "Mediu",
-  "label.average-visit-time": "Timp mediu de vizitare",
+  "label.visit-duration": "Timp mediu de vizitare",
   "label.back": "Înapoi",
   "label.before": "Înainte",
   "label.bounce-rate": "Rata de respingere",
diff --git a/src/lang/ru-RU.json b/src/lang/ru-RU.json
index 3d1d8e74f..25065a4fc 100644
--- a/src/lang/ru-RU.json
+++ b/src/lang/ru-RU.json
@@ -13,7 +13,7 @@
   "label.all-time": "Все время",
   "label.analytics": "Аналитика",
   "label.average": "Average",
-  "label.average-visit-time": "Среднее время посещения",
+  "label.visit-duration": "Среднее время посещения",
   "label.back": "Назад",
   "label.before": "Before",
   "label.bounce-rate": "Отказы",
diff --git a/src/lang/si-LK.json b/src/lang/si-LK.json
index 6f672ab5c..087efa561 100644
--- a/src/lang/si-LK.json
+++ b/src/lang/si-LK.json
@@ -13,7 +13,7 @@
   "label.all-time": "හැම වෙලාවෙම",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Average visit time",
+  "label.visit-duration": "Average visit time",
   "label.back": "ආපසු",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/sk-SK.json b/src/lang/sk-SK.json
index d978281a1..10a547d12 100644
--- a/src/lang/sk-SK.json
+++ b/src/lang/sk-SK.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Priemerný čas návštevy",
+  "label.visit-duration": "Priemerný čas návštevy",
   "label.back": "Späť",
   "label.before": "Before",
   "label.bounce-rate": "Okamžité opustenie",
diff --git a/src/lang/sl-SI.json b/src/lang/sl-SI.json
index 9ba94e3bc..0b3761f5b 100644
--- a/src/lang/sl-SI.json
+++ b/src/lang/sl-SI.json
@@ -13,7 +13,7 @@
   "label.all-time": "Ves čas",
   "label.analytics": "Analitika",
   "label.average": "Povprečno",
-  "label.average-visit-time": "Povprečni čas obiska",
+  "label.visit-duration": "Povprečni čas obiska",
   "label.back": "Nazaj",
   "label.before": "Pred",
   "label.bounce-rate": "Odbojna stopnja",
diff --git a/src/lang/sv-SE.json b/src/lang/sv-SE.json
index 87e909423..8a72e3d68 100644
--- a/src/lang/sv-SE.json
+++ b/src/lang/sv-SE.json
@@ -13,7 +13,7 @@
   "label.all-time": "Sedan början",
   "label.analytics": "Webbplats Analys",
   "label.average": "Genomsnitt",
-  "label.average-visit-time": "Genomsnittlig besökstid",
+  "label.visit-duration": "Genomsnittlig besökstid",
   "label.back": "Tillbaka",
   "label.before": "Före",
   "label.bounce-rate": "Avvisningsfrekvens",
diff --git a/src/lang/ta-IN.json b/src/lang/ta-IN.json
index 4e40c4902..770bc2721 100644
--- a/src/lang/ta-IN.json
+++ b/src/lang/ta-IN.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "சராசரி வருகை நேரம்",
+  "label.visit-duration": "சராசரி வருகை நேரம்",
   "label.back": "பின்னால்",
   "label.before": "Before",
   "label.bounce-rate": "துள்ளல் விகிதம்",
diff --git a/src/lang/th-TH.json b/src/lang/th-TH.json
index a5ebeefb7..6f8b4a327 100644
--- a/src/lang/th-TH.json
+++ b/src/lang/th-TH.json
@@ -13,7 +13,7 @@
   "label.all-time": "ทุกช่วงเวลา",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "ระยะเวลาเข้าชมเฉลี่ย",
+  "label.visit-duration": "ระยะเวลาเข้าชมเฉลี่ย",
   "label.back": "ย้อนกลับ",
   "label.before": "Before",
   "label.bounce-rate": "อัตราตีกลับ",
diff --git a/src/lang/tr-TR.json b/src/lang/tr-TR.json
index d4e46b634..285910524 100644
--- a/src/lang/tr-TR.json
+++ b/src/lang/tr-TR.json
@@ -13,7 +13,7 @@
   "label.all-time": "Tüm zamanlar",
   "label.analytics": "Analitik",
   "label.average": "Ortalama",
-  "label.average-visit-time": "Ortalama ziyaret süresi",
+  "label.visit-duration": "Ortalama ziyaret süresi",
   "label.back": "Geri",
   "label.before": "Önce",
   "label.bounce-rate": "Tek sayfa ziyaret oranı",
diff --git a/src/lang/uk-UA.json b/src/lang/uk-UA.json
index 1042f3b46..3d393d300 100644
--- a/src/lang/uk-UA.json
+++ b/src/lang/uk-UA.json
@@ -13,7 +13,7 @@
   "label.all-time": "Весь час",
   "label.analytics": "Аналітика",
   "label.average": "Середнє",
-  "label.average-visit-time": "Середній час візиту",
+  "label.visit-duration": "Середній час візиту",
   "label.back": "Назад",
   "label.before": "Раніше",
   "label.bounce-rate": "Показник відмов",
diff --git a/src/lang/ur-PK.json b/src/lang/ur-PK.json
index 862971f53..b7f018c73 100644
--- a/src/lang/ur-PK.json
+++ b/src/lang/ur-PK.json
@@ -13,7 +13,7 @@
   "label.all-time": "تمام وقت",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "وزٹ کا اوسط وقت",
+  "label.visit-duration": "وزٹ کا اوسط وقت",
   "label.back": "پیچھے",
   "label.before": "Before",
   "label.bounce-rate": "اچھال کی شرح",
diff --git a/src/lang/vi-VN.json b/src/lang/vi-VN.json
index e9a47c616..dbf3bf95a 100644
--- a/src/lang/vi-VN.json
+++ b/src/lang/vi-VN.json
@@ -13,7 +13,7 @@
   "label.all-time": "Toàn thời gian",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Thời gian truy cập trung bình",
+  "label.visit-duration": "Thời gian truy cập trung bình",
   "label.back": "Quay về",
   "label.before": "Before",
   "label.bounce-rate": "Tỷ lệ thoát trang",
diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index 4bf90fd16..62ab1aeae 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -13,7 +13,7 @@
   "label.all-time": "所有时间段",
   "label.analytics": "分析",
   "label.average": "平均",
-  "label.average-visit-time": "平均访问时间",
+  "label.visit-duration": "平均访问时间",
   "label.back": "返回",
   "label.before": "之前",
   "label.bounce-rate": "跳出率",
diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
index 01c08b8b6..edad4a5c2 100644
--- a/src/lang/zh-TW.json
+++ b/src/lang/zh-TW.json
@@ -13,7 +13,7 @@
   "label.all-time": "所有時間",
   "label.analytics": "分析",
   "label.average": "平均",
-  "label.average-visit-time": "平均造訪時間",
+  "label.visit-duration": "平均造訪時間",
   "label.back": "返回",
   "label.before": "之前",
   "label.bounce-rate": "跳出率",
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 356348417..e5cb40c02 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -119,10 +119,7 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
   };
 }
 
-async function rawQuery<T = unknown>(
-  query: string,
-  params: Record<string, unknown> = {},
-): Promise<T> {
+async function rawQuery(query: string, params: Record<string, unknown> = {}): Promise<unknown[]> {
   if (process.env.LOG_QUERY) {
     log('QUERY:\n', query);
     log('PARAMETERS:\n', params);
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 697a48367..745673e96 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -20,6 +20,7 @@ export const DEFAULT_DATE_RANGE = '24hour';
 export const DEFAULT_WEBSITE_LIMIT = 10;
 export const DEFAULT_RESET_DATE = '2000-01-01';
 export const DEFAULT_PAGE_SIZE = 10;
+export const DEFAULT_DATE_COMPARE = 'prev';
 
 export const REALTIME_RANGE = 30;
 export const REALTIME_INTERVAL = 5000;
@@ -115,6 +116,7 @@ export const REPORT_TYPES = {
   insights: 'insights',
   retention: 'retention',
   utm: 'utm',
+  journey: 'journey',
 } as const;
 
 export const REPORT_PARAMETERS = {
diff --git a/src/lib/date.ts b/src/lib/date.ts
index 861bbde2f..de76f7f32 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -326,3 +326,13 @@ export function getDateLength(startDate: Date, endDate: Date, unit: string | num
   const { diff } = DATE_FUNCTIONS[unit];
   return diff(endDate, startDate) + 1;
 }
+
+export function getCompareDate(compare: string, startDate: Date, endDate: Date) {
+  if (compare === 'yoy') {
+    return { startDate: subYears(startDate, 1), endDate: subYears(endDate, 1) };
+  }
+
+  const diff = differenceInMinutes(endDate, startDate);
+
+  return { startDate: subMinutes(startDate, diff), endDate: subMinutes(endDate, diff) };
+}
diff --git a/src/pages/api/reports/[reportId].ts b/src/pages/api/reports/[reportId].ts
index be2db82f5..3a7c4c536 100644
--- a/src/pages/api/reports/[reportId].ts
+++ b/src/pages/api/reports/[reportId].ts
@@ -27,7 +27,7 @@ const schema: YupRequest = {
     websiteId: yup.string().uuid().required(),
     type: yup
       .string()
-      .matches(/funnel|insights|retention|utm|goals/i)
+      .matches(/funnel|insights|retention|utm|goals|journey/i)
       .required(),
     name: yup.string().max(200).required(),
     description: yup.string().max(500),
diff --git a/src/pages/api/reports/goals.ts b/src/pages/api/reports/goals.ts
index bb7667751..f775dc3c8 100644
--- a/src/pages/api/reports/goals.ts
+++ b/src/pages/api/reports/goals.ts
@@ -28,9 +28,23 @@ const schema = {
       .array()
       .of(
         yup.object().shape({
-          type: yup.string().required(),
+          type: yup
+            .string()
+            .matches(/url|event|event-data/i)
+            .required(),
           value: yup.string().required(),
           goal: yup.number().required(),
+          operator: yup
+            .string()
+            .matches(/count|sum|average/i)
+            .when('type', {
+              is: 'eventData',
+              then: yup.string().required(),
+            }),
+          property: yup.string().when('type', {
+            is: 'eventData',
+            then: yup.string().required(),
+          }),
         }),
       )
       .min(1)
diff --git a/src/pages/api/reports/journey.ts b/src/pages/api/reports/journey.ts
new file mode 100644
index 000000000..84246f05b
--- /dev/null
+++ b/src/pages/api/reports/journey.ts
@@ -0,0 +1,54 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getJourney } from 'queries';
+import * as yup from 'yup';
+
+export interface RetentionRequestBody {
+  websiteId: string;
+  dateRange: { startDate: string; endDate: string };
+}
+
+const schema = {
+  POST: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    dateRange: yup
+      .object()
+      .shape({
+        startDate: yup.date().required(),
+        endDate: yup.date().required(),
+      })
+      .required(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<any, RetentionRequestBody>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'POST') {
+    const {
+      websiteId,
+      dateRange: { startDate, endDate },
+    } = req.body;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getJourney(websiteId, {
+      startDate: new Date(startDate),
+      endDate: new Date(endDate),
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
index fe4a2abd2..11ba10d74 100644
--- a/src/pages/api/send.ts
+++ b/src/pages/api/send.ts
@@ -87,7 +87,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
 
   if (req.method === 'POST') {
     if (!process.env.DISABLE_BOT_CHECK && isbot(req.headers['user-agent'])) {
-      return ok(res);
+      return ok(res, { beep: 'boop' });
     }
 
     await useValidate(schema, req, res);
diff --git a/src/pages/api/websites/[websiteId]/pageviews.ts b/src/pages/api/websites/[websiteId]/pageviews.ts
index 196710643..5b6315158 100644
--- a/src/pages/api/websites/[websiteId]/pageviews.ts
+++ b/src/pages/api/websites/[websiteId]/pageviews.ts
@@ -1,3 +1,4 @@
+import * as yup from 'yup';
 import { canViewWebsite } from 'lib/auth';
 import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { getRequestFilters, getRequestDateRange } from 'lib/request';
@@ -5,6 +6,8 @@ import { NextApiRequestQueryBody, WebsitePageviews } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getPageviewStats, getSessionStats } from 'queries';
+import { TimezoneTest, UnitTypeTest } from 'lib/yup';
+import { getCompareDate } from 'lib/date';
 
 export interface WebsitePageviewRequestQuery {
   websiteId: string;
@@ -21,10 +24,9 @@ export interface WebsitePageviewRequestQuery {
   country?: string;
   region: string;
   city?: string;
+  compare?: string;
 }
 
-import { TimezoneTest, UnitTypeTest } from 'lib/yup';
-import * as yup from 'yup';
 const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
@@ -41,6 +43,7 @@ const schema = {
     country: yup.string(),
     region: yup.string(),
     city: yup.string(),
+    compare: yup.string(),
   }),
 };
 
@@ -52,7 +55,7 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId, timezone } = req.query;
+  const { websiteId, timezone, compare } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -74,6 +77,40 @@ export default async (
       getSessionStats(websiteId, filters),
     ]);
 
+    if (compare) {
+      const { startDate: compareStartDate, endDate: compareEndDate } = getCompareDate(
+        compare,
+        startDate,
+        endDate,
+      );
+
+      const [comparePageviews, compareSessions] = await Promise.all([
+        getPageviewStats(websiteId, {
+          ...filters,
+          startDate: compareStartDate,
+          endDate: compareEndDate,
+        }),
+        getSessionStats(websiteId, {
+          ...filters,
+          startDate: compareStartDate,
+          endDate: compareEndDate,
+        }),
+      ]);
+
+      return ok(res, {
+        pageviews,
+        sessions,
+        startDate,
+        endDate,
+        compare: {
+          pageviews: comparePageviews,
+          sessions: compareSessions,
+          startDate: compareStartDate,
+          endDate: compareEndDate,
+        },
+      });
+    }
+
     return ok(res, { pageviews, sessions });
   }
 
diff --git a/src/pages/api/websites/[websiteId]/stats.ts b/src/pages/api/websites/[websiteId]/stats.ts
index 81a6d8354..1ce616e7a 100644
--- a/src/pages/api/websites/[websiteId]/stats.ts
+++ b/src/pages/api/websites/[websiteId]/stats.ts
@@ -1,4 +1,4 @@
-import { subMinutes, differenceInMinutes } from 'date-fns';
+import * as yup from 'yup';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { canViewWebsite } from 'lib/auth';
@@ -6,6 +6,7 @@ import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody, WebsiteStats } from 'lib/types';
 import { getRequestFilters, getRequestDateRange } from 'lib/request';
 import { getWebsiteStats } from 'queries';
+import { getCompareDate } from 'lib/date';
 
 export interface WebsiteStatsRequestQuery {
   websiteId: string;
@@ -22,9 +23,9 @@ export interface WebsiteStatsRequestQuery {
   country?: string;
   region?: string;
   city?: string;
+  compare?: string;
 }
 
-import * as yup from 'yup';
 const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
@@ -41,6 +42,7 @@ const schema = {
     country: yup.string(),
     region: yup.string(),
     city: yup.string(),
+    compare: yup.string(),
   }),
 };
 
@@ -52,7 +54,7 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId } = req.query;
+  const { websiteId, compare } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -60,9 +62,11 @@ export default async (
     }
 
     const { startDate, endDate } = await getRequestDateRange(req);
-    const diff = differenceInMinutes(endDate, startDate);
-    const prevStartDate = subMinutes(startDate, diff);
-    const prevEndDate = subMinutes(endDate, diff);
+    const { startDate: compareStartDate, endDate: compareEndDate } = getCompareDate(
+      compare,
+      startDate,
+      endDate,
+    );
 
     const filters = getRequestFilters(req);
 
@@ -70,14 +74,14 @@ export default async (
 
     const prevPeriod = await getWebsiteStats(websiteId, {
       ...filters,
-      startDate: prevStartDate,
-      endDate: prevEndDate,
+      startDate: compareStartDate,
+      endDate: compareEndDate,
     });
 
     const stats = Object.keys(metrics[0]).reduce((obj, key) => {
       obj[key] = {
         value: Number(metrics[0][key]) || 0,
-        change: Number(metrics[0][key]) - Number(prevPeriod[0][key]) || 0,
+        prev: Number(prevPeriod[0][key]) || 0,
       };
       return obj;
     }, {});
diff --git a/src/queries/analytics/eventData/getEventDataEvents.ts b/src/queries/analytics/eventData/getEventDataEvents.ts
index 76ad3fce8..e5647debd 100644
--- a/src/queries/analytics/eventData/getEventDataEvents.ts
+++ b/src/queries/analytics/eventData/getEventDataEvents.ts
@@ -85,8 +85,8 @@ async function clickhouseQuery(
       limit 500
       `,
       params,
-    ).then(a => {
-      return Object.values(a).map(a => {
+    ).then(result => {
+      return Object.values(result).map((a: any) => {
         return {
           eventName: a.eventName,
           fieldName: a.fieldName,
@@ -113,8 +113,8 @@ async function clickhouseQuery(
     limit 500
     `,
     params,
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
       return {
         eventName: a.eventName,
         fieldName: a.fieldName,
diff --git a/src/queries/analytics/eventData/getEventDataFields.ts b/src/queries/analytics/eventData/getEventDataFields.ts
index 6ec3b35a8..f669ad39f 100644
--- a/src/queries/analytics/eventData/getEventDataFields.ts
+++ b/src/queries/analytics/eventData/getEventDataFields.ts
@@ -62,8 +62,8 @@ async function clickhouseQuery(
     limit 500
     `,
     params,
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
       return {
         fieldName: a.fieldName,
         dataType: Number(a.dataType),
diff --git a/src/queries/analytics/eventData/getEventDataStats.ts b/src/queries/analytics/eventData/getEventDataStats.ts
index 978f561bc..09bef107c 100644
--- a/src/queries/analytics/eventData/getEventDataStats.ts
+++ b/src/queries/analytics/eventData/getEventDataStats.ts
@@ -68,8 +68,8 @@ async function clickhouseQuery(
       ) as t
     `,
     params,
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
       return {
         events: Number(a.events),
         fields: Number(a.fields),
diff --git a/src/queries/analytics/eventData/getEventDataUsage.ts b/src/queries/analytics/eventData/getEventDataUsage.ts
index 7866a6008..2a19f33e6 100644
--- a/src/queries/analytics/eventData/getEventDataUsage.ts
+++ b/src/queries/analytics/eventData/getEventDataUsage.ts
@@ -30,8 +30,8 @@ function clickhouseQuery(
       startDate,
       endDate,
     },
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
       return { websiteId: a.websiteId, count: Number(a.count) };
     });
   });
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index bc006a2eb..6257e166c 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -92,13 +92,13 @@ async function clickhouseQuery(
     `,
     params,
   ).then(result => {
-    return Object.values(result).map(n => {
+    return Object.values(result).map((a: any) => {
       return {
-        pageviews: Number(n.pageviews),
-        visitors: Number(n.visitors),
-        visits: Number(n.visits),
-        bounces: Number(n.bounces),
-        totaltime: Number(n.totaltime),
+        pageviews: Number(a.pageviews),
+        visitors: Number(a.visitors),
+        visits: Number(a.visits),
+        bounces: Number(a.bounces),
+        totaltime: Number(a.totaltime),
       };
     });
   });
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index eaf4ae324..5f609c126 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -33,8 +33,8 @@ async function relationalQuery(
 
   let excludeDomain = '';
   if (column === 'referrer_domain') {
-    excludeDomain =
-      'and (website_event.referrer_domain != {{websiteDomain}} or website_event.referrer_domain is null)';
+    excludeDomain = `and website_event.referrer_domain != {{websiteDomain}}
+      and website_event.referrer_domain is not null`;
   }
 
   return rawQuery(
@@ -72,7 +72,7 @@ async function clickhouseQuery(
 
   let excludeDomain = '';
   if (column === 'referrer_domain') {
-    excludeDomain = 'and referrer_domain != {websiteDomain:String}';
+    excludeDomain = `and referrer_domain != {websiteDomain:String} and referrer_domain != ''`;
   }
 
   return rawQuery(
@@ -90,8 +90,8 @@ async function clickhouseQuery(
     offset ${offset}
     `,
     params,
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then((result: any) => {
+    return Object.values(result).map((a: any) => {
       return { x: a.x, y: Number(a.y) };
     });
   });
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index 3f29c75fe..a37a15662 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -67,7 +67,7 @@ async function clickhouseQuery(
     `,
     params,
   ).then(result => {
-    return Object.values(result).map(a => {
+    return Object.values(result).map((a: any) => {
       return { x: a.x, y: Number(a.y) };
     });
   });
diff --git a/src/queries/analytics/reports/getGoals.ts b/src/queries/analytics/reports/getGoals.ts
index d26998d03..83b0ce971 100644
--- a/src/queries/analytics/reports/getGoals.ts
+++ b/src/queries/analytics/reports/getGoals.ts
@@ -8,7 +8,7 @@ export async function getGoals(
     criteria: {
       startDate: Date;
       endDate: Date;
-      goals: { type: string; value: string; goal: number }[];
+      goals: { type: string; value: string; goal: number; operator?: string }[];
     },
   ]
 ) {
@@ -23,117 +23,30 @@ async function relationalQuery(
   criteria: {
     startDate: Date;
     endDate: Date;
-    goals: { type: string; value: string; goal: number }[];
+    goals: { type: string; value: string; goal: number; operator?: string }[];
   },
 ): Promise<any> {
   const { startDate, endDate, goals } = criteria;
   const { rawQuery } = prisma;
 
-  const hasUrl = goals.some(a => a.type === 'url');
-  const hasEvent = goals.some(a => a.type === 'event');
-
-  function getParameters(goals: { type: string; value: string; goal: number }[]) {
-    const urls = goals
-      .filter(a => a.type === 'url')
-      .reduce((acc, cv, i) => {
-        acc[`${cv.type}${i}`] = cv.value;
-        return acc;
-      }, {});
-
-    const events = goals
-      .filter(a => a.type === 'event')
-      .reduce((acc, cv, i) => {
-        acc[`${cv.type}${i}`] = cv.value;
-        return acc;
-      }, {});
-
-    return {
-      urls: { ...urls, startDate, endDate, websiteId },
-      events: { ...events, startDate, endDate, websiteId },
-    };
-  }
-
-  function getColumns(goals: { type: string; value: string; goal: number }[]) {
-    const urls = goals
-      .filter(a => a.type === 'url')
-      .map((a, i) => `COUNT(CASE WHEN url_path =  {{url${i}}} THEN 1 END) AS URL${i}`)
-      .join('\n');
-    const events = goals
-      .filter(a => a.type === 'event')
-      .map((a, i) => `COUNT(CASE WHEN url_path =  {{event${i}}} THEN 1 END) AS EVENT${i}`)
-      .join('\n');
-
-    return { urls, events };
-  }
-
-  function getWhere(goals: { type: string; value: string; goal: number }[]) {
-    const urls = goals
-      .filter(a => a.type === 'url')
-      .map((a, i) => `{{url${i}}}`)
-      .join(',');
-    const events = goals
-      .filter(a => a.type === 'event')
-      .map((a, i) => `{{event${i}}}`)
-      .join(',');
-
-    return { urls: `and url_path in (${urls})`, events: `and event_name in (${events})` };
-  }
-
-  const parameters = getParameters(goals);
-  const columns = getColumns(goals);
-  const where = getWhere(goals);
-
-  const urls = hasUrl
-    ? await rawQuery(
-        `
-  select
-    ${columns.urls}
-  from website_event
-    where websiteId = {{websiteId::uuid}}
-      ${where.urls}
-      and created_at between {{startDate}} and {{endDate}}
-  `,
-        parameters.urls,
-      )
-    : [];
-
-  const events = hasEvent
-    ? await rawQuery(
-        `
-  select
-    ${columns.events}
-  from website_event
-    where websiteId = {{websiteId::uuid}}
-      ${where.events}
-      and created_at between {{startDate}} and {{endDate}}
-  `,
-        parameters.events,
-      )
-    : [];
-
-  return [...urls, ...events];
-}
-
-async function clickhouseQuery(
-  websiteId: string,
-  criteria: {
-    startDate: Date;
-    endDate: Date;
-    goals: { type: string; value: string; goal: number }[];
-  },
-): Promise<{ type: string; value: string; goal: number; result: number }[]> {
-  const { startDate, endDate, goals } = criteria;
-  const { rawQuery } = clickhouse;
-
   const urls = goals.filter(a => a.type === 'url');
   const events = goals.filter(a => a.type === 'event');
+  const eventData = goals.filter(a => a.type === 'event-data');
 
   const hasUrl = urls.length > 0;
   const hasEvent = events.length > 0;
+  const hasEventData = eventData.length > 0;
 
   function getParameters(
     urls: { type: string; value: string; goal: number }[],
     events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
   ) {
     const urlParam = urls.reduce((acc, cv, i) => {
       acc[`${cv.type}${i}`] = cv.value;
@@ -145,41 +58,258 @@ async function clickhouseQuery(
       return acc;
     }, {});
 
+    const eventDataParam = eventData.reduce((acc, cv, i) => {
+      acc[`eventData${i}`] = cv.value;
+      acc[`property${i}`] = cv.property;
+      return acc;
+    }, {});
+
     return {
       urls: { ...urlParam, startDate, endDate, websiteId },
       events: { ...eventParam, startDate, endDate, websiteId },
+      eventData: { ...eventDataParam, startDate, endDate, websiteId },
     };
   }
 
   function getColumns(
     urls: { type: string; value: string; goal: number }[],
     events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
+  ) {
+    const urlColumns = urls
+      .map((a, i) => `COUNT(CASE WHEN url_path = {{url${i}}} THEN 1 END) AS URL${i},`)
+      .join('\n')
+      .slice(0, -1);
+    const eventColumns = events
+      .map((a, i) => `COUNT(CASE WHEN event_name = {{event${i}}} THEN 1 END) AS EVENT${i},`)
+      .join('\n')
+      .slice(0, -1);
+    const eventDataColumns = eventData
+      .map(
+        (a, i) =>
+          `${
+            a.operator === 'average' ? 'avg' : a.operator
+          }(CASE WHEN event_name = {{eventData${i}}} AND data_key = {{property${i}}} THEN ${
+            a.operator === 'count' ? '1' : 'number_value'
+          } END) AS EVENT_DATA${i},`,
+      )
+      .join('\n')
+      .slice(0, -1);
+
+    return { urls: urlColumns, events: eventColumns, eventData: eventDataColumns };
+  }
+
+  function getWhere(
+    urls: { type: string; value: string; goal: number }[],
+    events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
+  ) {
+    const urlWhere = urls.map((a, i) => `{{url${i}}}`).join(',');
+    const eventWhere = events.map((a, i) => `{{event${i}}}`).join(',');
+    const eventDataNameWhere = eventData.map((a, i) => `{{eventData${i}}}`).join(',');
+    const eventDataKeyWhere = eventData.map((a, i) => `{{property${i}}}`).join(',');
+
+    return {
+      urls: `and url_path in (${urlWhere})`,
+      events: `and event_name in (${eventWhere})`,
+      eventData: `and event_name in (${eventDataNameWhere}) and data_key in (${eventDataKeyWhere})`,
+    };
+  }
+
+  const parameters = getParameters(urls, events, eventData);
+  const columns = getColumns(urls, events, eventData);
+  const where = getWhere(urls, events, eventData);
+
+  const urlResults = hasUrl
+    ? await rawQuery(
+        `
+  select
+    ${columns.urls}
+  from website_event
+    where website_id = {{websiteId::uuid}}
+      ${where.urls}
+      and created_at between {{startDate}} and {{endDate}}
+  `,
+        parameters.urls,
+      ).then(a => {
+        const results = a[0];
+
+        return Object.keys(results).map((key, i) => ({
+          ...urls[i],
+          goal: Number(urls[i].goal),
+          result: Number(results[key]),
+        }));
+      })
+    : [];
+
+  const eventResults = hasEvent
+    ? await rawQuery(
+        `
+  select
+    ${columns.events}
+  from website_event
+    where website_id = {{websiteId::uuid}}
+      ${where.events}
+      and created_at between {{startDate}} and {{endDate}}
+  `,
+        parameters.events,
+      ).then(a => {
+        const results = a[0];
+
+        return Object.keys(results).map((key, i) => {
+          return { ...events[i], goal: Number(events[i].goal), result: Number(results[key]) };
+        });
+      })
+    : [];
+
+  const eventDataResults = hasEventData
+    ? await rawQuery(
+        `
+  select
+    ${columns.eventData}
+  from website_event w
+      join event_data d
+      on d.website_event_id = w.event_id
+    where w.website_id = {{websiteId::uuid}}
+      ${where.eventData}
+      and w.created_at between {{startDate}} and {{endDate}}
+  `,
+        parameters.eventData,
+      ).then(a => {
+        const results = a[0];
+
+        return Object.keys(results).map((key, i) => {
+          return { ...eventData[i], goal: Number(eventData[i].goal), result: Number(results[key]) };
+        });
+      })
+    : [];
+
+  return [...urlResults, ...eventResults, ...eventDataResults];
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  criteria: {
+    startDate: Date;
+    endDate: Date;
+    goals: { type: string; value: string; goal: number; operator?: string; property?: string }[];
+  },
+): Promise<{ type: string; value: string; goal: number; result: number }[]> {
+  const { startDate, endDate, goals } = criteria;
+  const { rawQuery } = clickhouse;
+
+  const urls = goals.filter(a => a.type === 'url');
+  const events = goals.filter(a => a.type === 'event');
+  const eventData = goals.filter(a => a.type === 'event-data');
+
+  const hasUrl = urls.length > 0;
+  const hasEvent = events.length > 0;
+  const hasEventData = eventData.length > 0;
+
+  function getParameters(
+    urls: { type: string; value: string; goal: number }[],
+    events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
+  ) {
+    const urlParam = urls.reduce((acc, cv, i) => {
+      acc[`${cv.type}${i}`] = cv.value;
+      return acc;
+    }, {});
+
+    const eventParam = events.reduce((acc, cv, i) => {
+      acc[`${cv.type}${i}`] = cv.value;
+      return acc;
+    }, {});
+
+    const eventDataParam = eventData.reduce((acc, cv, i) => {
+      acc[`eventData${i}`] = cv.value;
+      acc[`property${i}`] = cv.property;
+      return acc;
+    }, {});
+
+    return {
+      urls: { ...urlParam, startDate, endDate, websiteId },
+      events: { ...eventParam, startDate, endDate, websiteId },
+      eventData: { ...eventDataParam, startDate, endDate, websiteId },
+    };
+  }
+
+  function getColumns(
+    urls: { type: string; value: string; goal: number }[],
+    events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
   ) {
     const urlColumns = urls
       .map((a, i) => `countIf(url_path = {url${i}:String}) AS URL${i},`)
       .join('\n')
       .slice(0, -1);
     const eventColumns = events
-      .map((a, i) => `countIf(event_name = {event${i}:String}) AS EVENT${i}`)
+      .map((a, i) => `countIf(event_name = {event${i}:String}) AS EVENT${i},`)
+      .join('\n')
+      .slice(0, -1);
+    const eventDataColumns = eventData
+      .map(
+        (a, i) =>
+          `${a.operator === 'average' ? 'avg' : a.operator}If(${
+            a.operator !== 'count' ? 'number_value, ' : ''
+          }event_name = {eventData${i}:String} AND data_key = {property${i}:String}) AS EVENT_DATA${i},`,
+      )
       .join('\n')
       .slice(0, -1);
 
-    return { url: urlColumns, events: eventColumns };
+    return { url: urlColumns, events: eventColumns, eventData: eventDataColumns };
   }
 
   function getWhere(
     urls: { type: string; value: string; goal: number }[],
     events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
   ) {
     const urlWhere = urls.map((a, i) => `{url${i}:String}`).join(',');
     const eventWhere = events.map((a, i) => `{event${i}:String}`).join(',');
+    const eventDataNameWhere = eventData.map((a, i) => `{eventData${i}:String}`).join(',');
+    const eventDataKeyWhere = eventData.map((a, i) => `{property${i}:String}`).join(',');
 
-    return { urls: `and url_path in (${urlWhere})`, events: `and event_name in (${eventWhere})` };
+    return {
+      urls: `and url_path in (${urlWhere})`,
+      events: `and event_name in (${eventWhere})`,
+      eventData: `and event_name in (${eventDataNameWhere}) and data_key in (${eventDataKeyWhere})`,
+    };
   }
 
-  const parameters = getParameters(urls, events);
-  const columns = getColumns(urls, events);
-  const where = getWhere(urls, events);
+  const parameters = getParameters(urls, events, eventData);
+  const columns = getColumns(urls, events, eventData);
+  const where = getWhere(urls, events, eventData);
 
   const urlResults = hasUrl
     ? await rawQuery<any>(
@@ -221,5 +351,25 @@ async function clickhouseQuery(
       })
     : [];
 
-  return [...urlResults, ...eventResults];
+  const eventDataResults = hasEventData
+    ? await rawQuery<any>(
+        `
+  select
+    ${columns.eventData}
+  from event_data
+  where website_id = {websiteId:UUID}
+    ${where.eventData}
+    and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+  `,
+        parameters.eventData,
+      ).then(a => {
+        const results = a[0];
+
+        return Object.keys(results).map((key, i) => {
+          return { ...eventData[i], goal: Number(eventData[i].goal), result: Number(results[key]) };
+        });
+      })
+    : [];
+
+  return [...urlResults, ...eventResults, ...eventDataResults];
 }
diff --git a/src/queries/analytics/reports/getJourney.ts b/src/queries/analytics/reports/getJourney.ts
new file mode 100644
index 000000000..088f7ee88
--- /dev/null
+++ b/src/queries/analytics/reports/getJourney.ts
@@ -0,0 +1,148 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+
+export async function getJourney(
+  ...args: [
+    websiteId: string,
+    filters: {
+      startDate: Date;
+      endDate: Date;
+    },
+  ]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  filters: {
+    startDate: Date;
+    endDate: Date;
+  },
+): Promise<
+  {
+    e1: string;
+    e2: string;
+    e3: string;
+    e4: string;
+    e5: string;
+    count: string;
+  }[]
+> {
+  const { startDate, endDate } = filters;
+  const { rawQuery } = prisma;
+
+  return rawQuery(
+    `
+    WITH events AS (
+      select distinct
+          session_id,
+          referrer_path,
+          COALESCE(event_name, url_path) event,
+          ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY created_at) AS event_number
+      from website_event 
+      where website_id = {{websiteId::uuid}}
+          and created_at between {{startDate}} and {{endDate}}
+          and referrer_path != url_path), 
+    sequences as (
+      SELECT s.e1,
+            s.e2,
+            s.e3,
+            s.e4,
+            s.e5,
+            count(*) count
+      FROM (
+          SELECT session_id,
+              MAX(CASE WHEN event_number = 1 THEN event ELSE NULL END) AS e1,
+              MAX(CASE WHEN event_number = 2 THEN event ELSE NULL END) AS e2,
+              MAX(CASE WHEN event_number = 3 THEN event ELSE NULL END) AS e3,
+              MAX(CASE WHEN event_number = 4 THEN event ELSE NULL END) AS e4,
+              MAX(CASE WHEN event_number = 5 THEN event ELSE NULL END) AS e5
+          FROM events
+          group by session_id) s
+      group by s.e1,
+            s.e2,
+            s.e3,
+            s.e4,
+            s.e5)
+    select *
+    from sequences
+    order by count desc
+    limit 100
+    `,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: {
+    startDate: Date;
+    endDate: Date;
+  },
+): Promise<
+  {
+    e1: string;
+    e2: string;
+    e3: string;
+    e4: string;
+    e5: string;
+    count: string;
+  }[]
+> {
+  const { startDate, endDate } = filters;
+  const { rawQuery } = clickhouse;
+
+  return rawQuery(
+    `
+    WITH events AS (
+      select distinct
+          session_id,
+          referrer_path,
+          coalesce(nullIf(event_name, ''), url_path) event,
+          row_number() OVER (PARTITION BY session_id ORDER BY created_at) AS event_number
+      from umami.website_event 
+      where website_id = {websiteId:UUID}
+          and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+          and referrer_path != url_path),
+    sequences as (
+        SELECT s.e1,
+            s.e2,
+            s.e3,
+            s.e4,
+            s.e5,
+            count(*) count
+        FROM (
+          SELECT session_id,
+              max(CASE WHEN event_number = 1 THEN event ELSE NULL END) AS e1,
+              max(CASE WHEN event_number = 2 THEN event ELSE NULL END) AS e2,
+              max(CASE WHEN event_number = 3 THEN event ELSE NULL END) AS e3,
+              max(CASE WHEN event_number = 4 THEN event ELSE NULL END) AS e4,
+              max(CASE WHEN event_number = 5 THEN event ELSE NULL END) AS e5
+          FROM events
+          group by session_id) s
+        group by s.e1,
+            s.e2,
+            s.e3,
+            s.e4,
+            s.e5)
+    select *
+    from sequences
+    order by count desc
+    limit 100
+    `,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  );
+}
diff --git a/src/queries/index.ts b/src/queries/index.ts
index f0002881b..8cef080aa 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -12,6 +12,7 @@ export * from './analytics/eventData/getEventDataStats';
 export * from './analytics/eventData/getEventDataUsage';
 export * from './analytics/events/saveEvent';
 export * from './analytics/reports/getFunnel';
+export * from './analytics/reports/getJourney';
 export * from './analytics/reports/getRetention';
 export * from './analytics/reports/getInsights';
 export * from './analytics/reports/getUTM';
diff --git a/src/store/websites.ts b/src/store/websites.ts
index a9f6b44da..1c5c21fc8 100644
--- a/src/store/websites.ts
+++ b/src/store/websites.ts
@@ -18,4 +18,18 @@ export function setWebsiteDateRange(websiteId: string, dateRange: DateRange) {
   );
 }
 
+export function setWebsiteDateCompare(websiteId: string, dateCompare: string) {
+  store.setState(
+    produce(state => {
+      if (!state[websiteId]) {
+        state[websiteId] = {};
+      }
+
+      state[websiteId].dateCompare = dateCompare;
+
+      return state;
+    }),
+  );
+}
+
 export default store;
diff --git a/yarn.lock b/yarn.lock
index 80b8e4542..4ba6684d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1206,17 +1206,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@clickhouse/client-common@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.0.1.tgz#c7dde5eafaad8189649373ecc23354c7a32847b3"
-  integrity sha512-3L6e0foP6VOktScoi6XWMjJyOpKCWgLUYgPVxP2c7gm6Kotq+iRmmmXtXTSg7B7uozcLZycTtPfIw2d80SYsYw==
+"@clickhouse/client-common@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.0.2.tgz#0fe0a4b33101c08d85c1279e4d74b2a92d42d996"
+  integrity sha512-5oI2URFsXlzoysv5lAxoTUAnAHjXnaJ+1Jz3HUARR06Hkbr1sN0pGxfGwgjEd8E/lI4+UNdNEZicG2rlFnWSaA==
 
-"@clickhouse/client@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.0.1.tgz#364db28d9ef9beaf19104f962c2b06090cb10468"
-  integrity sha512-fluUNnE2R7COJ6rn6DorYfi4D+AQn3t2qeBtEq37bQV3pD4EbKrBfKAwJ13e1lmMWdQ2B9bJUTMqGsRIDdWhJw==
+"@clickhouse/client@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.0.2.tgz#7d9675e697ce697f1e6777f4c66ca6d3384e7325"
+  integrity sha512-PaK0GLjIrlCpXevrp9gliOrurna6MjMMFBgZhDh6Zup8IuJCjQru4LkNsWUl3hJ2nua6+Ygag14iB8ILbeaIjg==
   dependencies:
-    "@clickhouse/client-common" "1.0.1"
+    "@clickhouse/client-common" "1.0.2"
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -2089,51 +2089,51 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@prisma/client@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.13.0.tgz#b9f1d0983d714e982675201d8222a9ecb4bdad4a"
-  integrity sha512-uYdfpPncbZ/syJyiYBwGZS8Gt1PTNoErNYMuqHDa2r30rNSFtgTA/LXsSk55R7pdRTMi5pHkeP9B14K6nHmwkg==
+"@prisma/client@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.14.0.tgz#dadca5bb1137ddcebb454bbdaf89423823d3363f"
+  integrity sha512-akMSuyvLKeoU4LeyBAUdThP/uhVP3GuLygFE3MlYzaCb3/J8SfsYBE5PkaFuLuVpLyA6sFoW+16z/aPhNAESqg==
 
-"@prisma/debug@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.13.0.tgz#d88b0f6fafa0c216e20e284ed9fc30f1cbe45786"
-  integrity sha512-699iqlEvzyCj9ETrXhs8o8wQc/eVW+FigSsHpiskSFydhjVuwTJEfj/nIYqTaWFYuxiWQRfm3r01meuW97SZaQ==
+"@prisma/debug@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.14.0.tgz#1227c705893c38284f7c63d72441480ebaa12605"
+  integrity sha512-iq56qBZuFfX3fCxoxT8gBX33lQzomBU0qIUaEj1RebsKVz1ob/BVH1XSBwwwvRVtZEV1b7Fxx2eVu34Ge/mg3w==
 
-"@prisma/engines-version@5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b":
-  version "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b.tgz#a72a4fb83ba1fd01ad45f795aa55168f60d34723"
-  integrity sha512-AyUuhahTINGn8auyqYdmxsN+qn0mw3eg+uhkp8zwknXYIqoT3bChG4RqNY/nfDkPvzWAPBa9mrDyBeOnWSgO6A==
+"@prisma/engines-version@5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48":
+  version "5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48.tgz#019c3c75a5c3276e580685fe48cdbfd181176858"
+  integrity sha512-ip6pNkRo1UxWv+6toxNcYvItNYaqQjXdFNGJ+Nuk2eYtRoEdoF13wxo7/jsClJFFenMPVNVqXQDV0oveXnR1cA==
 
-"@prisma/engines@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.13.0.tgz#8994ebf7b4e35aee7746a8465ec22738379bcab6"
-  integrity sha512-hIFLm4H1boj6CBZx55P4xKby9jgDTeDG0Jj3iXtwaaHmlD5JmiDkZhh8+DYWkTGchu+rRF36AVROLnk0oaqhHw==
+"@prisma/engines@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.14.0.tgz#2ee91dd2220a726c27c906fbea788bbb3efdac6e"
+  integrity sha512-lgxkKZ6IEygVcw6IZZUlPIfLQ9hjSYAtHjZ5r64sCLDgVzsPFCi2XBBJgzPMkOQ5RHzUD4E/dVdpn9+ez8tk1A==
   dependencies:
-    "@prisma/debug" "5.13.0"
-    "@prisma/engines-version" "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b"
-    "@prisma/fetch-engine" "5.13.0"
-    "@prisma/get-platform" "5.13.0"
+    "@prisma/debug" "5.14.0"
+    "@prisma/engines-version" "5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48"
+    "@prisma/fetch-engine" "5.14.0"
+    "@prisma/get-platform" "5.14.0"
 
 "@prisma/extension-read-replicas@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@prisma/extension-read-replicas/-/extension-read-replicas-0.3.0.tgz#2842a7c928f957c1dd58a6256104797596d43426"
   integrity sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==
 
-"@prisma/fetch-engine@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.13.0.tgz#9b6945c7b38bb59e840f8905b20ea7a3d059ca55"
-  integrity sha512-Yh4W+t6YKyqgcSEB3odBXt7QyVSm0OQlBSldQF2SNXtmOgMX8D7PF/fvH6E6qBCpjB/yeJLy/FfwfFijoHI6sA==
+"@prisma/fetch-engine@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.14.0.tgz#45297c118d4ec3fea55129886edd5a429da1f6da"
+  integrity sha512-VrheA9y9DMURK5vu8OJoOgQpxOhas3qF0IBHJ8G/0X44k82kc8E0w98HCn2nhnbOOMwbWsJWXfLC2/F8n5u0gQ==
   dependencies:
-    "@prisma/debug" "5.13.0"
-    "@prisma/engines-version" "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b"
-    "@prisma/get-platform" "5.13.0"
+    "@prisma/debug" "5.14.0"
+    "@prisma/engines-version" "5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48"
+    "@prisma/get-platform" "5.14.0"
 
-"@prisma/get-platform@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.13.0.tgz#99ef909a52b9d79b64d72d2d3d8210c4892b6572"
-  integrity sha512-B/WrQwYTzwr7qCLifQzYOmQhZcFmIFhR81xC45gweInSUn2hTEbfKUPd2keAog+y5WI5xLAFNJ3wkXplvSVkSw==
+"@prisma/get-platform@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.14.0.tgz#69112d3dde61905f59a65ed818f153e153ca40f0"
+  integrity sha512-/yAyBvcEjRv41ynZrhdrPtHgk47xLRRq/o5eWGcUpBJ1YrUZTYB8EoPiopnP7iQrMATK8stXQdPOoVlrzuTQZw==
   dependencies:
-    "@prisma/debug" "5.13.0"
+    "@prisma/debug" "5.14.0"
 
 "@react-spring/animated@~9.7.3":
   version "9.7.3"
@@ -8659,12 +8659,12 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-prisma@5.13.0:
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.13.0.tgz#1f06e20ccfb6038ad68869e6eacd3b346f9d0851"
-  integrity sha512-kGtcJaElNRAdAGsCNykFSZ7dBKpL14Cbs+VaQ8cECxQlRPDjBlMHNFYeYt0SKovAVy2Y65JXQwB3A5+zIQwnTg==
+prisma@5.14.0:
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.14.0.tgz#ffc4696a43b044b636c3303b7aa98c13c2ade4dd"
+  integrity sha512-gCNZco7y5XtjrnQYeDJTiVZmT/ncqCr5RY1/Cf8X2wgLRmyh9ayPAGBNziI4qEE4S6SxCH5omQLVo9lmURaJ/Q==
   dependencies:
-    "@prisma/engines" "5.13.0"
+    "@prisma/engines" "5.14.0"
 
 process@^0.11.10:
   version "0.11.10"
@@ -9590,16 +9590,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9672,14 +9663,7 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10440,7 +10424,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10458,15 +10442,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"