diff --git a/pwa/app/components/molecules/Loader.tsx b/pwa/app/components/molecules/Loader.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..38c38e7ab2e5c73e9c129389f69409e988ab467b
--- /dev/null
+++ b/pwa/app/components/molecules/Loader.tsx
@@ -0,0 +1,7 @@
+export default function Loader() {
+    return (
+        <div className="flex items-center justify-center py-12">
+            <div className="h-40 w-40 animate-spin rounded-full border-4 border-[#3a3f44] border-t-[#8884d8]" />
+        </div>
+    )
+}
diff --git a/pwa/app/components/tabs/points.tsx b/pwa/app/components/tabs/points.tsx
index 62b9146616448a8fdab2a261f370faf1eff390b7..654b5f89ed54fb2931f330a7ac67b0118c2c27dd 100644
--- a/pwa/app/components/tabs/points.tsx
+++ b/pwa/app/components/tabs/points.tsx
@@ -8,6 +8,7 @@ ChartJS.register(LinearScale, PointElement, Tooltip, Legend)
 import { searchDepartments, getCorrelation, type Department, type CorrelationPoint } from '../../services/points.services'
 import { TAX_TYPES, YEARS } from '../../constants'
 import ErrorDiv from '../molecules/ErrorDiv'
+import Loader from '../molecules/Loader'
 
 export default function Points() {
     // Department search autocomplete results from API
@@ -235,9 +236,11 @@ export default function Points() {
                 </button>
             </div>
 
+            {loading && <Loader />}
+
             {error && <ErrorDiv message={error} />}
 
-            {!error && data.length > 0 && (
+            {!loading && !error && data.length > 0 && (
                 <>
                     <div className="flex flex-wrap gap-4 items-end">
                         <p className="text-sm text-[#b0afaf]">
diff --git a/pwa/app/components/tabs/temporal.tsx b/pwa/app/components/tabs/temporal.tsx
index 71650635af59327cd3aaeb721e60e2f68c5da282..60befb89ee9e24dde7835f52fe9471fe518b18f6 100644
--- a/pwa/app/components/tabs/temporal.tsx
+++ b/pwa/app/components/tabs/temporal.tsx
@@ -5,6 +5,7 @@ import { LineChart, Line, XAxis, YAxis, Tooltip, Legend, ResponsiveContainer, Ca
 import { getTimeSeries, type TimeSeriesData } from '../../services/temporal.services'
 import { TAX_TYPES, YEARS, COLORS } from '../../constants'
 import ErrorDiv from '../molecules/ErrorDiv'
+import Loader from '../molecules/Loader'
 
 interface TemporalProps {
     regions: string[]
@@ -153,21 +154,41 @@ export default function Temporal({ regions }: TemporalProps) {
                 </div>
             )}
 
+            {loading && <Loader />}
+
             {error && <ErrorDiv message={error} />}
 
-            {!error && chartData.length > 0 && (
+            {!loading && !error && chartData.length > 0 && (
                 <ResponsiveContainer width="100%" height={400}>
                     <LineChart data={chartData}>
                         <CartesianGrid strokeDasharray="3 3" stroke="#3a3f44" />
                         <XAxis dataKey="year" stroke="#b0afaf" />
                         <YAxis stroke="#b0afaf" tickFormatter={(v: number) => `${v}%`} />
                         <Tooltip
-                            contentStyle={{
-                                backgroundColor: '#212529',
-                                border: '1px solid #3a3f44',
-                                borderRadius: 8,
+                            content={({ payload, label }) => {
+                                if (!payload || payload.length === 0) return null
+                                return (
+                                    <div
+                                        className="tooltip-scroll"
+                                        style={{
+                                            backgroundColor: '#212529',
+                                            border: '1px solid #3a3f44',
+                                            borderRadius: 8,
+                                            padding: '8px 12px',
+                                            maxHeight: 300,
+                                            overflowY: 'auto',
+                                        }}
+                                    >
+                                        <p style={{ margin: '0 0 4px', color: '#b0afaf' }}>{label}</p>
+                                        {[...payload].sort((a, b) => Number(b.value) - Number(a.value)).map(item => (
+                                            <p key={item.name} style={{ margin: '2px 0', color: item.color }}>
+                                                {item.name} : {item.value}%
+                                            </p>
+                                        ))}
+                                    </div>
+                                )
                             }}
-                            formatter={(value, name) => [`${value}%`, name]}
+                            wrapperStyle={{ zIndex: 10, pointerEvents: 'auto' }}
                         />
                         <Legend
                             wrapperStyle={{
diff --git a/pwa/app/globals.css b/pwa/app/globals.css
index ba7afea7427baacac5c20f8c208718ce6204b0a9..90cc7d3c1bce70f9505d76d9a326fa5feed73820 100644
--- a/pwa/app/globals.css
+++ b/pwa/app/globals.css
@@ -21,3 +21,21 @@ h1 {
     opacity: 0;
     transform: scaleY(0);
 }
+
+.tooltip-scroll::-webkit-scrollbar {
+    width: 6px;
+}
+
+.tooltip-scroll::-webkit-scrollbar-track {
+    background: #1a1d21;
+    border-radius: 3px;
+}
+
+.tooltip-scroll::-webkit-scrollbar-thumb {
+    background: #3a3f44;
+    border-radius: 3px;
+}
+
+.tooltip-scroll::-webkit-scrollbar-thumb:hover {
+    background: #8884d8;
+}