diff --git a/TODO b/TODO
index 034eec3..6b588ce 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,6 @@
 
 
+- Refactor UI Data analyst
+
 - Reactivity on project delete (update dropdown) + test guest
-
-- Event funnel / metadata analyzer / user flow
-- Refactor UI Data analyst
-- Remove Top Events from web analytics and move to custom events (with raw data access)
-- Fix email on plan upgrade and resub
\ No newline at end of file
+- Event funnel / metadata analyzer / user flow
\ No newline at end of file
diff --git a/dashboard/assets/scss/main.scss b/dashboard/assets/scss/main.scss
index 9f74870..a3abc31 100644
--- a/dashboard/assets/scss/main.scss
+++ b/dashboard/assets/scss/main.scss
@@ -19,6 +19,18 @@
   src: url("../fonts/GeistVF.ttf");
 }
 
+
+.actionable-visits-color-checkbox {
+  color: #5655d7;
+}
+
+.actionable-sessions-color-checkbox {
+  color: #4abde8;
+}
+.actionable-events-color-checkbox {
+  color: #fbbf24;
+}
+
 .geist {
   font-family: "Geist";
 }
@@ -72,10 +84,14 @@
 
 
 .hide-scrollbars {
-  -ms-overflow-style: none;  /* IE and Edge */
-  scrollbar-width: none;  /* Firefox */
+  -ms-overflow-style: none;
+  /* IE and Edge */
+  scrollbar-width: none;
+
+  /* Firefox */
   &::-webkit-scrollbar {
-    display: none; /* Chrome, Safari and Opera */
+    display: none;
+    /* Chrome, Safari and Opera */
   }
 }
 
diff --git a/dashboard/components/BarCard/Base.vue b/dashboard/components/BarCard/Base.vue
index c09f158..3e0d657 100644
--- a/dashboard/components/BarCard/Base.vue
+++ b/dashboard/components/BarCard/Base.vue
@@ -68,11 +68,14 @@ function openExternalLink(link: string) {
                 </div>
             </div>
             <div v-if="rawButton" class="hidden lg:flex">
-                <div @click="$emit('showRawData')"
-                    class="cursor-pointer flex gap-1 items-center justify-center font-semibold poppins rounded-lg text-[#5680f8] hover:text-[#5681f8ce]">
-                    <div> Raw data </div>
-                    <div class="flex items-center"> <i class="fas fa-arrow-up-right"></i> </div>
-                </div>
+
+                <LyxUiButton @click="$emit('showRawData')" type="primary" class="h-fit">
+                    <div class="flex gap-1 items-center justify-center ">
+                        <div> Show raw data </div>
+                        <div class="flex items-center"> <i class="fas fa-arrow-up-right"></i> </div>
+                    </div>
+                </LyxUiButton>
+
 
             </div>
         </div>
diff --git a/dashboard/components/BarCard/Websites.vue b/dashboard/components/BarCard/Websites.vue
index 9f7f603..fcb240d 100644
--- a/dashboard/components/BarCard/Websites.vue
+++ b/dashboard/components/BarCard/Websites.vue
@@ -48,9 +48,9 @@ function goToView() {
     <div class="flex flex-col gap-2 h-full">
         <BarCardBase :hideShowMore="true" @showGeneral="showGeneral()" @showRawData="goToView()"
             @dataReload="currentData.refresh()" @showDetails="showDetails" :data="currentData.data.value || []"
-            :loading="currentData.pending.value" :label="isPagesView ? 'Top pages' : 'Top Websites'"
-            :sub-label="isPagesView ? 'Page' : 'Website'"
-            :desc="isPagesView ? 'Most visited pages' : 'Most visited website in this project'"
+            :loading="currentData.pending.value" :label="isPagesView ? 'Top pages' : 'Top Domains'"
+            :sub-label="isPagesView ? 'Page' : 'Domains'"
+            :desc="isPagesView ? 'Most visited pages' : 'Most visited domains in this project'"
             :interactive="!isPagesView" :rawButton="!isLiveDemo()" :isDetailView="isPagesView">
         </BarCardBase>
     </div>
diff --git a/dashboard/components/dashboard/ActionableChart.vue b/dashboard/components/dashboard/ActionableChart.vue
index 2b9337e..b0ded34 100644
--- a/dashboard/components/dashboard/ActionableChart.vue
+++ b/dashboard/components/dashboard/ActionableChart.vue
@@ -136,7 +136,7 @@ const selectLabels: { label: string, value: Slice }[] = [
     { label: 'Month', value: 'month' },
 ];
 
-const selectedSlice = computed(()=>selectLabels[selectedLabelIndex.value].value);
+const selectedSlice = computed(() => selectLabels[selectedLabelIndex.value].value);
 
 const selectedLabelIndex = ref<number>(1);
 const allDatesFull = ref<string[]>([]);
@@ -233,7 +233,13 @@ function onLegendChange(dataset: any, index: number, checked: any) {
     dataset.hidden = !checked;
 }
 
-const legendColors = ['#5655d7', '#4abde8', '#fbbf24']
+const legendColors = ref<string[]>(['#5655d7', '#4abde8', '#fbbf24'])
+const legendClasses = ref<string[]>([
+    'actionable-visits-color-checkbox',
+    'actionable-sessions-color-checkbox',
+    'actionable-events-color-checkbox'
+])
+
 
 const inLiveDemo = isLiveDemo();
 
@@ -256,9 +262,11 @@ const inLiveDemo = isLiveDemo();
             </LyxUiButton>
             <div class="flex gap-6">
                 <div v-for="(dataset, index) of chartData.datasets" class="flex gap-2 items-center text-[.9rem]">
+
                     <UCheckbox :ui="{
-                        color: `text-[${legendColors[index]}]`
+                        color: legendClasses[index]
                     }" :model-value="true" @change="onLegendChange(dataset, index, $event)"></UCheckbox>
+
                     <label class="mt-[2px]"> {{ dataset.label }} </label>
                 </div>
             </div>
diff --git a/dashboard/components/dashboard/CountCard.vue b/dashboard/components/dashboard/CountCard.vue
index 82eafa2..d395edd 100644
--- a/dashboard/components/dashboard/CountCard.vue
+++ b/dashboard/components/dashboard/CountCard.vue
@@ -30,18 +30,20 @@ const uTooltipText = computed(() => {
     <LyxUiCard class="flex !p-0 flex-col overflow-hidden relative max-h-[12rem] aspect-[2/1] w-full">
         <div v-if="ready" class="flex p-4 items-start">
             <div class="flex items-center mt-2 mr-4">
-                <i :style="`color: ${props.color}`" :class="icon" class="text-[1.6rem] 2xl:text-[2rem]"></i>
+                <i :style="`color: ${props.color}`" :class="icon" class="text-[1.3rem] 2xl:text-[1.5rem]"></i>
             </div>
             <div class="flex flex-col grow">
-                <div class="flex items-end gap-2">
-                    <div class="brockmann text-text-dirty text-[1.6rem] 2xl:text-[1.9rem]"> {{ value }} </div>
-                    <div class="poppins text-text-sub text-[.7rem] 2xl:text-[.85rem] mb-2"> {{ avg }} </div>
+                <div class="flex items-center gap-2">
+                    <div class="brockmann text-text-dirty text-[1.2rem] 2xl:text-[1.4rem]"> 
+                        {{ value }}
+                     </div>
+                    <div class="poppins text-text-sub text-[.65rem] 2xl:text-[.8rem]"> {{ avg }} </div>
                 </div>
-                <div class="poppins text-text-sub text-[.9rem] 2xl:text-base"> {{ text }} </div>
+                <div class="poppins text-text-sub text-[.9rem] 2xl:text-[1rem]"> {{ text }} </div>
             </div>
             <div v-if="trend" class="flex flex-col items-center gap-1">
                 <UTooltip :text="uTooltipText">
-                    <div class="flex items-center gap-3 rounded-xl px-2 py-1"
+                    <div class="flex items-center gap-3 rounded-md px-2 py-1"
                         :style="`background-color: ${props.color}33`">
                         <i :class="trend > 0 ? 'fa-arrow-trend-up' : 'fa-arrow-trend-down'"
                             class="far text-[.9rem] 2xl:text-[1rem]" :style="`color: ${props.color}`"></i>
diff --git a/dashboard/pages/events.vue b/dashboard/pages/events.vue
index 2341ac6..6ca43a8 100644
--- a/dashboard/pages/events.vue
+++ b/dashboard/pages/events.vue
@@ -35,6 +35,11 @@ const eventsData = await useFetch(`/api/data/count`, { headers: useComputedHeade
             </div>
         </LyxUiCard>
 
+
+        <div>
+            <BarCardEvents :key="refreshKey"></BarCardEvents>
+        </div>
+
         <div class="flex gap-6 flex-col xl:flex-row h-full">
 
             <CardTitled :key="refreshKey" class="p-4 flex-[4] w-full h-full" title="Events"
@@ -48,7 +53,7 @@ const eventsData = await useFetch(`/api/data/count`, { headers: useComputedHeade
                     <EventsStackedBarChart :slice="(selectLabelsEvents[eventsStackedSelectIndex].value as any)">
                     </EventsStackedBarChart>
                 </div>
-            </CardTitled> 
+            </CardTitled>
 
             <CardTitled :key="refreshKey" class="p-4 flex-[2] w-full h-full" title="Top events"
                 sub="Displays key events.">
diff --git a/dashboard/pages/index.vue b/dashboard/pages/index.vue
index 01d06a2..217458f 100644
--- a/dashboard/pages/index.vue
+++ b/dashboard/pages/index.vue
@@ -41,40 +41,30 @@ const showDashboard = computed(() => project.value && firstInteraction.data.valu
                     <div class="flex-1">
                         <BarCardWebsites :key="refreshKey"></BarCardWebsites>
                     </div>
-                    <div class="flex-1">
-                        <BarCardEvents :key="refreshKey"></BarCardEvents>
-                    </div>
-                </div>
-            </div>
-
-            <div class="flex w-full justify-center mt-6 px-6">
-                <div class="flex w-full gap-6 flex-col xl:flex-row">
                     <div class="flex-1">
                         <BarCardReferrers :key="refreshKey"></BarCardReferrers>
                     </div>
-                    <div class="flex-1">
-                        <BarCardBrowsers :key="refreshKey"></BarCardBrowsers>
-                    </div>
                 </div>
             </div>
 
             <div class="flex w-full justify-center mt-6 px-6">
                 <div class="flex w-full gap-6 flex-col xl:flex-row">
+                    <div class="flex-1">
+                        <BarCardBrowsers :key="refreshKey"></BarCardBrowsers>              
+                    </div>
                     <div class="flex-1">
                         <BarCardOperatingSystems :key="refreshKey"></BarCardOperatingSystems>
                     </div>
-                    <div class="flex-1">
-                        <BarCardGeolocations :key="refreshKey"></BarCardGeolocations>
-                    </div>
                 </div>
             </div>
 
             <div class="flex w-full justify-center mt-6 px-6">
                 <div class="flex w-full gap-6 flex-col xl:flex-row">
                     <div class="flex-1">
-                        <BarCardDevices :key="refreshKey"></BarCardDevices>
+                        <BarCardGeolocations :key="refreshKey"></BarCardGeolocations>
                     </div>
                     <div class="flex-1">
+                        <BarCardDevices :key="refreshKey"></BarCardDevices>
                     </div>
                 </div>
             </div>
diff --git a/dashboard/server/api/pay/webhook.post.ts b/dashboard/server/api/pay/webhook.post.ts
index d9e1c28..3727a3a 100644
--- a/dashboard/server/api/pay/webhook.post.ts
+++ b/dashboard/server/api/pay/webhook.post.ts
@@ -114,6 +114,8 @@ async function onPaymentSuccess(event: Event.InvoicePaidEvent) {
 
         const subscription_id = event.data.object.subscription as string;
 
+        const isNewSubscription = project.subscription_id != subscription_id;
+
         const allSubscriptions = await StripeService.getAllSubscriptions(customer_id);
         if (!allSubscriptions) return;
 
@@ -140,7 +142,7 @@ async function onPaymentSuccess(event: Event.InvoicePaidEvent) {
 
         setTimeout(() => {
             if (PLAN.ID == 0) return;
-                EmailService.sendPurchaseEmail(user.email, project.name);
+            if (isNewSubscription) EmailService.sendPurchaseEmail(user.email, project.name);
         }, 1);