diff --git a/components/dashboard/ContentStats.tsx b/components/dashboard/ContentStats.tsx
index 952b2f6..f1119f7 100644
--- a/components/dashboard/ContentStats.tsx
+++ b/components/dashboard/ContentStats.tsx
@@ -3,6 +3,7 @@
 import { useState } from 'react'
 import { formatNumber } from '@/lib/utils/format'
 import { TopPage } from '@/lib/api/stats'
+import { Modal } from '@ciphera-net/ui'
 
 interface ContentStatsProps {
   topPages: TopPage[]
@@ -12,80 +13,116 @@ interface ContentStatsProps {
 
 type Tab = 'top_pages' | 'entry_pages' | 'exit_pages'
 
+const LIMIT = 7
+
 export default function ContentStats({ topPages, entryPages, exitPages }: ContentStatsProps) {
   const [activeTab, setActiveTab] = useState<Tab>('top_pages')
+  const [isModalOpen, setIsModalOpen] = useState(false)
 
-  const renderContent = () => {
-    let data: TopPage[] = []
-    
-    if (activeTab === 'top_pages') {
-      data = topPages
-    } else if (activeTab === 'entry_pages') {
-      data = entryPages
-    } else if (activeTab === 'exit_pages') {
-      data = exitPages
+  const getData = () => {
+    switch (activeTab) {
+      case 'top_pages':
+        return topPages
+      case 'entry_pages':
+        return entryPages
+      case 'exit_pages':
+        return exitPages
+      default:
+        return []
     }
+  }
 
-    if (!data || data.length === 0) {
-      return <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
+  const data = getData()
+  const hasData = data && data.length > 0
+  const displayedData = hasData ? data.slice(0, LIMIT) : []
+  const emptySlots = Math.max(0, LIMIT - displayedData.length)
+  const showViewAll = hasData && data.length > LIMIT
+
+  const getTabLabel = (tab: Tab) => {
+    switch (tab) {
+      case 'top_pages': return 'Top Pages'
+      case 'entry_pages': return 'Entry'
+      case 'exit_pages': return 'Exit'
     }
-
-    return (
-      <div className="space-y-3">
-        {data.map((page, index) => (
-          <div key={index} className="flex items-center justify-between">
-            <div className="flex-1 truncate text-neutral-900 dark:text-white">
-              {page.path}
-            </div>
-            <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
-              {formatNumber(page.pageviews)}
-            </div>
-          </div>
-        ))}
-      </div>
-    )
   }
 
   return (
-    <div className="bg-white dark:bg-neutral-900 border border-neutral-200 dark:border-neutral-800 rounded-xl p-6 h-full">
-      <div className="flex items-center justify-between mb-6">
-        <h3 className="text-lg font-semibold text-neutral-900 dark:text-white">
-          Content
-        </h3>
-        <div className="flex p-1 bg-neutral-100 dark:bg-neutral-800 rounded-lg">
-          <button
-            onClick={() => setActiveTab('top_pages')}
-            className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
-              activeTab === 'top_pages'
-                ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
-                : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
-            }`}
-          >
-            Top Pages
-          </button>
-          <button
-            onClick={() => setActiveTab('entry_pages')}
-            className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
-              activeTab === 'entry_pages'
-                ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
-                : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
-            }`}
-          >
-            Entry
-          </button>
-          <button
-            onClick={() => setActiveTab('exit_pages')}
-            className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
-              activeTab === 'exit_pages'
-                ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
-                : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
-            }`}
-          >
-            Exit
-          </button>
+    <>
+      <div className="bg-white dark:bg-neutral-900 border border-neutral-200 dark:border-neutral-800 rounded-xl p-6 h-full flex flex-col">
+        <div className="flex items-center justify-between mb-6">
+          <div className="flex items-center gap-4">
+            <h3 className="text-lg font-semibold text-neutral-900 dark:text-white">
+              Content
+            </h3>
+            {showViewAll && (
+              <button
+                onClick={() => setIsModalOpen(true)}
+                className="text-xs font-medium text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-white transition-colors"
+              >
+                View All
+              </button>
+            )}
+          </div>
+          <div className="flex p-1 bg-neutral-100 dark:bg-neutral-800 rounded-lg">
+            {(['top_pages', 'entry_pages', 'exit_pages'] as Tab[]).map((tab) => (
+              <button
+                key={tab}
+                onClick={() => setActiveTab(tab)}
+                className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
+                  activeTab === tab
+                    ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
+                    : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
+                }`}
+              >
+                {getTabLabel(tab)}
+              </button>
+            ))}
+          </div>
+        </div>
+
+        <div className="space-y-3 flex-1 min-h-[270px]">
+          {hasData ? (
+            <>
+              {displayedData.map((page, index) => (
+                <div key={index} className="flex items-center justify-between h-7">
+                  <div className="flex-1 truncate text-neutral-900 dark:text-white">
+                    {page.path}
+                  </div>
+                  <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
+                    {formatNumber(page.pageviews)}
+                  </div>
+                </div>
+              ))}
+              {Array.from({ length: emptySlots }).map((_, i) => (
+                <div key={`empty-${i}`} className="h-7" aria-hidden="true" />
+              ))}
+            </>
+          ) : (
+            <div className="h-full flex flex-col items-center justify-center">
+              <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
+            </div>
+          )}
         </div>
       </div>
-      {renderContent()}
-    </div>
+
+      <Modal
+        isOpen={isModalOpen}
+        onClose={() => setIsModalOpen(false)}
+        title={`Content - ${getTabLabel(activeTab)}`}
+      >
+        <div className="space-y-3 max-h-[60vh] overflow-y-auto pr-2">
+          {data.map((page, index) => (
+            <div key={index} className="flex items-center justify-between py-1">
+              <div className="flex-1 truncate text-neutral-900 dark:text-white">
+                {page.path}
+              </div>
+              <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
+                {formatNumber(page.pageviews)}
+              </div>
+            </div>
+          ))}
+        </div>
+      </Modal>
+    </>
   )
 }
diff --git a/components/dashboard/Locations.tsx b/components/dashboard/Locations.tsx
index 6f57197..342ea14 100644
--- a/components/dashboard/Locations.tsx
+++ b/components/dashboard/Locations.tsx
@@ -4,6 +4,7 @@ import { useState } from 'react'
 import { formatNumber } from '@/lib/utils/format'
 import * as Flags from 'country-flag-icons/react/3x2'
 import WorldMap from './WorldMap'
+import { Modal } from '@ciphera-net/ui'
 
 interface LocationProps {
   countries: Array<{ country: string; pageviews: number }>
@@ -13,13 +14,14 @@ interface LocationProps {
 
 type Tab = 'map' | 'countries' | 'regions' | 'cities'
 
+const LIMIT = 7
+
 export default function Locations({ countries, cities, regions }: LocationProps) {
   const [activeTab, setActiveTab] = useState<Tab>('map')
+  const [isModalOpen, setIsModalOpen] = useState(false)
 
   const getFlagComponent = (countryCode: string) => {
     if (!countryCode || countryCode === 'Unknown') return null
-    // * The API returns 2-letter country codes (e.g. US, DE)
-    // * We cast it to the flag component name
     const FlagComponent = (Flags as any)[countryCode]
     return FlagComponent ? <FlagComponent className="w-5 h-5 rounded-sm shadow-sm" /> : null
   }
@@ -34,128 +36,118 @@ export default function Locations({ countries, cities, regions }: LocationProps)
     }
   }
 
-  const renderContent = () => {
-    if (activeTab === 'map') {
-      if (!countries || countries.length === 0) {
-        return <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
-      }
-      return <WorldMap data={countries} />
-    }
-
-    if (activeTab === 'countries') {
-      if (!countries || countries.length === 0) {
-        return <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
-      }
-      return (
-        <div className="space-y-3">
-          {countries.map((country, index) => (
-            <div key={index} className="flex items-center justify-between">
-              <div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
-                <span className="shrink-0">{getFlagComponent(country.country)}</span>
-                <span className="truncate">{getCountryName(country.country)}</span>
-              </div>
-              <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
-                {formatNumber(country.pageviews)}
-              </div>
-            </div>
-          ))}
-        </div>
-      )
-    }
-
-    if (activeTab === 'regions') {
-      if (!regions || regions.length === 0) {
-        return <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
-      }
-      return (
-        <div className="space-y-3">
-          {regions.map((region, index) => (
-            <div key={index} className="flex items-center justify-between">
-              <div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
-                <span className="shrink-0">{getFlagComponent(region.country)}</span>
-                <span className="truncate">{region.region === 'Unknown' ? 'Unknown' : region.region}</span>
-              </div>
-              <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
-                {formatNumber(region.pageviews)}
-              </div>
-            </div>
-          ))}
-        </div>
-      )
-    }
-
-    if (activeTab === 'cities') {
-      if (!cities || cities.length === 0) {
-        return <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
-      }
-      return (
-        <div className="space-y-3">
-          {cities.map((city, index) => (
-            <div key={index} className="flex items-center justify-between">
-              <div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
-                <span className="shrink-0">{getFlagComponent(city.country)}</span>
-                <span className="truncate">{city.city === 'Unknown' ? 'Unknown' : city.city}</span>
-              </div>
-              <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
-                {formatNumber(city.pageviews)}
-              </div>
-            </div>
-          ))}
-        </div>
-      )
+  const getData = () => {
+    switch (activeTab) {
+      case 'countries': return countries
+      case 'regions': return regions
+      case 'cities': return cities
+      default: return []
     }
   }
 
+  const data = activeTab === 'map' ? [] : getData()
+  const hasData = activeTab === 'map' ? (countries && countries.length > 0) : (data && data.length > 0)
+  const displayedData = (activeTab !== 'map' && hasData) ? (data as any[]).slice(0, LIMIT) : []
+  const emptySlots = Math.max(0, LIMIT - displayedData.length)
+  const showViewAll = activeTab !== 'map' && hasData && data.length > LIMIT
+
   return (
-    <div className="bg-white dark:bg-neutral-900 border border-neutral-200 dark:border-neutral-800 rounded-xl p-6 h-full">
-      <div className="flex items-center justify-between mb-6">
-        <h3 className="text-lg font-semibold text-neutral-900 dark:text-white">
-          Locations
-        </h3>
-        <div className="flex p-1 bg-neutral-100 dark:bg-neutral-800 rounded-lg">
-          <button
-            onClick={() => setActiveTab('map')}
-            className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
-              activeTab === 'map'
-                ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
-                : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
-            }`}
-          >
-            Map
-          </button>
-          <button
-            onClick={() => setActiveTab('countries')}
-            className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
-              activeTab === 'countries'
-                ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
-                : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
-            }`}
-          >
-            Countries
-          </button>
-          <button
-            onClick={() => setActiveTab('regions')}
-            className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
-              activeTab === 'regions'
-                ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
-                : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
-            }`}
-          >
-            Regions
-          </button>
-          <button
-            onClick={() => setActiveTab('cities')}
-            className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
-              activeTab === 'cities'
-                ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
-                : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
-            }`}
-          >
-            Cities
-          </button>
+    <>
+      <div className="bg-white dark:bg-neutral-900 border border-neutral-200 dark:border-neutral-800 rounded-xl p-6 h-full flex flex-col">
+        <div className="flex items-center justify-between mb-6">
+          <div className="flex items-center gap-4">
+            <h3 className="text-lg font-semibold text-neutral-900 dark:text-white">
+              Locations
+            </h3>
+            {showViewAll && (
+              <button
+                onClick={() => setIsModalOpen(true)}
+                className="text-xs font-medium text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-white transition-colors"
+              >
+                View All
+              </button>
+            )}
+          </div>
+          <div className="flex p-1 bg-neutral-100 dark:bg-neutral-800 rounded-lg">
+            {(['map', 'countries', 'regions', 'cities'] as Tab[]).map((tab) => (
+              <button
+                key={tab}
+                onClick={() => setActiveTab(tab)}
+                className={`px-3 py-1 text-xs font-medium rounded-md transition-colors capitalize ${
+                  activeTab === tab
+                    ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
+                    : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
+                }`}
+              >
+                {tab}
+              </button>
+            ))}
+          </div>
+        </div>
+
+        <div className="space-y-3 flex-1 min-h-[270px]">
+          {activeTab === 'map' ? (
+            hasData ? <WorldMap data={countries} /> : (
+              <div className="h-full flex flex-col items-center justify-center">
+                <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
+              </div>
+            )
+          ) : (
+            hasData ? (
+              <>
+                {displayedData.map((item, index) => (
+                  <div key={index} className="flex items-center justify-between h-7">
+                    <div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
+                      {activeTab === 'countries' && <span className="shrink-0">{getFlagComponent(item.country)}</span>}
+                      {activeTab !== 'countries' && <span className="shrink-0">{getFlagComponent(item.country)}</span>}
+                      
+                      <span className="truncate">
+                        {activeTab === 'countries' ? getCountryName(item.country) : 
+                         activeTab === 'regions' ? (item.region === 'Unknown' ? 'Unknown' : item.region) :
+                         (item.city === 'Unknown' ? 'Unknown' : item.city)}
+                      </span>
+                    </div>
+                    <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
+                      {formatNumber(item.pageviews)}
+                    </div>
+                  </div>
+                ))}
+                {Array.from({ length: emptySlots }).map((_, i) => (
+                  <div key={`empty-${i}`} className="h-7" aria-hidden="true" />
+                ))}
+              </>
+            ) : (
+              <div className="h-full flex flex-col items-center justify-center">
+                <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
+              </div>
+            )
+          )}
         </div>
       </div>
-      {renderContent()}
-    </div>
+
+      <Modal
+        isOpen={isModalOpen}
+        onClose={() => setIsModalOpen(false)}
+        title={`Locations - ${activeTab.charAt(0).toUpperCase() + activeTab.slice(1)}`}
+      >
+        <div className="space-y-3 max-h-[60vh] overflow-y-auto pr-2">
+          {(data as any[]).map((item, index) => (
+            <div key={index} className="flex items-center justify-between py-1">
+              <div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
+                <span className="shrink-0">{getFlagComponent(item.country)}</span>
+                <span className="truncate">
+                  {activeTab === 'countries' ? getCountryName(item.country) : 
+                   activeTab === 'regions' ? (item.region === 'Unknown' ? 'Unknown' : item.region) :
+                   (item.city === 'Unknown' ? 'Unknown' : item.city)}
+                </span>
+              </div>
+              <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
+                {formatNumber(item.pageviews)}
+              </div>
+            </div>
+          ))}
+        </div>
+      </Modal>
+    </>
   )
 }
diff --git a/components/dashboard/TechSpecs.tsx b/components/dashboard/TechSpecs.tsx
index d33f1f8..14fa5ef 100644
--- a/components/dashboard/TechSpecs.tsx
+++ b/components/dashboard/TechSpecs.tsx
@@ -4,6 +4,7 @@ import { useState } from 'react'
 import { formatNumber } from '@/lib/utils/format'
 import { getBrowserIcon, getOSIcon, getDeviceIcon } from '@/lib/utils/icons'
 import { MdMonitor } from 'react-icons/md'
+import { Modal } from '@ciphera-net/ui'
 
 interface TechSpecsProps {
   browsers: Array<{ browser: string; pageviews: number }>
@@ -14,93 +15,112 @@ interface TechSpecsProps {
 
 type Tab = 'browsers' | 'os' | 'devices' | 'screens'
 
+const LIMIT = 7
+
 export default function TechSpecs({ browsers, os, devices, screenResolutions }: TechSpecsProps) {
   const [activeTab, setActiveTab] = useState<Tab>('browsers')
+  const [isModalOpen, setIsModalOpen] = useState(false)
 
-  const renderContent = () => {
-    let data: Array<{ name: string; pageviews: number; icon?: React.ReactNode }> = []
-    
-    if (activeTab === 'browsers') {
-        data = browsers.map(b => ({ name: b.browser, pageviews: b.pageviews, icon: getBrowserIcon(b.browser) }))
-    } else if (activeTab === 'os') {
-        data = os.map(o => ({ name: o.os, pageviews: o.pageviews, icon: getOSIcon(o.os) }))
-    } else if (activeTab === 'devices') {
-        data = devices.map(d => ({ name: d.device, pageviews: d.pageviews, icon: getDeviceIcon(d.device) }))
-    } else if (activeTab === 'screens') {
-        data = screenResolutions.map(s => ({ name: s.screen_resolution, pageviews: s.pageviews, icon: <MdMonitor className="text-neutral-500" /> }))
+  const getData = () => {
+    switch (activeTab) {
+      case 'browsers':
+        return browsers.map(b => ({ name: b.browser, pageviews: b.pageviews, icon: getBrowserIcon(b.browser) }))
+      case 'os':
+        return os.map(o => ({ name: o.os, pageviews: o.pageviews, icon: getOSIcon(o.os) }))
+      case 'devices':
+        return devices.map(d => ({ name: d.device, pageviews: d.pageviews, icon: getDeviceIcon(d.device) }))
+      case 'screens':
+        return screenResolutions.map(s => ({ name: s.screen_resolution, pageviews: s.pageviews, icon: <MdMonitor className="text-neutral-500" /> }))
+      default:
+        return []
     }
-
-    if (!data || data.length === 0) {
-      return <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
-    }
-
-    return (
-      <div className="space-y-3">
-        {data.map((item, index) => (
-          <div key={index} className="flex items-center justify-between">
-            <div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
-              {item.icon && <span className="text-lg">{item.icon}</span>}
-              <span className="truncate">{item.name === 'Unknown' ? 'Unknown' : item.name}</span>
-            </div>
-            <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
-              {formatNumber(item.pageviews)}
-            </div>
-          </div>
-        ))}
-      </div>
-    )
   }
 
+  const data = getData()
+  const hasData = data && data.length > 0
+  const displayedData = hasData ? data.slice(0, LIMIT) : []
+  const emptySlots = Math.max(0, LIMIT - displayedData.length)
+  const showViewAll = hasData && data.length > LIMIT
+
   return (
-    <div className="bg-white dark:bg-neutral-900 border border-neutral-200 dark:border-neutral-800 rounded-xl p-6 h-full">
-      <div className="flex items-center justify-between mb-6">
-        <h3 className="text-lg font-semibold text-neutral-900 dark:text-white">
-          Technology
-        </h3>
-        <div className="flex p-1 bg-neutral-100 dark:bg-neutral-800 rounded-lg">
-          <button
-            onClick={() => setActiveTab('browsers')}
-            className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
-              activeTab === 'browsers'
-                ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
-                : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
-            }`}
-          >
-            Browsers
-          </button>
-          <button
-            onClick={() => setActiveTab('os')}
-            className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
-              activeTab === 'os'
-                ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
-                : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
-            }`}
-          >
-            OS
-          </button>
-          <button
-            onClick={() => setActiveTab('devices')}
-            className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
-              activeTab === 'devices'
-                ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
-                : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
-            }`}
-          >
-            Devices
-          </button>
-          <button
-            onClick={() => setActiveTab('screens')}
-            className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
-              activeTab === 'screens'
-                ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
-                : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
-            }`}
-          >
-            Screens
-          </button>
+    <>
+      <div className="bg-white dark:bg-neutral-900 border border-neutral-200 dark:border-neutral-800 rounded-xl p-6 h-full flex flex-col">
+        <div className="flex items-center justify-between mb-6">
+          <div className="flex items-center gap-4">
+            <h3 className="text-lg font-semibold text-neutral-900 dark:text-white">
+              Technology
+            </h3>
+            {showViewAll && (
+              <button
+                onClick={() => setIsModalOpen(true)}
+                className="text-xs font-medium text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-white transition-colors"
+              >
+                View All
+              </button>
+            )}
+          </div>
+          <div className="flex p-1 bg-neutral-100 dark:bg-neutral-800 rounded-lg">
+            {(['browsers', 'os', 'devices', 'screens'] as Tab[]).map((tab) => (
+              <button
+                key={tab}
+                onClick={() => setActiveTab(tab)}
+                className={`px-3 py-1 text-xs font-medium rounded-md transition-colors capitalize ${
+                  activeTab === tab
+                    ? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
+                    : 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
+                }`}
+              >
+                {tab}
+              </button>
+            ))}
+          </div>
+        </div>
+
+        <div className="space-y-3 flex-1 min-h-[270px]">
+          {hasData ? (
+            <>
+              {displayedData.map((item, index) => (
+                <div key={index} className="flex items-center justify-between h-7">
+                  <div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
+                    {item.icon && <span className="text-lg">{item.icon}</span>}
+                    <span className="truncate">{item.name === 'Unknown' ? 'Unknown' : item.name}</span>
+                  </div>
+                  <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
+                    {formatNumber(item.pageviews)}
+                  </div>
+                </div>
+              ))}
+              {Array.from({ length: emptySlots }).map((_, i) => (
+                <div key={`empty-${i}`} className="h-7" aria-hidden="true" />
+              ))}
+            </>
+          ) : (
+            <div className="h-full flex flex-col items-center justify-center">
+              <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
+            </div>
+          )}
         </div>
       </div>
-      {renderContent()}
-    </div>
+
+      <Modal
+        isOpen={isModalOpen}
+        onClose={() => setIsModalOpen(false)}
+        title={`Technology - ${activeTab.charAt(0).toUpperCase() + activeTab.slice(1)}`}
+      >
+        <div className="space-y-3 max-h-[60vh] overflow-y-auto pr-2">
+          {data.map((item, index) => (
+            <div key={index} className="flex items-center justify-between py-1">
+              <div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
+                {item.icon && <span className="text-lg">{item.icon}</span>}
+                <span className="truncate">{item.name === 'Unknown' ? 'Unknown' : item.name}</span>
+              </div>
+              <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
+                {formatNumber(item.pageviews)}
+              </div>
+            </div>
+          ))}
+        </div>
+      </Modal>
+    </>
   )
 }
diff --git a/components/dashboard/TopReferrers.tsx b/components/dashboard/TopReferrers.tsx
index e533c08..753f7b5 100644
--- a/components/dashboard/TopReferrers.tsx
+++ b/components/dashboard/TopReferrers.tsx
@@ -1,42 +1,86 @@
 'use client'
 
+import { useState } from 'react'
 import { formatNumber } from '@/lib/utils/format'
 import { getReferrerIcon } from '@/lib/utils/icons'
+import { Modal } from '@ciphera-net/ui'
 
 interface TopReferrersProps {
   referrers: Array<{ referrer: string; pageviews: number }>
 }
 
+const LIMIT = 7
+
 export default function TopReferrers({ referrers }: TopReferrersProps) {
-  if (!referrers || referrers.length === 0) {
-    return (
-      <div className="bg-white dark:bg-neutral-900 border border-neutral-200 dark:border-neutral-800 rounded-xl p-6 h-full">
-        <h3 className="text-lg font-semibold mb-4 text-neutral-900 dark:text-white">
-          Top Referrers
-        </h3>
-        <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
-      </div>
-    )
-  }
+  const [isModalOpen, setIsModalOpen] = useState(false)
+
+  const hasData = referrers && referrers.length > 0
+  const displayedReferrers = hasData ? referrers.slice(0, LIMIT) : []
+  const emptySlots = Math.max(0, LIMIT - displayedReferrers.length)
+  const showViewAll = hasData && referrers.length > LIMIT
 
   return (
-    <div className="bg-white dark:bg-neutral-900 border border-neutral-200 dark:border-neutral-800 rounded-xl p-6 h-full">
-      <h3 className="text-lg font-semibold mb-4 text-neutral-900 dark:text-white">
-        Top Referrers
-      </h3>
-      <div className="space-y-3">
-        {referrers.map((ref, index) => (
-          <div key={index} className="flex items-center justify-between">
-            <div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
-              <span className="text-lg flex-shrink-0">{getReferrerIcon(ref.referrer)}</span>
-              <span className="truncate" title={ref.referrer}>{ref.referrer}</span>
+    <>
+      <div className="bg-white dark:bg-neutral-900 border border-neutral-200 dark:border-neutral-800 rounded-xl p-6 h-full flex flex-col">
+        <div className="flex items-center justify-between mb-4">
+          <h3 className="text-lg font-semibold text-neutral-900 dark:text-white">
+            Top Referrers
+          </h3>
+          {showViewAll && (
+            <button
+              onClick={() => setIsModalOpen(true)}
+              className="text-xs font-medium text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-white transition-colors"
+            >
+              View All
+            </button>
+          )}
+        </div>
+
+        <div className="space-y-3 flex-1 min-h-[270px]">
+          {hasData ? (
+            <>
+              {displayedReferrers.map((ref, index) => (
+                <div key={index} className="flex items-center justify-between h-7">
+                  <div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
+                    <span className="text-lg flex-shrink-0">{getReferrerIcon(ref.referrer)}</span>
+                    <span className="truncate" title={ref.referrer}>{ref.referrer}</span>
+                  </div>
+                  <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
+                    {formatNumber(ref.pageviews)}
+                  </div>
+                </div>
+              ))}
+              {Array.from({ length: emptySlots }).map((_, i) => (
+                <div key={`empty-${i}`} className="h-7" aria-hidden="true" />
+              ))}
+            </>
+          ) : (
+            <div className="h-full flex flex-col items-center justify-center">
+              <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
             </div>
-            <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
-              {formatNumber(ref.pageviews)}
-            </div>
-          </div>
-        ))}
+          )}
+        </div>
       </div>
-    </div>
+
+      <Modal
+        isOpen={isModalOpen}
+        onClose={() => setIsModalOpen(false)}
+        title="Top Referrers"
+      >
+        <div className="space-y-3 max-h-[60vh] overflow-y-auto pr-2">
+          {referrers?.map((ref, index) => (
+            <div key={index} className="flex items-center justify-between py-1">
+              <div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
+                <span className="text-lg flex-shrink-0">{getReferrerIcon(ref.referrer)}</span>
+                <span className="truncate" title={ref.referrer}>{ref.referrer}</span>
+              </div>
+              <div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
+                {formatNumber(ref.pageviews)}
+              </div>
+            </div>
+          ))}
+        </div>
+      </Modal>
+    </>
   )
 }