diff --git a/.gitignore b/.gitignore
index 5ea2266f..3e3b1963 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,9 +145,6 @@ venv.bak/
 .spyderproject
 .spyproject
 
-# VS Code
-.vscode
-
 # Rope project settings
 .ropeproject
 
diff --git a/backend/alembic/versions/c32d65d6e6fd_create_fct_metrics.py b/backend/alembic/versions/c32d65d6e6fd_create_fct_metrics.py
new file mode 100644
index 00000000..eb6e48b8
--- /dev/null
+++ b/backend/alembic/versions/c32d65d6e6fd_create_fct_metrics.py
@@ -0,0 +1,50 @@
+"""create fct metrics
+
+Revision ID: c32d65d6e6fd
+Revises: 06bb3c26076f
+Create Date: 2024-10-18 11:13:02.468934
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import Inspector
+import geoalchemy2
+
+# revision identifiers, used by Alembic.
+revision = 'c32d65d6e6fd'
+down_revision = 'd9d279892b5c'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+
+    # Création de la table fct_metrics
+    op.create_table(
+        'fct_metrics',
+        sa.Column('timestamp', sa.DateTime, primary_key=True),
+        sa.Column('vessel_id', sa.Integer, primary_key=True),
+        sa.Column('type', sa.String, nullable=False), 
+        sa.Column('vessel_mmsi', sa.Integer, nullable=False),
+        sa.Column('ship_name', sa.String, nullable=False),
+        sa.Column('vessel_country_iso3', sa.String, nullable=False),
+        sa.Column('vessel_imo', sa.Integer),
+        sa.Column('duration_total', sa.FLOAT, nullable=False),
+        sa.Column('duration_fishing', sa.FLOAT, nullable=True),
+        sa.Column("zone_name", sa.String, primary_key=True),
+        sa.Column('zone_sub_category', sa.String, nullable=True),
+    )
+
+
+def downgrade() -> None:
+    # Suppression de la table fct_metrics en cas de rollback
+    conn = op.get_bind()
+    inspector = Inspector.from_engine(conn)
+    sql_tables = inspector.get_table_names()
+    tables = [
+        "fct_metrics",
+    ]
+    for t in tables:
+        if t in sql_tables:
+            op.drop_table(t)
+            
diff --git a/backend/alembic/versions/d9d279892b5c_add_task_execution.py b/backend/alembic/versions/d9d279892b5c_add_task_execution.py
new file mode 100644
index 00000000..1a7bb9c3
--- /dev/null
+++ b/backend/alembic/versions/d9d279892b5c_add_task_execution.py
@@ -0,0 +1,89 @@
+"""add task execution 
+
+Revision ID: d9d279892b5c
+Revises: 7ba4634af5ad
+Create Date: 2024-11-30 12:54:22.318425
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.sql import func
+
+
+# revision identifiers, used by Alembic.
+revision = 'd9d279892b5c'
+down_revision = '7ba4634af5ad'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    """
+    Create a new task_executions table that permit to store historical data
+    for each task execution
+    The goal is to be able to detect timeframe not covered by Spire API interrogation
+    """
+    # drop constraint from existing table to free the constraint name
+    op.drop_constraint(table_name="tasks_executions",
+                       constraint_name="tasks_executions_pkey")
+    # rename existing table to keep existing data
+    op.rename_table('tasks_executions','tasks_executions_tmp')
+    # create the new task_executions table with id and active columns in addition
+    op.create_table("tasks_executions",
+                    sa.Column("id", sa.Integer(),sa.Identity(), primary_key=True, index=True),
+                    sa.Column("task_name", sa.String),
+                    sa.Column("point_in_time", sa.DateTime(timezone=True)),
+                    sa.Column(
+                        "created_at",
+                        sa.DateTime(timezone=True),
+                        nullable=False,
+                        server_default=func.now(),
+                    ),
+                    sa.Column("updated_at", sa.DateTime(timezone=True), onupdate=func.now()),
+                    sa.Column("delta",
+                                sa.Interval,
+                                index=True,
+                                nullable=True),
+                    sa.Column("active",
+                                sa.Boolean,
+                                index=True,
+                                default=False),
+                    )
+    # copy of existing data to new table with active=True
+    op.execute("insert into tasks_executions "
+               +"(task_name,point_in_time,created_at,updated_at,active) "
+               +"select task_name,point_in_time,created_at,updated_at,true "
+               +"from tasks_executions_tmp")
+    # drop old table
+    op.drop_table('tasks_executions_tmp')
+
+    # Retrieve all historical spire api interrogation from spire_ais_data table
+    op.execute(
+        """insert into public.tasks_executions (task_name,point_in_time,created_at,delta,active)
+            select distinct
+            'load_spire_data_from_api' as "task_name",
+            T1.created_at as "point_in_time",
+            T1.created_at,
+            T1.created_at-(select distinct created_at from spire_ais_data where created_at < T1.created_at group by created_at order by created_at desc limit 1) as "delta",
+            case when T1.created_at = (select MAX(created_at) from spire_ais_data) and not EXISTS(select 1 from public.tasks_executions where task_name = 'load_spire_data_from_api' and active = True) then true else false end as "active"
+            from spire_ais_data T1
+            where T1.created_at not in (select point_in_time from public.tasks_executions where task_name = 'load_spire_data_from_api')
+            group by T1.created_at
+            order by T1.created_at desc
+        """)
+    pass
+
+
+def downgrade() -> None:
+    # delete all lines active=False as they have no equivalent in old task_executions
+    op.execute("delete from tasks_executions where active=False")
+    # drop active and id table
+    op.drop_column("tasks_executions","delta")
+    op.drop_column("tasks_executions","active")
+    op.drop_column("tasks_executions","id")
+    # recreate the primary unique key constraint of old table
+    op.create_unique_constraint("tasks_executions_pkey",
+                                "tasks_executions",
+                                ["task_name"],
+                                )
+    pass
diff --git a/backend/bloom/container.py b/backend/bloom/container.py
index 6afefbb8..26efb6cf 100644
--- a/backend/bloom/container.py
+++ b/backend/bloom/container.py
@@ -9,6 +9,8 @@
 from bloom.infra.repositories.repository_vessel_position import VesselPositionRepository
 from bloom.infra.repositories.repository_segment import SegmentRepository
 from bloom.infra.repositories.repository_zone import ZoneRepository
+from bloom.infra.repositories.repository_metrics import MetricsRepository
+
 from bloom.services.GetVesselsFromSpire import GetVesselsFromSpire
 from bloom.services.metrics import MetricsService
 from bloom.usecase.GenerateAlerts import GenerateAlerts
@@ -89,3 +91,8 @@ class UseCases(containers.DeclarativeContainer):
         MetricsService,
         session_factory=db.provided.session,
     )
+
+    metrics_repository = providers.Factory(
+        MetricsRepository,
+        session_factory=db.provided.session,
+    )
\ No newline at end of file
diff --git a/backend/bloom/domain/metrics.py b/backend/bloom/domain/metrics.py
index bdafa269..4d7ab27d 100644
--- a/backend/bloom/domain/metrics.py
+++ b/backend/bloom/domain/metrics.py
@@ -5,6 +5,21 @@
 from enum import Enum
 from bloom.domain.vessel import Vessel,VesselListView
 from bloom.domain.zone import Zone,ZoneListView
+from typing import Union
+
+class Metrics(BaseModel) :
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+    timestamp : datetime
+    vessel_id: int
+    type : str
+    vessel_mmsi: int
+    ship_name: str
+    vessel_country_iso3: str 
+    vessel_imo: int
+    duration_total : float
+    duration_fishing: Optional[float] = None
+    zone_name : str
+    zone_sub_category : Union[str, None]
 
 class TotalTimeActivityTypeEnum(str, Enum):
     total_time_at_sea: str = "Total Time at Sea"
@@ -31,6 +46,12 @@ class ResponseMetricsZoneVisitingTimeByVesselSchema(BaseModel):
     vessel: VesselListView
     zone_visiting_time_by_vessel: timedelta
 
+
+class ResponseMetricsVesselVisitingTimeByZoneSchema(BaseModel):
+    zone: ZoneListView
+    vessel: VesselListView
+    vessel_visiting_time_by_zone: timedelta
+
 class ResponseMetricsVesselTotalTimeActivityByActivityTypeSchema(BaseModel):
     vessel_id : int
     activity: str
diff --git a/backend/bloom/infra/database/sql_model.py b/backend/bloom/infra/database/sql_model.py
index 57a3f855..0fed68dd 100644
--- a/backend/bloom/infra/database/sql_model.py
+++ b/backend/bloom/infra/database/sql_model.py
@@ -10,7 +10,8 @@
     Integer,
     Interval,
     String,
-    PrimaryKeyConstraint
+    PrimaryKeyConstraint,
+    Identity
 )
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.sql import func, select
@@ -224,10 +225,13 @@ class Segment(Base):
 
 class TaskExecution(Base):
     __tablename__ = "tasks_executions"
-    task_name = Column("task_name", String, primary_key=True)
+    id = Column("id", Integer, Identity(), primary_key=True)
+    task_name = Column("task_name", String)
     point_in_time = Column("point_in_time", DateTime(timezone=True))
     created_at = Column("created_at", DateTime(timezone=True), server_default=func.now())
     updated_at = Column("updated_at", DateTime(timezone=True), onupdate=func.now())
+    delta = Column("delta", Interval, nullable=False)
+    active = Column("active", Boolean, nullable=False)
 
 
 class RelSegmentZone(Base):
@@ -256,3 +260,18 @@ class MetricsVesselInActivity(Base):
     #vessel_id: Mapped[Optional[int]]
     #total_time_at_sea: Mapped[Optional[timedelta]]
     
+
+class Metrics(Base):
+    __tablename__ = "fct_metrics"
+    timestamp = Column("timestamp", DateTime(timezone=True), primary_key=True)
+    vessel_id= Column("vessel_id", Integer, ForeignKey("dim_vessel.id"), primary_key=True)
+    type = Column("type", String, nullable=False)  # Ajouté comme clé primaire
+    vessel_mmsi= Column("vessel_mmsi", Integer, ForeignKey("dim_vessel.mmsi"), nullable=False)
+    ship_name= Column("ship_name", String, ForeignKey("dim_vessel.ship_name"), nullable=False)
+    vessel_country_iso3= Column("vessel_country_iso3", String, ForeignKey("dim_vessel.country_iso3"), nullable=False)
+    vessel_imo= Column("vessel_imo", Integer, ForeignKey("dim_vessel.imo"))
+    duration_total= Column("duration_total", Double, nullable= False)
+    duration_fishing= Column("duration_fishing", Double)
+    zone_name= Column("zone_name", String, ForeignKey("dim_zone.name"),primary_key=True)
+    zone_sub_category= Column("zone_sub_category", String, ForeignKey("dim_zone.sub_category"))
+
diff --git a/backend/bloom/infra/repositories/repository_excursion.py b/backend/bloom/infra/repositories/repository_excursion.py
index dba05a78..4b70e204 100644
--- a/backend/bloom/infra/repositories/repository_excursion.py
+++ b/backend/bloom/infra/repositories/repository_excursion.py
@@ -1,16 +1,23 @@
 from contextlib import AbstractContextManager
-from typing import Any, List, Union
+from typing import Any, List, Union, Optional
 
 import pandas as pd
+from bloom.routers.requests import DatetimeRangeRequest
 from dependency_injector.providers import Callable
 from geoalchemy2.shape import from_shape, to_shape
-from sqlalchemy import desc
+from sqlalchemy import desc, and_, or_
 from sqlalchemy import select
 from sqlalchemy.orm import Session
+from sqlalchemy.sql.expression import and_,or_, asc, desc
 
 from bloom.domain.excursion import Excursion
 from bloom.infra.database import sql_model
 
+from bloom.routers.requests import ( DatetimeRangeRequest,
+                                     OrderByRequest,
+                                        PageParams,
+                                        OrderByEnum)
+
 
 class ExcursionRepository:
     def __init__(
@@ -34,9 +41,29 @@ def get_param_from_last_excursion(self, session: Session, vessel_id: int) -> Uni
             return None
         return {"arrival_port_id": result.arrival_port_id, "arrival_position": result.arrival_position}
 
-    def get_excursions_by_vessel_id(self, session: Session, vessel_id: int) -> List[Excursion]:
+    def get_excursions_by_vessel_id(self,
+                                    session: Session,
+                                    vessel_id: int,
+                                    datetime_range: DatetimeRangeRequest,
+                                    order: OrderByRequest,
+                                    pagination: PageParams
+                                    ) -> List[Excursion]:
         """Recheche l'excursion en cours d'un bateau, c'est-à-dire l'excursion qui n'a pas de date d'arrivée"""
-        stmt = select(sql_model.Excursion).where(sql_model.Excursion.vessel_id == vessel_id)
+        stmt = select(sql_model.Excursion).where(
+            and_(
+                sql_model.Excursion.vessel_id == vessel_id,
+                sql_model.Excursion.departure_at < datetime_range.end_at,
+                or_(
+                    sql_model.Excursion.arrival_at > datetime_range.start_at,
+                    sql_model.Excursion.arrival_at == None
+                ),
+            )
+        )
+        stmt =  stmt.order_by(asc(sql_model.Excursion.departure_at))\
+                if  order.order == OrderByEnum.ascending \
+                else stmt.order_by(desc(sql_model.Excursion.departure_at))
+        stmt = stmt.offset(pagination.offset) if pagination.offset != None else stmt
+        stmt = stmt.limit(pagination.limit) if pagination.limit != None else stmt
         result = session.execute(stmt).scalars().all()
         if not result:
             return []
diff --git a/backend/bloom/infra/repositories/repository_metrics.py b/backend/bloom/infra/repositories/repository_metrics.py
new file mode 100644
index 00000000..97c81b1c
--- /dev/null
+++ b/backend/bloom/infra/repositories/repository_metrics.py
@@ -0,0 +1,91 @@
+from bloom.domain.metrics import Metrics
+from contextlib import AbstractContextManager
+from typing import Any, List, Union
+
+import pandas as pd
+from dependency_injector.providers import Callable
+from sqlalchemy.orm import Session
+
+from bloom.infra.database import sql_model
+
+from sqlalchemy import and_, or_, select, update, text, join
+
+
+
+
+class MetricsRepository:
+
+    def __init__(
+            self,
+            session_factory: Callable,
+    ) -> Callable[..., AbstractContextManager]:
+        self.session_factory = session_factory
+
+  #  def get_vessel_excursion_segment_by_id(self, session, segment_id: int) -> pd.DataFrame:
+  #      stmt = select(
+  #          sql_model.Vessel.id,
+  #          sql_model.Vessel.mmsi,
+  #          sql_model.Vessel.ship_name
+  #          sql_model.Vessel.country_iso3
+  #          sql_model.Vessel.imo
+  #      ).join(
+  #          sql_model.Excursion,
+  #          sql_model.Excursion.vessel_id == sql_model.Vessel.id
+  #      ).join(
+  #          sql_model.Segment,
+  #          sql_model.Segment.excursion_id == sql_model.Excursion.id
+  #      ).where(
+  #          sql_model.Segment.id == segment_id
+  #      )
+        
+  #      result = session.execute(stmt)
+  #      if not result:
+  #          return None
+  #      df = pd.DataFrame(result, columns=["vessel_id", "vessel_mmsi", "ship_name", "vessel_country_iso3","vessel_imo"])
+  #      return df
+
+    def batch_create_metrics(
+            self, session: Session, metricss: list[Metrics]
+    ) -> list[Metrics]:
+        orm_list = [MetricsRepository.map_to_orm(metrics) for metrics in metricss]
+        session.add_all(orm_list)
+        return [MetricsRepository.map_to_domain(orm) for orm in orm_list]
+
+
+    @staticmethod
+    def map_to_orm(metrics: Metrics) -> sql_model.Metrics:
+        return sql_model.Metrics(
+            timestamp=metrics.timestamp,
+            vessel_id=metrics.vessel_id,
+            type=metrics.type,
+            vessel_mmsi=metrics.vessel_mmsi,
+            ship_name=metrics.ship_name,
+            vessel_country_iso3=metrics.vessel_country_iso3,
+            vessel_imo=metrics.vessel_imo,
+            duration_total=metrics.duration_total,
+            duration_fishing=metrics.duration_fishing,
+            zone_name=metrics.zone_name,
+            zone_sub_category=metrics.zone_sub_category,
+        )            
+
+
+    @staticmethod
+    def map_to_domain(metrics: sql_model.Metrics) -> Metrics:
+            return Metrics(
+                timestamp=metrics.timestamp,
+                vessel_id=metrics.vessel_id,
+                type=metrics.type,
+                vessel_mmsi=metrics.vessel_mmsi,
+                ship_name=metrics.ship_name,
+                vessel_country_iso3=metrics.vessel_country_iso3,
+                vessel_imo=metrics.vessel_imo,
+                duration_total=metrics.duration_total,
+                duration_fishing=metrics.duration_fishing,
+                zone_name=metrics.zone_name,
+                zone_sub_category=metrics.zone_sub_category,
+            )            
+
+
+
+
+
diff --git a/backend/bloom/infra/repositories/repository_segment.py b/backend/bloom/infra/repositories/repository_segment.py
index 1aa95e3a..6c6c72ce 100644
--- a/backend/bloom/infra/repositories/repository_segment.py
+++ b/backend/bloom/infra/repositories/repository_segment.py
@@ -12,6 +12,8 @@
 
 from bloom.logger import logger
 from bloom.domain.segment import Segment
+from bloom.domain.vessel import Vessel
+
 from bloom.domain.vessel_last_position import VesselLastPosition
 from bloom.domain.zone import Zone
 from bloom.infra.database import sql_model
@@ -180,25 +182,43 @@ def get_vessel_attribute_by_segment(self, session: Session, segment_id: int) ->
         return result
     
 
-    def get_vessel_attribute_by_segment_created_updated_after(self, session: Session, segment_id: int, created_updated_after: datetime) -> str:
-        stmt = select(
-        sql_model.Vessel.country_iso3
-    ).select_from(
-        sql_model.Segment
-    ).join(
-        sql_model.Excursion, sql_model.Segment.excursion_id == sql_model.Excursion.id
-    ).join(
-        sql_model.Vessel, sql_model.Excursion.vessel_id == sql_model.Vessel.id
-    ).filter(
-        sql_model.Segment.id == segment_id
-    )
-
-        result = session.execute(stmt).scalar()
+    def get_vessel_attribute_by_segment_created_updated_after(self, session: Session, segment_id: int, created_updated_after: datetime) -> Vessel:
+        stmt = (
+            select(
+                sql_model.Vessel
+                
+                #ql_model.Vessel.id,
+                #sql_model.Vessel.mmsi,
+                #sql_model.Vessel.ship_name,
+                #sql_model.Vessel.country_iso3,
+                #sql_model.Vessel.imo
+            )
+            .where(
+                or_(
+                    and_(
+                        sql_model.Segment.updated_at.is_(None),
+                        sql_model.Segment.created_at > created_updated_after
+                    ),
+                    sql_model.Segment.updated_at > created_updated_after
+                )
+            )
+            .select_from(sql_model.Segment)
+            .join(
+                sql_model.Excursion, sql_model.Segment.excursion_id == sql_model.Excursion.id
+            )
+            .join(
+                sql_model.Vessel, sql_model.Excursion.vessel_id == sql_model.Vessel.id
+            )
+            .filter(sql_model.Segment.id == segment_id)
+        )
 
-        return result
-#.where(
-#        sql_model.Segment.updated_at > created_updated_after
-#    )
+        vessel = session.execute(stmt).scalar()
+        if not vessel:
+            return None
+        else:
+            return VesselRepository.map_to_domain(vessel)
+        #df = pd.DataFrame(result, columns=["vessel_id", "vessel_mmsi", "ship_name", "vessel_country_iso3","vessel_imo"])
+        #return df
 
     def batch_create_segment(
             self, session: Session, segments: list[Segment]
diff --git a/backend/bloom/infra/repositories/repository_task_execution.py b/backend/bloom/infra/repositories/repository_task_execution.py
index b3bdefae..46d88141 100644
--- a/backend/bloom/infra/repositories/repository_task_execution.py
+++ b/backend/bloom/infra/repositories/repository_task_execution.py
@@ -3,20 +3,37 @@
 from bloom.infra.database import sql_model
 from sqlalchemy import select
 from sqlalchemy.dialects.postgresql import insert
+from sqlalchemy.sql.expression import update,asc,desc
 from sqlalchemy.orm import Session
 
 
 class TaskExecutionRepository:
     @staticmethod
     def get_point_in_time(session: Session, task_name: str) -> datetime:
-        stmt = select(sql_model.TaskExecution).where(sql_model.TaskExecution.task_name == task_name)
-        e = session.execute(stmt).scalar()
+        stmt = select(sql_model.TaskExecution)\
+                .where(sql_model.TaskExecution.task_name == task_name)\
+                .where(sql_model.TaskExecution.active == True)
+        e = session.execute(stmt).scalar_one_or_none()
         if not e:
             return datetime.fromtimestamp(0, timezone.utc)
         else:
             return e.point_in_time
 
     def set_point_in_time(session: Session, task_name: str, pit: datetime) -> None:
-        stmt = insert(sql_model.TaskExecution).values(task_name=task_name, point_in_time=pit).on_conflict_do_update(
-            index_elements=["task_name"], set_=dict(point_in_time=pit, updated_at=datetime.now(timezone.utc)))
+        stmt= ( update(sql_model.TaskExecution)
+                .where(sql_model.TaskExecution.task_name==task_name)
+                .where(sql_model.TaskExecution.active==True)
+                .values(active=False)
+            )
+        session.execute(stmt)
+        subquery_delta=select(pit-sql_model.TaskExecution.point_in_time)\
+                        .select_from(sql_model.TaskExecution)\
+                        .where(sql_model.TaskExecution.task_name==task_name)\
+                        .order_by(desc(sql_model.TaskExecution.point_in_time))\
+                        .limit(1).subquery()
+        stmt = insert(sql_model.TaskExecution).values(
+                    task_name=task_name,
+                    point_in_time=pit,
+                    delta=subquery_delta,
+                    active=True)
         session.execute(stmt)
diff --git a/backend/bloom/routers/requests.py b/backend/bloom/routers/requests.py
index fd076880..79ac095d 100644
--- a/backend/bloom/routers/requests.py
+++ b/backend/bloom/routers/requests.py
@@ -55,7 +55,7 @@ class OrderByEnum(str, Enum):
 
 class DatetimeRangeRequest(BaseModel):
     start_at: datetime = Field(default=datetime.now()-timedelta(days=7))
-    end_at: datetime = datetime.now()
+    end_at: datetime= datetime.now()
 
 class OrderByRequest(BaseModel):
     order: OrderByEnum = OrderByEnum.ascending
diff --git a/backend/bloom/routers/v1/metrics.py b/backend/bloom/routers/v1/metrics.py
index c19a9c19..0f3e6cdf 100644
--- a/backend/bloom/routers/v1/metrics.py
+++ b/backend/bloom/routers/v1/metrics.py
@@ -20,6 +20,10 @@
                                  ResponseMetricsVesselTotalTimeActivityByActivityTypeSchema)
 from bloom.routers.requests import DatetimeRangeRequest,OrderByRequest,PageParams,CachedRequest
 from bloom.dependencies import ( X_API_KEY_HEADER, check_apikey,cache)
+from bloom.routers.requests import (
+    RangeHeader,
+    RangeHeaderParser
+)
 
 from bloom.domain.metrics import TotalTimeActivityTypeRequest
 from fastapi.encoders import jsonable_encoder
@@ -42,25 +46,43 @@ async def read_metrics_vessels_in_activity_total(request: Request,
     payload=MetricsService.getVesselsInActivity(datetime_range=datetime_range,
                                                 pagination=pagination,
                                                 order=order)
-    
+
     return jsonable_encoder(payload)
 
+
+@router.get("/metrics/vessels-at-sea")
+async def list_vessel_at_sea(
+    request: Request,
+    datetime_range: DatetimeRangeRequest = Depends(),
+    key: str = Depends(X_API_KEY_HEADER),  # used by @cache
+):
+    check_apikey(key)
+    use_cases = UseCases()
+    MetricsService = use_cases.metrics_service()
+    return MetricsService.getVesselsAtSea(datetime_range=datetime_range)
+
+
 @router.get("/metrics/zone-visited")
 @cache
-async def read_zone_visited_total(request: Request,
-                                           datetime_range: DatetimeRangeRequest = Depends(),
-                                           pagination: PageParams = Depends(),
-                                           order: OrderByRequest = Depends(),
-                                           caching: CachedRequest = Depends(),
-                                           key: str = Depends(X_API_KEY_HEADER),):
+async def read_zone_visited_total(
+    request: Request,
+    datetime_range: DatetimeRangeRequest = Depends(),
+    category: Optional[str] = None,
+    pagination: PageParams = Depends(),
+    order: OrderByRequest = Depends(),
+    caching: CachedRequest = Depends(),
+    key: str = Depends(X_API_KEY_HEADER),
+):
     check_apikey(key)
     use_cases = UseCases()
     MetricsService=use_cases.metrics_service()
     payload=MetricsService.getZoneVisited(datetime_range=datetime_range,
+                                          category=category,
                                                 pagination=pagination,
                                                 order=order)
     return jsonable_encoder(payload)
 
+
 @router.get("/metrics/zones/{zone_id}/visiting-time-by-vessel")
 @cache
 async def read_metrics_zone_visiting_time_by_vessel(request: Request,
@@ -80,20 +102,24 @@ async def read_metrics_zone_visiting_time_by_vessel(request: Request,
                                                 order=order)
     return jsonable_encoder(payload)
 
-"""
-@router.get("/metrics/vessels/{vessel_id}/activity/{activity_type}")
-@cache
-async def read_metrics_vessels_visits_by_activity_type(request: Request,
-                                            vessel_id: int,
-                                            activity_type: TotalTimeActivityTypeRequest = Depends(),
+@router.get("/metrics/vessels/time-by-zone")
+# @cache
+async def read_metrics_all_vessels_visiting_time_by_zone(request: Request,
+                                            vessel_id: Optional[int] = None,
+                                            category: Optional[str] = None,
+                                            sub_category: Optional[str] = None,
                                             datetime_range: DatetimeRangeRequest = Depends(),
-                                            caching: CachedRequest = Depends(),
+                                            pagination: PageParams = Depends(),
+                                            order: OrderByRequest = Depends(),
                                             key: str = Depends(X_API_KEY_HEADER),):
     check_apikey(key)
     use_cases = UseCases()
     MetricsService=use_cases.metrics_service()
-    payload=MetricsService.getVesselVisitsByActivityType(
+    payload=MetricsService.getVesselVisitingTimeByZone(
                                                 vessel_id=vessel_id,
-                                                activity_type=activity_type,
-                                                datetime_range=datetime_range)
-    return jsonable_encoder(payload)"""
\ No newline at end of file
+                                                datetime_range=datetime_range,
+                                                pagination=pagination,
+                                                order=order,
+                                                category=category,
+                                                sub_category=sub_category)
+    return jsonable_encoder(payload)
diff --git a/backend/bloom/routers/v1/vessels.py b/backend/bloom/routers/v1/vessels.py
index 24d7242c..424f7e63 100644
--- a/backend/bloom/routers/v1/vessels.py
+++ b/backend/bloom/routers/v1/vessels.py
@@ -2,7 +2,7 @@
 from redis import Redis
 from bloom.config import settings
 from bloom.container import UseCases
-from typing import Any
+from typing import Any, Optional
 import json
 from bloom.config import settings
 from bloom.container import UseCases
@@ -120,7 +120,7 @@ async def get_vessel_last_position(request: Request, # used by @cache
 async def list_vessel_excursions(request: Request, # used by @cache
                                  vessel_id: int,
                                  nocache:bool=False, # used by @cache
-                                datetime_range: DatetimeRangeRequest = Depends(),
+                                datetime_range: DatetimeRangeRequest= Depends(),
                                 pagination: PageParams = Depends(),
                                 order: OrderByRequest = Depends(),
                                 key: str = Depends(X_API_KEY_HEADER)):
@@ -132,7 +132,12 @@ async def list_vessel_excursions(request: Request, # used by @cache
     json_data={}
     with db.session() as session:
         json_data = [json.loads(p.model_dump_json() if p else "{}")
-                        for p in excursion_repository.get_excursions_by_vessel_id(session,vessel_id)]
+                        for p in excursion_repository.get_excursions_by_vessel_id(
+                                                    session,
+                                                    vessel_id,
+                                                    datetime_range,
+                                                    pagination=pagination,
+                                                    order=order)]
     return json_data
 
 
diff --git a/backend/bloom/services/metrics.py b/backend/bloom/services/metrics.py
index 854c518b..e1e8fa9e 100644
--- a/backend/bloom/services/metrics.py
+++ b/backend/bloom/services/metrics.py
@@ -1,10 +1,13 @@
 from pydantic import BaseModel, Field
 from contextlib import AbstractContextManager
 from dependency_injector.providers import Callable
-from sqlalchemy import select, func, and_, or_, text, literal_column
+from sqlalchemy import select, func, and_, or_, text, literal_column, asc, desc
 from bloom.infra.database import sql_model
 from bloom.infra.database.database_manager import Base
 from bloom.routers.requests import DatetimeRangeRequest,OrderByRequest,OrderByEnum, PageParams
+from bloom.routers.requests import RangeHeader, PaginatedResult
+from typing import Any, List, Union, Optional
+from sqlalchemy.orm import Session
 from fastapi.encoders import jsonable_encoder
 
 from bloom.domain.vessel import Vessel,VesselListView
@@ -16,7 +19,8 @@
 from bloom.domain.metrics import (ResponseMetricsVesselInActivitySchema,
                                  ResponseMetricsZoneVisitedSchema,
                                  ResponseMetricsZoneVisitingTimeByVesselSchema,
-                                 ResponseMetricsVesselTotalTimeActivityByActivityTypeSchema)
+                                 ResponseMetricsVesselTotalTimeActivityByActivityTypeSchema,
+                                 ResponseMetricsVesselVisitingTimeByZoneSchema)
 
 class MetricsService():
     def __init__(
@@ -36,22 +40,37 @@ def getVesselsInActivity(self,
             #   arrival time in range start_at/end_at
             #   departure <= start_at and ( arrival == None or arrival >= end_at)
             stmt=select(sql_model.Vessel,
-                        func.sum(sql_model.Excursion.total_time_at_sea).label("total_time_at_sea")
+                        func.sum(sql_model.Segment.segment_duration).label("total_time_in_mpa")
+                        func.sum(sql_model.Segment.segment_duration).label("total_time_in_mpa")
                         )\
                 .select_from(sql_model.Segment)\
-                .join(sql_model.Excursion, sql_model.Segment.excursion_id == sql_model.Excursion.id)\
-                .join(sql_model.Vessel, sql_model.Excursion.vessel_id == sql_model.Vessel.id)\
+                .join(sql_model.Excursion,sql_model.Segment.excursion_id==sql_model.Excursion.id)\
+                .join(sql_model.Vessel,sql_model.Vessel.id ==sql_model.Excursion.vessel_id)\
+                .join(sql_model.Excursion,sql_model.Segment.excursion_id==sql_model.Excursion.id)\
+                .join(sql_model.Vessel,sql_model.Vessel.id ==sql_model.Excursion.vessel_id)\
                 .where(
-                    or_(
-                        sql_model.Excursion.arrival_at.between(datetime_range.start_at,datetime_range.end_at),
-                        and_(sql_model.Excursion.departure_at <= datetime_range.end_at,
-                             or_(sql_model.Excursion.arrival_at == None, sql_model.Excursion.arrival_at >= datetime_range.end_at )))
+                    sql_model.Segment.in_amp_zone == True
+                    sql_model.Segment.in_amp_zone == True
                 )\
-                .group_by(sql_model.Vessel.id,sql_model.Excursion.total_time_at_sea)
+                .where(
+                        and_(
+                            sql_model.Segment.timestamp_start <= datetime_range.end_at,
+                            or_(sql_model.Segment.timestamp_end>= datetime_range.start_at,
+                                sql_model.Segment.timestamp_end == None
+                            )
+                        )
+                    )\
+                .group_by(sql_model.Vessel)
+                .where(
+                        sql_model.Segment.timestamp_start.between(datetime_range.start_at,datetime_range.end_at),
+                        sql_model.Segment.timestamp_end.between(datetime_range.start_at,datetime_range.end_at),)\
+                .group_by(sql_model.Vessel)
             stmt = stmt.offset(pagination.offset) if pagination.offset != None else stmt
-            stmt =  stmt.order_by(sql_model.Excursion.total_time_at_sea.asc())\
+            stmt =  stmt.order_by(asc("total_time_in_mpa"))\
+            stmt =  stmt.order_by(asc("total_time_in_mpa"))\
                     if  order.order == OrderByEnum.ascending \
-                    else stmt.order_by(sql_model.Excursion.total_time_at_sea.desc())
+                    else stmt.order_by(desc("total_time_in_mpa"))
+                    else stmt.order_by(desc("total_time_in_mpa"))
             stmt = stmt.limit(pagination.limit) if pagination.limit != None else stmt
             payload=session.execute(stmt).all()
             # payload contains a list of sets(Vessel,datetime.timedelta)
@@ -64,10 +83,35 @@ def getVesselsInActivity(self,
             )\
             for item in payload]
     
+    def getVesselsAtSea(self,
+                        datetime_range: DatetimeRangeRequest,
+                        ):
+        with self.session_factory() as session:
+            stmt = (
+                select(func.count(distinct(sql_model.Vessel.id)))
+                .select_from(sql_model.Excursion)
+                .join(
+                    sql_model.Vessel,
+                    sql_model.Excursion.vessel_id == sql_model.Vessel.id,
+                )
+                .where(
+                    or_(
+                        sql_model.Excursion.arrival_at.between(
+                            datetime_range.start_at, datetime_range.end_at
+                        ),
+                        sql_model.Excursion.arrival_at == None,
+                    )
+                )
+            )
+        return session.execute(stmt).scalar()
+
+    
     def getZoneVisited(self,
                         datetime_range: DatetimeRangeRequest,
                         pagination: PageParams,
-                        order: OrderByRequest):
+                        order: OrderByRequest,
+                        category: Optional[str]=None,
+                        ):
         payload=[]
         with self.session_factory() as session:
             stmt=select(
@@ -78,11 +122,16 @@ def getZoneVisited(self,
                 .join(sql_model.RelSegmentZone,sql_model.RelSegmentZone.zone_id == sql_model.Zone.id)\
                 .join(sql_model.Segment,sql_model.RelSegmentZone.segment_id == sql_model.Segment.id)\
                 .where(
-                    or_(
-                        sql_model.Segment.timestamp_start.between(datetime_range.start_at,datetime_range.end_at),
-                        sql_model.Segment.timestamp_end.between(datetime_range.start_at,datetime_range.end_at),)
-                )\
+                        and_(
+                            sql_model.Segment.timestamp_start <= datetime_range.end_at,
+                            or_(sql_model.Segment.timestamp_end>= datetime_range.start_at,
+                                sql_model.Segment.timestamp_end == None
+                            )
+                        )
+                    )\
                 .group_by(sql_model.Zone.id)
+            if (category):
+                stmt = stmt.where(sql_model.Zone.category == category)
             stmt =  stmt.order_by(func.sum(sql_model.Segment.segment_duration).asc())\
                     if  order.order == OrderByEnum.ascending \
                     else stmt.order_by(func.sum(sql_model.Segment.segment_duration).desc())
@@ -102,8 +151,8 @@ def getZoneVisited(self,
     def getZoneVisitingTimeByVessel(self,
                                     zone_id: int,
                                     datetime_range: DatetimeRangeRequest,
-                                    pagination: PageParams,
-                                    order: OrderByRequest):
+                                    order: OrderByRequest,
+                                    pagination: PageParams,):
         payload=[]
         with self.session_factory() as session:
             
@@ -117,11 +166,14 @@ def getZoneVisitingTimeByVessel(self,
             .join(sql_model.Segment, sql_model.RelSegmentZone.segment_id == sql_model.Segment.id)\
             .join(sql_model.Excursion, sql_model.Excursion.id == sql_model.Segment.excursion_id)\
             .join(sql_model.Vessel, sql_model.Excursion.vessel_id == sql_model.Vessel.id)\
+            .where(sql_model.Zone.id == zone_id)\
             .where(
-                and_(sql_model.Zone.id == zone_id,
-                    or_(
-                        sql_model.Segment.timestamp_start.between(datetime_range.start_at,datetime_range.end_at),
-                        sql_model.Segment.timestamp_end.between(datetime_range.start_at,datetime_range.end_at),))
+                    and_(
+                        sql_model.Segment.timestamp_start <= datetime_range.end_at,
+                        or_(sql_model.Segment.timestamp_end>= datetime_range.start_at,
+                            sql_model.Segment.timestamp_end == None
+                        )
+                    )
                 )\
             .group_by(sql_model.Zone.id,sql_model.Vessel.id)
             
@@ -144,6 +196,54 @@ def getZoneVisitingTimeByVessel(self,
             )\
             for item in payload]
     
+    def getVesselVisitingTimeByZone(self,
+                                    order: OrderByRequest,
+                                    datetime_range: DatetimeRangeRequest,
+                                    pagination: PageParams,
+                                    vessel_id: int = None,
+                                    category:Optional[str]=None,
+                                    sub_category:Optional[str]=None,
+                                    ):
+        payload=[]
+        with self.session_factory() as session:
+            stmt=select(sql_model.Vessel,
+                        sql_model.Zone,
+                        func.sum(sql_model.Segment.segment_duration).label("vessel_visiting_time_by_zone")
+                        )\
+                .select_from(sql_model.Vessel)\
+                .join(sql_model.Excursion, sql_model.Excursion.vessel_id == sql_model.Vessel.id)\
+                .join(sql_model.Segment, sql_model.Segment.excursion_id == sql_model.Excursion.id)\
+                .join(sql_model.RelSegmentZone, sql_model.RelSegmentZone.segment_id == sql_model.Segment.id)\
+                .join(sql_model.Zone, sql_model.Zone.id == sql_model.RelSegmentZone.zone_id)\
+                .where(
+                        and_(
+                            sql_model.Segment.timestamp_start <= datetime_range.end_at,
+                            or_(sql_model.Segment.timestamp_end>= datetime_range.start_at,
+                                sql_model.Segment.timestamp_end == None
+                            )
+                        )
+                    )\
+                .group_by(sql_model.Vessel,
+                        sql_model.Zone,)
+            if category:
+                stmt = stmt.where(sql_model.Zone.category == category)
+            if sub_category:
+                stmt = stmt.where(sql_model.Zone.sub_category == sub_category)
+            stmt =  stmt.order_by(func.sum(sql_model.Segment.segment_duration).asc())\
+                if  order.order == OrderByEnum.ascending \
+                else stmt.order_by(func.sum(sql_model.Segment.segment_duration).desc())
+            stmt = stmt.offset(pagination.offset) if pagination.offset != None else stmt
+            stmt = stmt.limit(pagination.limit) if pagination.limit != None else stmt
+            if vessel_id is not None:
+                stmt=stmt.where(sql_model.Vessel.id==vessel_id)
+            
+            
+        return [ResponseMetricsVesselVisitingTimeByZoneSchema(
+                    vessel=VesselListView(**VesselRepository.map_to_domain(model[0]).model_dump()),
+                    zone=ZoneListView(**ZoneRepository.map_to_domain(model[1]).model_dump()),
+                    vessel_visiting_time_by_zone=model[2]) for model in session.execute(stmt).all()]
+
+
     def getVesselVisitsByActivityType(self,
                                         vessel_id: int,
                                         activity_type: TotalTimeActivityTypeRequest,
@@ -155,12 +255,15 @@ def getVesselVisitsByActivityType(self,
                         func.sum(sql_model.Excursion.total_time_at_sea).label("total_activity_time")
                         )\
                 .select_from(sql_model.Excursion)\
+                .where(sql_model.Excursion.vessel_id == vessel_id)\
                 .where(
-                and_(sql_model.Excursion.vessel_id == vessel_id,
-                    or_(
-                        sql_model.Excursion.departure_at.between(datetime_range.start_at,datetime_range.end_at),
-                        sql_model.Excursion.arrival_at.between(datetime_range.start_at,datetime_range.end_at),))
-                )\
+                        and_(
+                            sql_model.Excursion.departure_at <= datetime_range.end_at,
+                            or_(sql_model.Excursion.arrival_at>= datetime_range.start_at,
+                                sql_model.Excursion.arrival_at == None
+                            )
+                        )
+                    )\
                 .group_by(sql_model.Excursion.vessel_id)\
                 .union(select(
                     literal_column(vessel_id),
diff --git a/backend/bloom/tasks/create_update_excursions_segments.py b/backend/bloom/tasks/create_update_excursions_segments.py
index 1411a5da..3f97bb27 100644
--- a/backend/bloom/tasks/create_update_excursions_segments.py
+++ b/backend/bloom/tasks/create_update_excursions_segments.py
@@ -17,7 +17,9 @@
 from bloom.logger import logger
 from bloom.domain.rel_segment_zone import RelSegmentZone
 from bloom.infra.repositories.repository_rel_segment_zone import RelSegmentZoneRepository
-#from bloom.infra.repositories.repository_port import PortRepository
+from bloom.infra.repositories.repository_port import PortRepository
+from bloom.domain.metrics import Metrics #1
+
 warnings.filterwarnings("ignore")
 
 # minimal distance to consider a vessel being in a port (in meters)
@@ -101,7 +103,8 @@ def run():
     vessel_position_repository = use_cases.vessel_position_repository()
     port_repository = use_cases.port_repository()
     excursion_repository = use_cases.excursion_repository()
-
+    metrics_repository = use_cases.metrics_repository() #1
+    metrics_repository = use_cases.metrics_repository() #1
     nb_created_excursion = 0
     nb_closed_excursion = 0
 
@@ -307,30 +310,62 @@ def get_time_of_departure():
         new_rels = []
         excursions = {}
         segments = []
+        new_metricss=[]
+        new_metricss=[]
         max_created_updated = point_in_time
+        i=0
         for segment, zones in result.items():
             segment_in_zone = False
+            vessel_attributes= segment_repository.get_vessel_attribute_by_segment_created_updated_after(session, segment.id, point_in_time)#metrics_repository.get_vessel_excursion_segment_by_id(session,segment.id) #1
+            types='AT_SEA'
+            zones_names=[]
             for zone in zones:
                 if segment.type == "DEFAULT_AIS":
                     # Issue 234: ne pas créer les relations pour les segments en default AIS
+                    types='DEFAULT_AIS'
                     continue
                 segment_in_zone = True
                 new_rels.append(RelSegmentZone(segment_id=segment.id, zone_id=zone.id))
                 if zone.category == "amp":
                     segment.in_amp_zone = True
+                    types='in_amp'
                 elif zone.category == "Fishing coastal waters (6-12 NM)":
-                    country_iso3 = segment_repository.get_vessel_attribute_by_segment_created_updated_after(session, segment.id, point_in_time)
+                    country_iso3 = vessel_attributes.country_iso3#df.loc[0, "vessel_country_iso3"]
                     beneficiaries = zone.json_data.get("beneficiaries", [])
                     if country_iso3 not in beneficiaries:
                         segment.in_zone_with_no_fishing_rights = True
+                        types='in_zone_with_no_fishing_rights'
                 elif zone.category == "Clipped territorial seas":
-                    country_iso3 = segment_repository.get_vessel_attribute_by_segment_created_updated_after(session, segment.id, point_in_time)
+                    country_iso3 = vessel_attributes.country_iso3#df.loc[0, "vessel_country_iso3"]
                     if country_iso3 != "FRA":
                         segment.in_zone_with_no_fishing_rights = True
+                        types='in_zone_with_no_fishing_rights'
                 elif zone.category == "Territorial seas":
                     segment.in_territorial_waters = True
+                    types="in_territorial_water" #1
+                #elif zone.category == "white zone":    #prospectif
+                #    segment.in_white_zone = True
+                #    types="white_zone"  
+                duration_total_seconds = segment.segment_duration.total_seconds()
+
+                new_metrics= Metrics(#1
+                    timestamp = segment.timestamp_start, #1
+                    vessel_id = vessel_attributes.id,#df.loc[0, 'vessel_id'] if not df.empty else None, #1
+                    vessel_mmsi = vessel_attributes.mmsi,#df.loc[0,'vessel_mmsi'] if not df.empty else None, #1
+                    ship_name = vessel_attributes.ship_name,#df.loc[0,'ship_name'] if not df.empty else None, #1
+                    vessel_country_iso3=vessel_attributes.country_iso3,# df.loc[0,'vessel_country_iso3'] if not df.empty else None,
+                    vessel_imo=vessel_attributes.imo,#df.loc[0,'vessel_imo'] if not df.empty else None,
+                    type = types, #1
+                    duration_total = duration_total_seconds, #fonctionne si 1 segment = zone max #1
+                    duration_fishing = duration_total_seconds if segment.type == 'FISHING' else None, #1
+                    zone_name = zone.name,#1
+                    zone_sub_category=zone.sub_category
+                ) #1
             if segment_in_zone:
                 segments.append(segment)
+
+                new_metricss.append(new_metrics) #1
+
             # Mise à jour de l'excursion avec le temps passé dans chaque type de zone
             excursion = excursions.get(segment.excursion_id,
                                        excursion_repository.get_excursion_by_id(session, segment.excursion_id))
@@ -377,6 +412,8 @@ def get_time_of_departure():
         logger.info(f"{len(segments)} segments mis à jour")
         RelSegmentZoneRepository.batch_create_rel_segment_zone(session, new_rels)
         logger.info(f"{len(new_rels)} associations(s) créées")
+        metrics_repository.batch_create_metrics(session, new_metricss) #1
+        logger.info(f"{len(new_metricss)} metrics(s) créés") #1
         vessels_ids = set(exc.vessel_id for exc in excursions.values())
         nb_last = segment_repository.update_last_segments(session, vessels_ids)
         logger.info(f"{nb_last} derniers segments mis à jour")
diff --git a/backend/bloom/tasks/load_dim_zone_amp_from_csv.py b/backend/bloom/tasks/load_dim_zone_amp_from_csv.py
index 38b9a794..3adbc2a1 100644
--- a/backend/bloom/tasks/load_dim_zone_amp_from_csv.py
+++ b/backend/bloom/tasks/load_dim_zone_amp_from_csv.py
@@ -9,7 +9,7 @@
 from bloom.domain.zone import Zone
 from bloom.logger import logger
 
-FIC_ZONE = ["french_metropolitan_mpas.csv", "fishing_coastal_waters.csv", "territorial_seas.csv"]
+FIC_ZONE = ["french_metropolitan_mpas.csv","fishing_coastal_waters.csv", "territorial_seas.csv","clipped_territorial_seas.csv"]
 
 
 def map_to_domain(row: pd.Series) -> Zone:
diff --git a/backend/bloom/tasks/load_spire_data_from_api.py b/backend/bloom/tasks/load_spire_data_from_api.py
index 4a6ee28c..6948f9bf 100644
--- a/backend/bloom/tasks/load_spire_data_from_api.py
+++ b/backend/bloom/tasks/load_spire_data_from_api.py
@@ -9,6 +9,7 @@
 from bloom.infra.http.spire_api_utils import map_raw_vessels_to_domain
 from bloom.logger import logger
 from pydantic import ValidationError
+from bloom.infra.repositories.repository_task_execution import TaskExecutionRepository
 
 
 def run(dump_path: str) -> None:
@@ -24,9 +25,10 @@ def run(dump_path: str) -> None:
             vessels: list[Vessel] = vessel_repository.get_vessels_list(session)
             if len(vessels) > 0:
                 raw_vessels = spire_traffic_usecase.get_raw_vessels_from_spire(vessels)
+                current_datetime=datetime.now(timezone.utc)
                 if dump_path is not None:
                     try:
-                        now = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%S")
+                        now =current_datetime.strftime("%Y-%m-%dT%H:%M:%S")
                         dump_file = Path(args.dump_path, f"spire_{now}").with_suffix(".json")
                         with dump_file.open("wt") as handle:
                             json.dump(raw_vessels, handle)
@@ -38,6 +40,9 @@ def run(dump_path: str) -> None:
                         spire_ais_data,
                         session,
                     )
+                    TaskExecutionRepository.set_point_in_time(session,
+                                                              "load_spire_data_from_api",
+                                                              current_datetime)
                 session.commit()
     except ValidationError as e:
         logger.error("Erreur de validation des données JSON")
diff --git a/frontend/.env.local b/frontend/.env.local
deleted file mode 100644
index 1152a549..00000000
--- a/frontend/.env.local
+++ /dev/null
@@ -1,5 +0,0 @@
-NEXT_PUBLIC_MAPTILER_TO=3IWed9ZbNv0p8UVD6Ogv
-NEXT_PUBLIC_DOMAIN=http://localhost:3000
-
-NEXT_PUBLIC_BACKEND_BASE_URL=http://localhost:8000/api/v1
-NEXT_PUBLIC_BACKEND_API_KEY=bloom
\ No newline at end of file
diff --git a/frontend/.gitignore b/frontend/.gitignore
index 6165e9f6..f34b6d03 100644
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -28,6 +28,7 @@ yarn-error.log*
 .env.development.local
 .env.test.local
 .env.production.local
+.env.local
 
 # turbo
 .turbo
@@ -35,4 +36,5 @@ yarn-error.log*
 .contentlayer
 .env
 
-package-lock.json
\ No newline at end of file
+package-lock.json
+.clever.json
\ No newline at end of file
diff --git a/frontend/.vscode/settings.json b/frontend/.vscode/settings.json
new file mode 100644
index 00000000..82c07764
--- /dev/null
+++ b/frontend/.vscode/settings.json
@@ -0,0 +1,21 @@
+{
+  "files.autoSave": "onWindowChange",
+  "editor.tabSize": 2,
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[html]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[css]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  }
+}
diff --git a/frontend/README.md b/frontend/README.md
index 7a260a2e..ec150e63 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -11,7 +11,7 @@ npx create-next-app -e https://github.com/shadcn/next-template
 ## Features
 
 - Next.js 13 App Directory
-- [Radix UI]() Primitives
+- [Shadcn UI](https://ui.shadcn.com/)
 - [Tailwind CSS](https://tailwindcss.com/docs/installation)
 - Icons from [Lucide](https://lucide.dev) and [Heroicons](https://heroicons.com/)
 - Dark mode with `next-themes`
@@ -22,13 +22,13 @@ npx create-next-app -e https://github.com/shadcn/next-template
 
 ## Getting started
 
-1. First unzip all archives in `./public/data/geometries` folder
+- First unzip all archives in `./public/data/geometries` folder
 
-```shell
-gunzip *.gz
-```
+  ```shell
+  gunzip *.gz
+  ```
 
-2. Then as usual, install dependencies and start dev server
+- Then as usual, install dependencies and start dev server
 
 ```shell
 npm install
@@ -40,6 +40,15 @@ npm run dev
 For now, GeoJSON files are served via a public endpoint provided by NextJS. Soon, this will be moved to NextJS server routes to enhance caching.
 Some geographic features will be displayed as DeckGL GeoJsonLayer in this first version but to enhance vizualization performance these static layers (e.g harbour locations, marine protected areas... and even historic vessels tracks) should be served as vector tiles for example with [PMTiles](https://docs.protomaps.com/pmtiles/) files stored in the cloud (a MinIO instance for example). PMTiles suuport in DeckGL [should be evaluated](https://github.com/visgl/deck.gl/discussions/7861), MVT/MBTiles [are already supported](https://deck.gl/docs/api-reference/geo-layers/mvt-layer).
 
+## Clever Cloud
+
+Deploy with Clever Cloud:
+
+```bash
+cd frontend
+clever deploy -f
+```
+
 ## License
 
 Licensed under the [MIT license](https://github.com/shadcn/ui/blob/main/LICENSE.md).
diff --git a/frontend/app/api/login/route.ts b/frontend/app/api/login/route.ts
new file mode 100644
index 00000000..ed1c3cb2
--- /dev/null
+++ b/frontend/app/api/login/route.ts
@@ -0,0 +1,21 @@
+import { cookies } from "next/headers"
+import { NextResponse } from "next/server"
+
+export async function POST(request: Request) {
+  const { password } = await request.json()
+
+  if (password === process.env.APP_PASSWORD) {
+    const cookieStore = cookies()
+
+    cookieStore.set("auth-token", "authenticated", {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === "production",
+      sameSite: "lax",
+      expires: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000), // 7 days
+    })
+
+    return new NextResponse("Logged in", { status: 200 })
+  }
+
+  return new NextResponse("Invalid password", { status: 401 })
+}
diff --git a/frontend/app/api/logout/route.ts b/frontend/app/api/logout/route.ts
new file mode 100644
index 00000000..a947c8e2
--- /dev/null
+++ b/frontend/app/api/logout/route.ts
@@ -0,0 +1,16 @@
+import { cookies } from "next/headers"
+import { NextResponse } from "next/server"
+
+export async function POST(request: Request) {
+  const cookieStore = cookies()
+
+  // Remove the auth cookie by setting it to expire immediately
+  cookieStore.set("auth-token", "", {
+    httpOnly: true,
+    secure: process.env.NODE_ENV === "production",
+    sameSite: "lax",
+    expires: new Date(0), // Setting to past date effectively deletes the cookie
+  })
+
+  return new NextResponse("Logged out", { status: 200 })
+}
diff --git a/frontend/app/api/vessels/positions/route.ts b/frontend/app/api/vessels/positions/route.ts
new file mode 100644
index 00000000..8c3ad7ef
--- /dev/null
+++ b/frontend/app/api/vessels/positions/route.ts
@@ -0,0 +1,15 @@
+import { NextResponse } from "next/server"
+import { getVesselsLatestPositions } from "@/services/backend-rest-client"
+
+export async function GET() {
+  try {
+    const response = await getVesselsLatestPositions()
+    return NextResponse.json(response?.data)
+  } catch (error) {
+    console.error(
+      "An error occurred while fetching vessels latest positions:",
+      error
+    )
+    return NextResponse.json([], { status: 500 })
+  }
+}
diff --git a/frontend/app/api/vessels/route.ts b/frontend/app/api/vessels/route.ts
new file mode 100644
index 00000000..8a55496b
--- /dev/null
+++ b/frontend/app/api/vessels/route.ts
@@ -0,0 +1,12 @@
+import { NextResponse } from "next/server"
+import { getVessels } from "@/services/backend-rest-client"
+
+export async function GET() {
+  try {
+    const response = await getVessels()
+    return NextResponse.json(response?.data)
+  } catch (error) {
+    console.error("An error occurred while fetching vessels:", error)
+    return NextResponse.json([], { status: 500 })
+  }
+}
diff --git a/frontend/app/api/zones/route.ts b/frontend/app/api/zones/route.ts
new file mode 100644
index 00000000..dd2d7bba
--- /dev/null
+++ b/frontend/app/api/zones/route.ts
@@ -0,0 +1,12 @@
+import { NextResponse } from "next/server"
+import { getZones } from "@/services/backend-rest-client"
+
+export async function GET() {
+  try {
+    const response = await getZones()
+    return NextResponse.json(response?.data)
+  } catch (error) {
+    console.error("Error fetching zones:", error)
+    return NextResponse.json([], { status: 500 })
+  }
+}
diff --git a/frontend/app/dashboard/page.tsx b/frontend/app/dashboard/page.tsx
index 38b356f9..e04fb377 100644
--- a/frontend/app/dashboard/page.tsx
+++ b/frontend/app/dashboard/page.tsx
@@ -1,84 +1,53 @@
-import DashboardHeader from "@/components/dashboard/dashboard-header"
-import DashboardOverview from "@/components/dashboard/dashboard-overview"
-
-import { getTopVesselsInActivity, getTopZonesVisited } from "@/services/backend-rest-client"
-import { format } from "@/libs/dateUtils";
+"use client"
 
-const DAYS_SINCE_TODAY = 360
-const TOP_ITEMS_SIZE = 5
+import { useMemo, useState } from "react"
+import { useDashboardData } from "@/services/dashboard.service"
 
-async function fetchTopVesselsInActivity() {
-  try {
-    let today = new Date();
-    let startAt = new Date(new Date().setDate(today.getDate() - DAYS_SINCE_TODAY));
-    const response = await getTopVesselsInActivity(format(startAt), format(today), TOP_ITEMS_SIZE);
-    return response?.data;
-    
-  } catch(error) {
-    console.log("An error occured while fetching top vessels in activity : " + error)
-    return [];
-  }
-}
-
-async function fetchTopAmpsVisited() {
-  try {
-    let today = new Date();
-    let startAt = new Date(new Date().setDate(today.getDate() - DAYS_SINCE_TODAY));
-    const response = await getTopZonesVisited(format(startAt), format(today), TOP_ITEMS_SIZE);
-    return response?.data;
-    
-  } catch(error) {
-    console.log("An error occured while fetching top amps visited: " + error)
-    return [];
-  }
-}
+import { getDateRange } from "@/libs/dateUtils"
+import DashboardHeader from "@/components/dashboard/dashboard-header"
+import DashboardOverview from "@/components/dashboard/dashboard-overview"
 
-async function fetchTotalVesselsInActivity() {
-  try {
-    let today = new Date();
-    let startAt = new Date(new Date().setDate(today.getDate() - DAYS_SINCE_TODAY));
-    // TODO(CT): replace with new endpoint (waiting for Hervé)
-    const response = await getTopVesselsInActivity(format(startAt), format(today), 10000); // high value to capture all data
-    return response?.data?.length;
-    
-  } catch(error) {
-    console.log("An error occured while fetching top amps visited: " + error)
-    return 0;
-  }
-}
+export default function DashboardPage() {
+  const [selectedDays, setSelectedDays] = useState(7)
+  const { startAt, endAt } = useMemo(() => {
+    return getDateRange(selectedDays)
+  }, [selectedDays])
 
-async function fetchTotalAmpsVisited() {
-  try {
-    let today = new Date();
-    let startAt = new Date(new Date().setDate(today.getDate() - DAYS_SINCE_TODAY));
-        // TODO(CT): replace with new endpoint (waiting for Hervé)
-    const response = await getTopZonesVisited(format(startAt), format(today), 10000); // high value to capture all data
-    return response?.data?.length;
-    
-  } catch(error) {
-    console.log("An error occured while fetching top amps visited: " + error)
-    return 0;
-  }
-}
+  const {
+    topVesselsInActivity,
+    topAmpsVisited,
+    totalVesselsInActivity,
+    totalAmpsVisited,
+    totalVesselsTracked,
+    isLoading,
+  } = useDashboardData(startAt, endAt)
 
-export default async function DashboardPage() {
-  const topVesselsInActivity = await fetchTopVesselsInActivity();
-  const topAmpsVisited = await fetchTopAmpsVisited();
-  const totalVesselsInActivity = await fetchTotalVesselsInActivity();
-  const totalAmpsVisited = await fetchTotalAmpsVisited();
+  console.log("totalVesselsTracked", totalVesselsTracked)
 
   return (
-    <section className="h-svh bg-color-3 px-6">
-      <div className="block h-1/6 w-full">
-        <DashboardHeader />
-      </div>
-
-      <div className="h-5/6 w-full">
-        <DashboardOverview 
-          topVesselsInActivity={topVesselsInActivity}
-          topAmpsVisited={topAmpsVisited}
-          totalVesselsActive={totalVesselsInActivity}
-          totalAmpsVisited={totalAmpsVisited} />
+    <section className="flex h-full items-center justify-center overflow-auto bg-color-3 p-2 2xl:p-4">
+      <div className="flex size-full max-w-screen-xl flex-col gap-2 2xl:gap-4">
+        <div className="block h-[45px] w-full">
+          <DashboardHeader />
+        </div>
+
+        <div className="size-full">
+          <DashboardOverview
+            topVesselsInActivity={topVesselsInActivity}
+            topAmpsVisited={topAmpsVisited}
+            totalVesselsActive={totalVesselsInActivity}
+            totalAmpsVisited={totalAmpsVisited}
+            totalVesselsTracked={totalVesselsTracked}
+            onDateRangeChange={(value) => {
+              setSelectedDays(Number(value))
+            }}
+            topVesselsInActivityLoading={isLoading.topVesselsInActivity}
+            topAmpsVisitedLoading={isLoading.topAmpsVisited}
+            totalVesselsActiveLoading={isLoading.totalVesselsInActivity}
+            totalAmpsVisitedLoading={isLoading.totalAmpsVisited}
+            totalVesselsTrackedLoading={isLoading.totalVesselsTracked}
+          />
+        </div>
       </div>
     </section>
   )
diff --git a/frontend/app/details/amp/[id]/page.tsx b/frontend/app/details/amp/[id]/page.tsx
index 582a9e63..5d024935 100644
--- a/frontend/app/details/amp/[id]/page.tsx
+++ b/frontend/app/details/amp/[id]/page.tsx
@@ -1,9 +1,61 @@
-import mockData from "@/public/data/mock-data-details.json"
+"use client"
 
+import { useMemo, useState } from "react"
+import { getZoneDetails } from "@/services/backend-rest-client"
+import { swrOptions } from "@/services/swr"
+import { getCountryNameFromIso3 } from "@/utils/vessel.utils"
+import useSWR from "swr"
+
+import { convertDurationInHours, getDateRange } from "@/libs/dateUtils"
 import DetailsContainer from "@/components/details/details-container"
 
-export default function AmpDetailsPage() {
-  const ampDetails = mockData["ampDetails"]
+export default function AmpDetailsPage({ params }: { params: { id: string } }) {
+  const [selectedDays, setSelectedDays] = useState(7)
+
+  const { startAt, endAt } = useMemo(() => {
+    return getDateRange(selectedDays)
+  }, [selectedDays])
+
+  const { data: zoneVisits = [], isLoading } = useSWR(
+    [params.id, startAt, endAt],
+    () => getZoneDetails(params.id, startAt, endAt).then((res) => res.data),
+    swrOptions
+  )
+
+  const zoneDetails = useMemo(() => {
+    if (!zoneVisits[0]) {
+      return null
+    }
+
+    const { zone } = zoneVisits[0]
+    return {
+      id: zone.id.toString(),
+      label: zone.name,
+      description: zone.sub_category,
+      relatedItemsType: "Vessels",
+      relatedItems: zoneVisits.map((visit) => {
+        const { vessel, zone_visiting_time_by_vessel } = visit
+        return {
+          id: vessel.id.toString(),
+          title: `${vessel.ship_name} - ${getCountryNameFromIso3(vessel.country_iso3)}`,
+          description: `IMO: ${vessel.imo} - MMSI: ${vessel.mmsi} - Type: ${vessel.type} - Length: ${vessel.length} m`,
+          value: `${convertDurationInHours(zone_visiting_time_by_vessel)}h`,
+          type: "vessels",
+        }
+      }),
+    }
+  }, [zoneVisits])
 
-  return <DetailsContainer details={ampDetails} />
+  return (
+    <div className="h-screen">
+      <DetailsContainer
+        details={zoneDetails}
+        onDateRangeChange={(value) => {
+          setSelectedDays(Number(value))
+        }}
+        defaultDateRange={"7"}
+        isLoading={isLoading}
+      />
+    </div>
+  )
 }
diff --git a/frontend/app/details/layout.tsx b/frontend/app/details/layout.tsx
index 4b81a286..804c41d1 100644
--- a/frontend/app/details/layout.tsx
+++ b/frontend/app/details/layout.tsx
@@ -6,9 +6,11 @@ interface RootLayoutProps {
 
 export default function Layout({ children }: RootLayoutProps) {
   return (
-    <div className="h-svh bg-color-2">
+    <div className="relative h-full">
       <BackNavigator />
-      <div className="pl-20 pr-2 pt-24">{children}</div>
+      <div className="mx-auto flex max-w-[90%] flex-col justify-center">
+        {children}
+      </div>
     </div>
   )
 }
diff --git a/frontend/app/details/vessel/[id]/page.tsx b/frontend/app/details/vessel/[id]/page.tsx
index 1359fa8f..db01e0bb 100644
--- a/frontend/app/details/vessel/[id]/page.tsx
+++ b/frontend/app/details/vessel/[id]/page.tsx
@@ -1,9 +1,11 @@
-import mockData from "@/public/data/mock-data-details.json"
-
 import DetailsContainer from "@/components/details/details-container"
 
-export default function VesselDetailsPage() {
-  const vesselDetails = mockData["vesselDetails"]
+export default async function VesselDetailsPage({
+  params,
+}: {
+  params: { id: string }
+}) {
+  // const vesselDetails = await getVesselDetails(params.id)
 
-  return <DetailsContainer details={vesselDetails} />
+  return
 }
diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx
index 0a602642..76c39297 100644
--- a/frontend/app/layout.tsx
+++ b/frontend/app/layout.tsx
@@ -48,7 +48,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
           />
         </head>
         <body className="relative flex h-screen min-h-screen w-full flex-row font-unito antialiased">
-          <ThemeProvider attribute="class" defaultTheme="light">
+          <ThemeProvider attribute="class" defaultTheme="dark">
             <main className="flex-1 flex-col">{children}</main>
           </ThemeProvider>
         </body>
diff --git a/frontend/app/loading.tsx b/frontend/app/loading.tsx
new file mode 100644
index 00000000..95a9dde4
--- /dev/null
+++ b/frontend/app/loading.tsx
@@ -0,0 +1,15 @@
+import Image from "next/image"
+
+export default function Loading() {
+  return (
+    <div className="fixed inset-0 flex items-center justify-center bg-background">
+      <Image
+        src="/icons/boat-animated.svg"
+        alt="Loading animation"
+        width={100}
+        height={100}
+        priority
+      />
+    </div>
+  )
+}
diff --git a/frontend/app/login/page.tsx b/frontend/app/login/page.tsx
new file mode 100644
index 00000000..70003c2b
--- /dev/null
+++ b/frontend/app/login/page.tsx
@@ -0,0 +1,79 @@
+"use client"
+
+import { useState } from "react"
+import Image from "next/image"
+import { useRouter } from "next/navigation"
+
+import { Button } from "@/components/ui/button"
+import { Card, CardContent } from "@/components/ui/card"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+
+export default function Login() {
+  const router = useRouter()
+  const [password, setPassword] = useState("")
+  const [error, setError] = useState("")
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault()
+    setError("")
+
+    try {
+      const response = await fetch("/api/login", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ password }),
+      })
+
+      if (response.ok) {
+        router.push("/dashboard") // or wherever you want to redirect after login
+      } else {
+        setError("Invalid password")
+      }
+    } catch (err) {
+      setError("An error occurred. Please try again.")
+    }
+  }
+
+  return (
+    <div className="flex min-h-screen items-center justify-center bg-background">
+      <div className="grid h-[400px] w-full max-w-3xl overflow-hidden rounded-lg bg-card md:grid-cols-2">
+        <div className="relative h-full">
+          <Image
+            src="/img/login-cover.jpg"
+            alt="Login waves visual"
+            fill
+            className="object-cover"
+            priority
+            quality={85}
+            sizes="(max-width: 768px) 100vw, 50vw"
+          />
+        </div>
+        <form
+          onSubmit={handleSubmit}
+          className="flex size-full  flex-col items-center justify-between space-y-4 p-8"
+        >
+          <div className="mb-6 space-y-2 text-center">
+            <h1 className="text-2xl font-bold">Welcome to TrawlWatch</h1>
+          </div>
+          <div className="space-y-2">
+            <p>Enter your password to access your account</p>
+
+            <Input
+              id="password"
+              type="password"
+              className="w-full bg-white"
+              value={password}
+              onChange={(e) => setPassword(e.target.value)}
+              required
+            />
+            {error && <p className=" text-sm text-red-500">{error}</p>}
+          </div>
+          <Button type="submit" className="w-full">
+            Log in
+          </Button>
+        </form>
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/app/map/page.tsx b/frontend/app/map/page.tsx
index b5b07611..f2f43b46 100644
--- a/frontend/app/map/page.tsx
+++ b/frontend/app/map/page.tsx
@@ -1,44 +1,105 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import {
+  getVessels,
+  getVesselsLatestPositions,
+} from "@/services/backend-rest-client"
+
+import { Vessel, VesselPosition } from "@/types/vessel"
+import { ZoneWithGeometry } from "@/types/zone"
+import Spinner from "@/components/ui/custom/spinner"
 import LeftPanel from "@/components/core/left-panel"
 import MapControls from "@/components/core/map-controls"
-import DemoMap from "@/components/core/map/main-map"
+import Map from "@/components/core/map/main-map"
 import PositionPreview from "@/components/core/map/position-preview"
-import { getVessels, getVesselsLatestPositions } from "@/services/backend-rest-client"
 
 async function fetchVessels() {
   try {
-      const response = await getVessels();
-      return response?.data;
-
-    } catch(error) {
-      console.log("An error occured while fetching vessels: " + error)
-      return [];
-    }
+    const response = await fetch("/api/vessels", {
+      cache: "force-cache",
+    })
+    return await response.json()
+  } catch (error) {
+    console.log("An error occurred while fetching vessels: " + error)
+    return []
+  }
 }
 
-// TODO(CT): move this logic within a cron job
-async function fetchLatestPositions() {
+async function fetchZones() {
   try {
-    const response = await getVesselsLatestPositions();
-    return response?.data;
-    
-  } catch(error) {
-    console.log("An error occured while fetching vessels latest positions: " + error)
-    return [];
+    const response = await fetch("/api/zones", {
+      cache: "force-cache",
+    })
+    return await response.json()
+  } catch (error) {
+    console.error("An error occurred while fetching zones:", error)
+    return []
   }
 }
-  
-export default async function MapPage() {
-  const vessels = await fetchVessels();
-  const latestPositions = await fetchLatestPositions();
 
-  // TODO: create new client component dedicated to update store 
-  // -> then Map + LeftPanel can just use storeProvider
+export default function MapPage() {
+  const [vessels, setVessels] = useState<Vessel[]>([])
+  const [latestPositions, setLatestPositions] = useState<VesselPosition[]>([])
+  const [zones, setZones] = useState<ZoneWithGeometry[]>([])
+  const [isLoadingVessels, setIsLoadingVessels] = useState(true)
+  const [isLoadingPositions, setIsLoadingPositions] = useState(true)
+  const [isLoadingZones, setIsLoadingZones] = useState(true)
+
+  useEffect(() => {
+    const loadVessels = async () => {
+      const vesselsData = await fetchVessels()
+      setVessels(vesselsData)
+      setIsLoadingVessels(false)
+    }
+    loadVessels()
+  }, [])
+
+  useEffect(() => {
+    const loadPositions = async () => {
+      const response = await fetch("/api/vessels/positions", {
+        cache: "force-cache",
+        next: { revalidate: 900 }, // 15 minutes
+      })
+      const positionsData = await response.json()
+      setLatestPositions(positionsData)
+      setIsLoadingPositions(false)
+    }
+    loadPositions()
+  }, [])
+
+  useEffect(() => {
+    const loadZones = async () => {
+      const zonesData = await fetchZones()
+      setZones(zonesData)
+      setIsLoadingZones(false)
+    }
+    if (zones.length === 0) {
+      loadZones()
+    }
+  }, [isLoadingZones, zones.length])
+
+  const isLoading = isLoadingVessels || isLoadingPositions || isLoadingZones
+
   return (
     <>
-      <LeftPanel vessels={vessels} />
-      <DemoMap vesselsPositions={latestPositions} />
+      <LeftPanel vessels={vessels} isLoading={isLoadingVessels} />
+      <Map
+        vesselsPositions={latestPositions}
+        zones={zones}
+        isLoading={{
+          vessels: isLoadingVessels,
+          positions: isLoadingPositions,
+          zones: isLoadingZones,
+        }}
+      />
       <MapControls />
       <PositionPreview />
+      {isLoading && (
+        <div className="absolute bottom-10 left-5">
+          <Spinner className="text-white" />
+        </div>
+      )}
     </>
   )
 }
diff --git a/frontend/components/core/command/vessel-finder.tsx b/frontend/components/core/command/vessel-finder.tsx
index e6649b36..ab2deaba 100644
--- a/frontend/components/core/command/vessel-finder.tsx
+++ b/frontend/components/core/command/vessel-finder.tsx
@@ -1,6 +1,7 @@
 "use client"
 
 import { useState } from "react"
+import { getVesselFirstExcursionSegments } from "@/services/backend-rest-client"
 import { FlyToInterpolator } from "deck.gl"
 
 import { Vessel, VesselPosition } from "@/types/vessel"
@@ -15,7 +16,6 @@ import {
 } from "@/components/ui/command"
 import { useMapStore } from "@/components/providers/map-store-provider"
 import { useVesselsStore } from "@/components/providers/vessels-store-provider"
-import { getVesselFirstExcursionSegments } from "@/services/backend-rest-client"
 
 type Props = {
   wideMode: boolean
@@ -33,14 +33,14 @@ export function VesselFinderDemo({ wideMode }: Props) {
     viewState,
     setViewState,
   } = useMapStore((state) => state)
-  const { vessels: allVessels } = useVesselsStore((state) => state);
-  const { latestPositions } = useMapStore((state) => state);
+  const { vessels: allVessels } = useVesselsStore((state) => state)
+  const { latestPositions } = useMapStore((state) => state)
 
   const onSelectVessel = async (vesselIdentifier: string) => {
     const vesselId = parseInt(vesselIdentifier.split(SEPARATOR)[3])
-    const response = await getVesselFirstExcursionSegments(vesselId);
+    const response = await getVesselFirstExcursionSegments(vesselId)
     if (vesselId && !trackedVesselIDs.includes(vesselId)) {
-      addTrackedVessel(vesselId, response.data);
+      addTrackedVessel(vesselId, response)
     }
     if (vesselId) {
       const selectedVesselLatestPosition = latestPositions.find(
diff --git a/frontend/components/core/left-panel.tsx b/frontend/components/core/left-panel.tsx
index d0797f9c..ed7a321d 100644
--- a/frontend/components/core/left-panel.tsx
+++ b/frontend/components/core/left-panel.tsx
@@ -6,12 +6,13 @@ import TrawlWatchLogo from "@/public/trawlwatch.svg"
 import { ChartBarIcon } from "@heroicons/react/24/outline"
 import { motion, useAnimationControls } from "framer-motion"
 
+import { Vessel } from "@/types/vessel"
 import NavigationLink from "@/components/ui/navigation-link"
 import { VesselFinderDemo } from "@/components/core/command/vessel-finder"
+import { useVesselsStore } from "@/components/providers/vessels-store-provider"
 
+import Spinner from "../ui/custom/spinner"
 import TrackedVesselsPanel from "./tracked-vessels-panel"
-import { useVesselsStore } from "@/components/providers/vessels-store-provider"
-import { Vessel } from "@/types/vessel"
 
 const containerVariants = {
   close: {
@@ -42,24 +43,25 @@ const svgVariants = {
 }
 
 type LeftPanelProps = {
-  vessels: Vessel[];
+  vessels: Vessel[]
+  isLoading: boolean
 }
 
-export default function({ vessels }: LeftPanelProps) {
+export default function LeftPanel({ vessels, isLoading }: LeftPanelProps) {
   const [isOpen, setIsOpen] = useState(false)
   const containerControls = useAnimationControls()
   const svgControls = useAnimationControls()
-  const { setVessels } = useVesselsStore((state) => state);
-  
+  const { setVessels } = useVesselsStore((state) => state)
+
   useEffect(() => {
-    setVessels(vessels);
-  }, [vessels]);
+    setVessels(vessels)
+  }, [setVessels, vessels])
 
   useEffect(() => {
-    const control = isOpen ? "open" : "close";
-    containerControls.start(control);
-    svgControls.start(control);
-  }, [isOpen])
+    const control = isOpen ? "open" : "close"
+    containerControls.start(control)
+    svgControls.start(control)
+  }, [containerControls, isOpen, svgControls])
 
   const handleOpenClose = () => {
     setIsOpen(!isOpen)
@@ -114,7 +116,7 @@ export default function({ vessels }: LeftPanelProps) {
           </NavigationLink>
         </div>
         <div className="flex flex-col gap-3 bg-color-3 p-5">
-          <VesselFinderDemo wideMode={isOpen} />
+          {isLoading ? <Spinner /> : <VesselFinderDemo wideMode={isOpen} />}
         </div>
         <div className="flex flex-col gap-3 overflow-auto bg-color-3 p-5">
           <TrackedVesselsPanel
diff --git a/frontend/components/core/map/main-map.tsx b/frontend/components/core/map/main-map.tsx
index 08d80c75..59c2d7a7 100644
--- a/frontend/components/core/map/main-map.tsx
+++ b/frontend/components/core/map/main-map.tsx
@@ -2,31 +2,52 @@
 
 import "maplibre-gl/dist/maplibre-gl.css"
 
-import { useEffect, useState } from "react"
+import { useEffect, useMemo } from "react"
 import type { PickingInfo } from "@deck.gl/core"
+import { PathStyleExtension } from "@deck.gl/extensions"
 import { GeoJsonLayer } from "@deck.gl/layers"
-import { SimpleMeshLayer } from "@deck.gl/mesh-layers"
 import DeckGL from "@deck.gl/react"
-import { OBJLoader } from "@loaders.gl/obj"
 import chroma from "chroma-js"
-import { FlyToInterpolator, MapViewState, ScatterplotLayer } from "deck.gl"
-import { useTheme } from "next-themes"
+import { IconLayer, Layer, MapViewState, PolygonLayer } from "deck.gl"
 import { renderToString } from "react-dom/server"
 import { Map as MapGL } from "react-map-gl/maplibre"
 
+import {
+  VesselExcursionSegment,
+  VesselExcursionSegmentGeo,
+  VesselExcursionSegments,
+  VesselExcursionSegmentsGeo,
+  VesselPosition,
+  VesselPositions,
+} from "@/types/vessel"
+import { ZoneCategory, ZoneWithGeometry } from "@/types/zone"
 import MapTooltip from "@/components/ui/tooltip-map-template"
+import ZoneMapTooltip from "@/components/ui/zone-map-tooltip"
 import { useMapStore } from "@/components/providers/map-store-provider"
-import { VesselPosition, VesselPositions, VesselExcursionSegmentGeo, VesselExcursionSegmentsGeo, VesselExcursionSegment, VesselExcursionSegments } from "@/types/vessel"
-
-const MESH_URL_LOCAL = `../../../data/mesh/boat.obj`
 
 type CoreMapProps = {
-  vesselsPositions: VesselPositions;
+  vesselsPositions: VesselPositions
+  zones: ZoneWithGeometry[]
+  isLoading: {
+    vessels: boolean
+    positions: boolean
+    zones: boolean
+  }
 }
 
-export default function CoreMap({ vesselsPositions }: CoreMapProps) {
-  const { setTheme, theme } = useTheme()
+const VESSEL_COLOR = [16, 181, 16, 210]
+const TRACKED_VESSEL_COLOR = [128, 16, 189, 210]
+
+// Add a type to distinguish zones
+type ZoneWithType = ZoneWithGeometry & {
+  renderType: "amp" | "territorial" | "fishing"
+}
 
+export default function CoreMap({
+  vesselsPositions,
+  zones,
+  isLoading,
+}: CoreMapProps) {
   const {
     viewState,
     setViewState,
@@ -37,131 +58,171 @@ export default function CoreMap({ vesselsPositions }: CoreMapProps) {
     setLatestPositions,
   } = useMapStore((state) => state)
 
-  // Use a piece of state that changes when `activePosition` changes to force re-render
-  const [layerKey, setLayerKey] = useState(0)
-
   function getColorFromValue(value: number): [number, number, number] {
     const scale = chroma.scale(["yellow", "red", "black"]).domain([0, 15])
     const color = scale(value).rgb()
     return [Math.round(color[0]), Math.round(color[1]), Math.round(color[2])]
   }
 
-  useEffect(() => {
-    // This will change the key of the layer, forcing it to re-render when `activePosition` changes
-    setLayerKey((prevKey) => prevKey + 1)
-  }, [activePosition, trackedVesselIDs])
+  const isVesselSelected = (vp: VesselPosition) => {
+    return (
+      vp.vessel.id === activePosition?.vessel.id ||
+      trackedVesselIDs.includes(vp.vessel.id)
+    )
+  }
+
+  // useEffect(() => {
+  //   // This will change the key of the layer, forcing it to re-render when `activePosition` changes
+  //   setLayerKey((prevKey) => prevKey + 1)
+  // }, [activePosition, trackedVesselIDs])
 
   useEffect(() => {
-    setLatestPositions(vesselsPositions);
-  }, [vesselsPositions])
+    setLatestPositions(vesselsPositions)
+  }, [setLatestPositions, vesselsPositions])
+
+  const onMapClick = ({ layer }: PickingInfo) => {
+    if (layer?.id !== 'vessels-latest-positions') {
+      setActivePosition(null);
+    }
+  }
 
-  const latestPositions = new ScatterplotLayer<VesselPosition>({
-    id: `vessels-latest-positions-${layerKey}`,
+  const onVesselClick = ({ object }: PickingInfo) => {
+    setActivePosition(object as VesselPosition);
+  }
+
+  const onZoneClick = () => {
+    return;
+  }
+
+  const latestPositions = new IconLayer<VesselPosition>({
+    id: `vessels-latest-positions`,
     data: vesselsPositions,
     getPosition: (vp: VesselPosition) => [
       vp?.position?.coordinates[0],
       vp?.position?.coordinates[1],
     ],
-    stroked: true,
-    radiusUnits: "meters",
-    getRadius: (vp: VesselPosition) => vp.vessel.length,
-    radiusMinPixels: 3,
-    radiusMaxPixels: 25,
-    radiusScale: 200,
-    getFillColor: (vp: VesselPosition) => {
-      return vp.vessel.id === activePosition?.vessel.id ||
-        trackedVesselIDs.includes(vp.vessel.id)
-        ? [128, 16, 189, 210]
-        : [16, 181, 16, 210]
+    getAngle: (vp: VesselPosition) => (vp.heading ? Math.round(vp.heading) : 0),
+    getIcon: () => "default",
+    iconAtlas: "../../../img/map-vessel.png",
+    iconMapping: {
+      default: {
+        x: 0,
+        y: 0,
+        width: 35,
+        height: 27,
+        mask: true,
+      },
+    },
+    getSize: 16,
+    getColor: (vp: VesselPosition) => {
+      return new Uint8ClampedArray(
+        isVesselSelected(vp) ? TRACKED_VESSEL_COLOR : VESSEL_COLOR
+      )
     },
-    getLineColor: [0, 0, 0],
-    getLineWidth: 3,
+
     pickable: true,
-    onClick: ({ object }) => {
-      setActivePosition(object as VesselPosition)
-      setViewState({
-        ...viewState,
-        longitude: object?.position?.coordinates[0],
-        latitude: object?.position?.coordinates[1],
-        zoom: 7,
-        pitch: 40,
-        transitionInterpolator: new FlyToInterpolator({ speed: 2 }),
-        transitionDuration: "auto",
-      })
+    onClick: onVesselClick,
+    updateTriggers: {
+      getColor: [activePosition?.vessel.id, trackedVesselIDs],
     },
   })
 
   const tracksByVesselAndVoyage = trackedVesselSegments
-  .map(segments => toSegmentsGeo(segments))
-  .map((segmentsGeo: VesselExcursionSegmentsGeo) => {
-    return new GeoJsonLayer<VesselExcursionSegmentGeo>({
-        id: `${segmentsGeo.vesselId}_vessel_trail_${layerKey}`,
+    .map((segments) => toSegmentsGeo(segments))
+    .map((segmentsGeo: VesselExcursionSegmentsGeo) => {
+      return new GeoJsonLayer<VesselExcursionSegmentGeo>({
+        id: `${segmentsGeo.vesselId}_vessel_trail`,
         data: segmentsGeo,
-        getFillColor: (properties) => getColorFromValue(properties?.speed),
-        getLineColor: (properties) => getColorFromValue(properties?.speed),
+        getFillColor: (feature) => getColorFromValue(feature.properties?.speed),
+        getLineColor: (feature) => getColorFromValue(feature.properties?.speed),
         pickable: false,
-        stroked: false,
-        filled: true,
-        getLineWidth: 1,
+        stroked: true,
+        filled: false,
+        getLineWidth: 0.5,
         lineWidthMinPixels: 0.5,
         lineWidthMaxPixels: 3,
         lineWidthUnits: "pixels",
         lineWidthScale: 2,
         getPointRadius: 4,
         getTextSize: 12,
+      })
     })
-  });
 
-  const positions_mesh_layer = new SimpleMeshLayer({
-    id: `vessels-positions-mesh-layer-${layerKey}`,
-    data: vesselsPositions,
-    mesh: MESH_URL_LOCAL,
-    getPosition: (vp: VesselPosition) => [
-      vp?.position?.coordinates[0],
-      vp?.position?.coordinates[1],
-    ],
-    getColor: (vp: VesselPosition) => {
-      return vp.vessel.id === activePosition?.vessel.id ||
-        trackedVesselIDs.includes(vp.vessel.id)
-        ? [128, 16, 189, 210]
-        : [16, 181, 16, 210]
+  const getObjectType = (
+    object: VesselPosition | ZoneWithGeometry | undefined
+  ) => {
+    if (!object) return null
+    return "vessel" in object ? "vessel" : "zone"
+  }
+
+  const zoneLayer = new PolygonLayer({
+    id: `zones-layer`,
+    data: zones,
+    getPolygon: (d: ZoneWithGeometry) => {
+      // Handle both Polygon and MultiPolygon types
+      if (d.geometry.type === "MultiPolygon") {
+        // Return the first polygon's coordinates for MultiPolygon
+        return d.geometry.coordinates[0]
+      }
+      // For single Polygon, return just the first coordinate ring (outer boundary)
+      return d.geometry.coordinates
     },
-    getOrientation: (vp: VesselPosition) => [
-      0,
-      Math.round(vp.heading ? vp.heading : 0),
-      90,
-    ],
-    getScale: (vp: VesselPosition) => [
-      vp.vessel.length,
-      vp.vessel.length * 1.5,
-      vp.vessel.length / 1.5,
-    ],
-    scaleUnits: "pixels",
-    sizeScale: 100,
-    pickable: true,
-    onClick: ({ object }) => {
-      setActivePosition(object as VesselPosition)
-      setViewState({
-        ...viewState,
-        longitude: object?.position?.coordinates[0],
-        latitude: object?.position?.coordinates[1],
-        zoom: 7,
-        transitionInterpolator: new FlyToInterpolator({ speed: 2 }),
-        transitionDuration: "auto",
-      })
+    getFillColor: (d: ZoneWithGeometry) => {
+      switch (d.category) {
+        case "territorial_seas":
+          return [0, 0, 255, 50]
+        case "fishing_coastal_waters":
+          return [0, 255, 0, 50]
+        case "amp":
+        default:
+          return [255, 0, 0, 50]
+      }
+    },
+    getLineColor: [0, 0, 0, 128], // reduced opacity for borders
+    getLineWidth: 1,
+    lineWidthUnits: "pixels",
+    lineWidthMinPixels: 1,
+    pickable: true, // disable picking if not needed
+    stroked: false,
+    filled: true,
+    wireframe: false, // disable wireframe for better performance
+    extruded: false,
+    parameters: {
+      depthTest: false,
+      blend: true,
+      blendFunc: [770, 771], // standard transparency blending
     },
-    loaders: [OBJLoader],
+    onClick: onZoneClick
   })
 
   const layers = [
-    tracksByVesselAndVoyage,
-    latestPositions,
-    positions_mesh_layer,
-  ]
+    !isLoading.zones && combinedZonesLayer,
+    !isLoading.vessels && !isLoading.positions && tracksByVesselAndVoyage,
+    !isLoading.positions && latestPositions,
+  ].filter(Boolean) as Layer[]
 
-  useEffect(() => {
-    setTheme("light")
-  }, [setTheme])
+  const getTooltip = ({ object }: Partial<PickingInfo<VesselPosition | ZoneWithGeometry>>) => {
+    const objectType = getObjectType(object)
+    const style = {
+      backgroundColor: "#fff",
+      fontSize: "0.8em",
+      borderRadius: "10px",
+      overflow: "hidden",
+      padding: "0px",
+    }
+    let element: React.ReactNode
+    if (objectType === "vessel") {
+      const vesselInfo = object as VesselPosition
+      element = <MapTooltip vesselInfo={vesselInfo} />
+    } else if (objectType === "zone") {
+      const zoneInfo = object as ZoneWithGeometry
+      element = <ZoneMapTooltip zoneInfo={zoneInfo} />
+    }
+    return {
+      html: renderToString(element),
+      style,
+    }
+  }
 
   return (
     <DeckGL
@@ -169,23 +230,19 @@ export default function CoreMap({ vesselsPositions }: CoreMapProps) {
       controller={true}
       layers={layers}
       onViewStateChange={(e) => setViewState(e.viewState as MapViewState)}
-      getTooltip={({ object }: PickingInfo<VesselPosition>) =>
-        object
-          ? {
-              html: renderToString(<MapTooltip vesselInfo={object} />),
-              style: {
-                backgroundColor: "#fff",
-                fontSize: "0.8em",
-                borderRadius: "10px",
-                overflow: "hidden",
-                padding: "0px",
-              },
-            }
-          : null
-      }
+      getCursor={({ isHovering, isDragging }) => {
+        return isDragging ? "move" : isHovering ? "pointer" : "grab"
+      }}
+      onClick={onMapClick}
+      getTooltip={({
+        object,
+      }: PickingInfo<VesselPosition | ZoneWithGeometry>) => {
+        if (!object) return null
+        return getTooltip({ object })
+      }}
     >
       <MapGL
-        mapStyle={`https://api.maptiler.com/maps/bb513c96-848e-4775-b150-437395193f26/style.json?key=${process.env.NEXT_PUBLIC_MAPTILER_TO}`}
+        mapStyle={`https://api.maptiler.com/maps/e9b57486-1b91-47e1-a763-6df391697483/style.json?key=${process.env.NEXT_PUBLIC_MAPTILER_TO}`}
         attributionControl={false}
       ></MapGL>
     </DeckGL>
@@ -200,11 +257,10 @@ function toSegmentsGeo({ segments, vesselId }: VesselExcursionSegments): any {
         type: "LineString",
         coordinates: [
           segment.start_position.coordinates,
-          segment.end_position.coordinates
-        ]
-      } 
+          segment.end_position.coordinates,
+        ],
+      },
     }
   })
-  return { vesselId, type: "FeatureCollection", features: segmentsGeo ?? [] };
+  return { vesselId, type: "FeatureCollection", features: segmentsGeo ?? [] }
 }
-
diff --git a/frontend/components/core/map/preview-card.tsx b/frontend/components/core/map/preview-card.tsx
index 021bb388..dd127241 100644
--- a/frontend/components/core/map/preview-card.tsx
+++ b/frontend/components/core/map/preview-card.tsx
@@ -1,12 +1,12 @@
 import Image from "next/image"
 import Link from "next/link"
+import { getVesselFirstExcursionSegments } from "@/services/backend-rest-client"
 import { XIcon } from "lucide-react"
 
+import { VesselPosition } from "@/types/vessel"
 import { Button } from "@/components/ui/button"
 import IconButton from "@/components/ui/icon-button"
 import { useMapStore } from "@/components/providers/map-store-provider"
-import { VesselPosition } from "@/types/vessel"
-import { getVesselFirstExcursionSegments } from "@/services/backend-rest-client"
 
 export interface PreviewCardTypes {
   vesselInfo: VesselPosition
@@ -19,28 +19,33 @@ const PreviewCard: React.FC<PreviewCardTypes> = ({ vesselInfo }) => {
     trackedVesselIDs,
     removeTrackedVessel,
   } = useMapStore((state) => state)
-  const { vessel: { id: vesselId, mmsi, ship_name, imo, length }, timestamp } = vesselInfo
+  const {
+    vessel: { id: vesselId, mmsi, ship_name, imo, length },
+    timestamp,
+  } = vesselInfo
   const isVesselTracked = (vesselId: number) => {
     return trackedVesselIDs.includes(vesselId)
   }
 
   const handleDisplayTrail = async (vesselId: number) => {
     if (isVesselTracked(vesselId)) {
-      removeTrackedVessel(vesselId);
-      return;
+      removeTrackedVessel(vesselId)
+      return
     }
-    const response = await getVesselFirstExcursionSegments(vesselId);
-    addTrackedVessel(vesselId, response.data);
+    const response = await getVesselFirstExcursionSegments(vesselId)
+    addTrackedVessel(vesselId, response)
   }
   return (
-    <div className="flex w-wrap flex-col rounded-t-lg bg-white shadow hover:bg-gray-100 dark:border-gray-700 dark:bg-gray-800 dark:hover:bg-gray-700 md:max-w-xl md:flex-row">
-      <img
+    <div className="w-wrap flex flex-col rounded-t-lg bg-white shadow hover:bg-gray-100 dark:border-gray-700 dark:bg-gray-800 dark:hover:bg-gray-700 md:max-w-xl md:flex-row">
+      <Image
         className="h-[270px] w-2/5 overflow-hidden rounded-tl-lg object-cover"
         src="/img/scrombus.jpg"
         alt="default fishing vessel image"
+        width={270}
+        height={270}
       />
 
-      <div className="flex grow flex-col px-4 py-2 leading-normal pt-4">
+      <div className="flex grow flex-col px-4 py-2 pt-4 leading-normal">
         <div className="flex w-full flex-row items-center justify-start gap-3">
           <h5 className="text-2xl font-bold tracking-tight text-gray-900 dark:text-white">
             {ship_name}
@@ -65,18 +70,20 @@ const PreviewCard: React.FC<PreviewCardTypes> = ({ vesselInfo }) => {
           <p className="text-gray-700 dark:text-gray-400">
             <span className="font-bold">Last position:</span>
           </p>
-          <p className="mb-1 text-gray-700 dark:text-gray-400">
-            {timestamp}
-          </p>
+          <p className="mb-1 text-gray-700 dark:text-gray-400">{timestamp}</p>
         </section>
         <section id="vessel-actions">
           <Button onClick={() => handleDisplayTrail(vesselId)}>
             {isVesselTracked(vesselId) ? "Hide" : "Display"} track
           </Button>
-          {isVesselTracked(vesselId) && <Link href="#" className="ml-2">Show track details</Link>}
+          {isVesselTracked(vesselId) && (
+            <Link href="#" className="ml-2">
+              Show track details
+            </Link>
+          )}
         </section>
 
-        <div className="absolute right-0 top-0 pt-4 pr-3">
+        <div className="absolute right-0 top-0 pr-3 pt-4">
           <IconButton
             description="Close preview"
             onClick={() => setActivePosition(null)}
diff --git a/frontend/components/core/tracked-vessels-panel.tsx b/frontend/components/core/tracked-vessels-panel.tsx
index 9703337f..6072e16c 100644
--- a/frontend/components/core/tracked-vessels-panel.tsx
+++ b/frontend/components/core/tracked-vessels-panel.tsx
@@ -17,8 +17,10 @@ export default function TrackedVesselsPanel({
   parentIsOpen,
   openParent,
 }: Props) {
-  const { trackedVesselIDs, removeTrackedVessel } = useMapStore((state) => state);
-  const { vessels: allVessels } = useVesselsStore((state) => state);
+  const { trackedVesselIDs, removeTrackedVessel } = useMapStore(
+    (state) => state
+  )
+  const { vessels: allVessels } = useVesselsStore((state) => state)
   const [displayTrackedVessels, setDisplayTrackedVessels] = useState(false)
   const [trackedVesselsDetails, setTrackedVesselsDetails] = useState<Vessel[]>()
 
@@ -34,7 +36,7 @@ export default function TrackedVesselsPanel({
       trackedVesselIDs.includes(vessel.id)
     )
     setTrackedVesselsDetails(vesselsDetails)
-  }, [trackedVesselIDs])
+  }, [allVessels, trackedVesselIDs])
 
   return (
     <>
@@ -53,11 +55,15 @@ export default function TrackedVesselsPanel({
         parentIsOpen &&
         trackedVesselsDetails?.map((vessel: Vessel) => {
           return (
-            <div key={vessel.id} className="mb-1 flex border-b-1 border-color-5 pb-1 text-xs text-slate-400">
+            <div
+              key={vessel.id}
+              className="mb-1 flex border-b-1 border-color-5 pb-1 text-xs text-slate-400"
+            >
               <div className="w-full pr-1">
                 <div className="text-xxs text-white">{vessel.ship_name}</div>
                 <div className="text-xxxs">
-                  IMO {vessel.imo} / MMSI {vessel.mmsi} / Length {vessel.length}m
+                  IMO {vessel.imo} / MMSI {vessel.mmsi} / Length {vessel.length}
+                  m
                 </div>
               </div>
               <button
diff --git a/frontend/components/dashboard/dashboard-header.tsx b/frontend/components/dashboard/dashboard-header.tsx
index 9856d684..478120f3 100644
--- a/frontend/components/dashboard/dashboard-header.tsx
+++ b/frontend/components/dashboard/dashboard-header.tsx
@@ -1,37 +1,64 @@
 "use client"
 
 import Image from "next/image"
+import Link from "next/link"
 import { useRouter } from "next/navigation"
 import MapIcon from "@/public/map-icon.svg"
 import TrawlWatchLogo from "@/public/trawlwatch.svg"
+import { LogOut, Map } from "lucide-react"
+
+import { Button } from "../ui/button"
 
 export default function DashboardHeader() {
   const router = useRouter()
 
-  const onClickMapView = () => {
-    router.push("/map")
+  const handleLogout = async () => {
+    try {
+      const response = await fetch("/api/logout", {
+        method: "POST",
+      })
+      if (response.ok) {
+        router.push("/login")
+      }
+    } catch (error) {
+      console.error("Logout failed:", error)
+    }
   }
 
   return (
-    <div className="flex w-full pt-5">
+    <div className="flex w-full">
       <div className="w-full">
-        <Image
-          src={TrawlWatchLogo}
-          alt="Trawlwatch logo"
-          height={80}
-          width={80}
-        />
+        <Link href="/dashboard">
+          <Image
+            src={TrawlWatchLogo}
+            alt="Trawlwatch logo"
+            height={80}
+            width={80}
+            className="cursor-pointer"
+          />
+        </Link>
       </div>
 
-      <button
-        className="flex items-center hover:cursor-pointer"
-        onClick={onClickMapView}
-      >
-        <Image src={MapIcon} alt="Map view" height={30} width={30} />
-        <div className="ml-2 mr-5 inline font-bold text-color-1">
-          Map&nbsp;view
-        </div>
-      </button>
+      <Link href="/map">
+        <Button
+          variant="ghost"
+          className="mr-5 flex items-center p-3 hover:cursor-pointer"
+        >
+          <Map className="text-primary" />
+          <div className="inline text-base font-bold text-primary">
+            Map&nbsp;view
+          </div>
+        </Button>
+      </Link>
+      <Link href="/login" onClick={handleLogout}>
+        <Button
+          variant="ghost"
+          className="flex items-center p-3 hover:cursor-pointer"
+        >
+          <LogOut className="text-primary" />
+          <div className="inline text-base font-bold text-primary">Logout</div>
+        </Button>
+      </Link>
     </div>
   )
 }
diff --git a/frontend/components/dashboard/dashboard-overview.tsx b/frontend/components/dashboard/dashboard-overview.tsx
index c9b6edea..7f4c3c1d 100644
--- a/frontend/components/dashboard/dashboard-overview.tsx
+++ b/frontend/components/dashboard/dashboard-overview.tsx
@@ -1,64 +1,83 @@
 "use client"
 
-import Dropdown from "@/components/ui/dropdown"
+import { TOTAL_AMPS, TOTAL_VESSELS } from "@/constants/totals.constants"
+
+import { Item } from "@/types/item"
 import ListCard from "@/components/ui/list-card"
 import KPICard from "@/components/dashboard/kpi-card"
-import { ZoneVisitTimeDto } from "@/types/zone"
-import { VesselTrackingTimeDto } from "@/types/vessel"
-import { convertVesselDtoToItem, convertZoneDtoToItem } from "@/libs/mapper";
 
-const TOTAL_VESSELS = 1700;
-const TOTAL_AMPS = 720;
+import { DateRangeSelector } from "../ui/date-range-selector"
 
 type Props = {
-  topVesselsInActivity: VesselTrackingTimeDto[];
-  topAmpsVisited: ZoneVisitTimeDto[];
-  totalVesselsActive: number;
-  totalAmpsVisited: number;
+  topVesselsInActivity: Item[]
+  topVesselsInActivityLoading: boolean
+  topAmpsVisited: Item[]
+  topAmpsVisitedLoading: boolean
+  totalVesselsActive: number
+  totalVesselsActiveLoading: boolean
+  totalAmpsVisited: number
+  totalAmpsVisitedLoading: boolean
+  totalVesselsTracked: number
+  totalVesselsTrackedLoading: boolean
+  onDateRangeChange: (value: string) => void
 }
 
-export default function DashboardOverview(props : Props) {
-  const { topVesselsInActivity, topAmpsVisited, totalVesselsActive, totalAmpsVisited } = props;
-  const topVesselsInActivityToItems = convertVesselDtoToItem(topVesselsInActivity);
-  const topAmpsVisitedToItems = convertZoneDtoToItem(topAmpsVisited);
-
+export default function DashboardOverview({
+  topVesselsInActivity,
+  topVesselsInActivityLoading,
+  topAmpsVisited,
+  topAmpsVisitedLoading,
+  totalVesselsActive,
+  totalVesselsActiveLoading,
+  totalAmpsVisited,
+  totalAmpsVisitedLoading,
+  totalVesselsTracked,
+  totalVesselsTrackedLoading,
+  onDateRangeChange,
+}: Props) {
   return (
     <section className="grid">
-      <div className="mb-2 w-full">
-        <Dropdown
-          className="float-right w-40"
-          options={["360 derniers jours"]} // TODO: move in dedicated enum?
-          onSelect={(value) => console.log("selected: " + value)}
-        />
+      <div className="py-2 xl:py-4">
+        <DateRangeSelector onValueChange={onDateRangeChange} defaultValue="7" />
       </div>
 
-      <div className="grid grid-cols-3 gap-x-3">
+      <div className="grid grid-cols-3 gap-x-2 xl:gap-x-8">
         <div className="col-span-1 h-full">
-          <div className="grid grid-cols-1 gap-y-2">
+          <div className="grid grid-cols-1 gap-y-2 xl:gap-y-8">
             <KPICard
+              key="total-vessels-in-activity"
               title="Total vessels in Activity"
               kpiValue={totalVesselsActive}
-              totalValue={TOTAL_VESSELS}
+              totalValue={totalVesselsTracked}
+              loading={totalVesselsActiveLoading || totalVesselsTrackedLoading}
             />
             <KPICard
-              title="Total AMPs visited"
+              key="total-amps-visited"
+              title="Total MPAs visited"
               kpiValue={totalAmpsVisited}
               totalValue={TOTAL_AMPS}
+              loading={totalAmpsVisitedLoading}
             />
           </div>
         </div>
 
         <div className="col-span-2 h-full">
-          <div className="grid grid-cols-1 gap-y-4">
+          <div className="grid grid-cols-1 gap-y-12 xl:gap-y-16">
             <ListCard
-              title="Top AMPs visited during the period"
-              items={topAmpsVisitedToItems ?? []}
+              key="top-amps-visited"
+              title="Top MPAs visited during the period"
+              items={topAmpsVisited ?? []}
               enableViewDetails
+              loading={topAmpsVisitedLoading}
+              titleClassName="absolute -top-8 xl:-top-10"
             />
             <ListCard
-              title="Top Vessels visiting AMPS"
-              items={topVesselsInActivityToItems ?? []}
+              key="top-vessels-in-activity"
+              title="Top Vessels visiting MPAs"
+              items={topVesselsInActivity ?? []}
               enableViewDetails
+              loading={topVesselsInActivityLoading}
+              titleClassName="absolute -top-8 xl:-top-10"
             />
           </div>
         </div>
diff --git a/frontend/components/dashboard/kpi-card.tsx b/frontend/components/dashboard/kpi-card.tsx
index 430c9352..c565f31e 100644
--- a/frontend/components/dashboard/kpi-card.tsx
+++ b/frontend/components/dashboard/kpi-card.tsx
@@ -1,22 +1,41 @@
+import { Loader2 } from "lucide-react"
+
+import Spinner from "../ui/custom/spinner"
+import { Skeleton } from "../ui/skeleton"
+
 type Props = {
   title: string
   kpiValue: number
   kpiUnit?: string
   totalValue: number
   totalUnit?: string
+  loading?: boolean
 }
 
-export default function KPICard(props: Props) {
-  let { title, kpiValue, kpiUnit, totalUnit, totalValue } = props
-  kpiUnit = kpiUnit ?? ""
-  totalUnit = totalUnit ?? ""
-
+export default function KPICard({
+  title,
+  kpiValue,
+  kpiUnit,
+  totalUnit,
+  totalValue,
+  loading,
+}: Props) {
   return (
-    <div className="container h-24 w-full rounded bg-color-1 pl-3 pt-3">
-      <div className="mb-4 block text-xxs font-bold uppercase">{title}</div>
-      <div className="inline text-4xl font-bold uppercase">{`${kpiValue}`}</div>
-      <div className="ml-2 inline text-base font-bold uppercase">
-        {`${kpiUnit}`} / {`${totalValue} ${totalUnit}`}
+    <div className="flex w-full flex-col gap-y-2 rounded bg-primary p-4">
+      <div className="block text-lg font-bold uppercase">{title}</div>
+      <div className="flex flex-row items-end justify-end">
+        <div className="h-[40px] min-w-[50px] text-4xl font-bold uppercase">
+          {loading ? (
+            <div className="flex flex-row items-center justify-center">
+              <Spinner />
+            </div>
+          ) : (
+            `${kpiValue}`
+          )}
+        </div>
+        <div className="ml-2 inline text-base font-bold uppercase">
+          {`${kpiUnit || ""} / ${totalValue} ${totalUnit || ""}`}
+        </div>
       </div>
     </div>
   )
diff --git a/frontend/components/details/details-container.tsx b/frontend/components/details/details-container.tsx
index e4abdb73..90667908 100644
--- a/frontend/components/details/details-container.tsx
+++ b/frontend/components/details/details-container.tsx
@@ -1,23 +1,66 @@
+import Image from "next/image"
+
 import { ItemDetails } from "@/types/item"
 import ListCard from "@/components/ui/list-card"
 
+import { Card } from "../ui/card"
+import { DateRangeSelector } from "../ui/date-range-selector"
+
 type Props = {
-  details: ItemDetails
+  details: ItemDetails | null
+  onDateRangeChange: (value: string) => void
+  defaultDateRange: string
+  isLoading: boolean
 }
 
-export default function DetailsContainer({ details }: Props) {
+export default function DetailsContainer({
+  details,
+  onDateRangeChange,
+  defaultDateRange,
+  isLoading,
+}: Props) {
+  if (!details) {
+    return null
+  }
+
   const { label, description, relatedItemsType, relatedItems } = details
 
   return (
-    <div className="grid grid-cols-5 gap-x-32">
-      <div className="col-span-2">
-        <div className="mb-5 text-3xl font-semibold text-white">{label}</div>
-        <div className="block text-justify text-xs font-light leading-relaxed text-white">
-          {description}
+    <div className="flex h-full justify-center">
+      <div className="flex h-screen max-h-[850px] w-full max-w-screen-xl flex-col items-start gap-8 overflow-hidden py-8 xl:gap-16">
+        <div className="flex shrink-0 flex-col gap-0">
+          <div className="text-3xl font-bold text-white">{label}</div>
+          <div className="block text-justify text-xl font-light leading-relaxed text-white">
+            {description}
+          </div>
+        </div>
+        <div className="grid min-h-0 w-full flex-1 grid-cols-2 gap-8 xl:gap-16">
+          <Card className="relative h-full overflow-hidden">
+            <Image
+              src={"/img/placeholder-zone.png"}
+              alt={"Zone map image"}
+              className="object-cover"
+              fill
+            />
+          </Card>
+          <div className="relative flex h-full min-h-0 flex-1 flex-col">
+            <div className="absolute right-0 top-0 z-10">
+              <DateRangeSelector
+                onValueChange={onDateRangeChange}
+                defaultValue={defaultDateRange || "7"}
+                disabled={isLoading}
+              />
+            </div>
+            <div className="h-full min-h-0 flex-1">
+              <ListCard
+                title={relatedItemsType}
+                items={relatedItems}
+                loading={isLoading}
+                skeletonCount={10}
+              />
+            </div>
+          </div>
         </div>
-      </div>
-      <div className="col-span-3">
-        <ListCard title={relatedItemsType} items={relatedItems} />
       </div>
     </div>
   )
diff --git a/frontend/components/ui/back-navigator.tsx b/frontend/components/ui/back-navigator.tsx
index f1792025..f8c984d1 100644
--- a/frontend/components/ui/back-navigator.tsx
+++ b/frontend/components/ui/back-navigator.tsx
@@ -11,7 +11,7 @@ export default function BackNavigator() {
   }
 
   return (
-    <div className="pl-5 pt-5 hover:cursor-pointer">
+    <div className="absolute left-5 top-5 hover:cursor-pointer">
       <Image
         src={LeftArrowIcon}
         alt="left arrow"
diff --git a/frontend/components/ui/button.tsx b/frontend/components/ui/button.tsx
index 7a2330cf..5473b02c 100644
--- a/frontend/components/ui/button.tsx
+++ b/frontend/components/ui/button.tsx
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority"
 import { cn } from "@/libs/utils"
 
 const buttonVariants = cva(
-  "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
+  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
   {
     variants: {
       variant: {
diff --git a/frontend/components/ui/card.tsx b/frontend/components/ui/card.tsx
new file mode 100644
index 00000000..25f27410
--- /dev/null
+++ b/frontend/components/ui/card.tsx
@@ -0,0 +1,79 @@
+import * as React from "react"
+
+import { cn } from "@/libs/utils"
+
+const Card = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    className={cn(
+      "rounded-lg border bg-card text-card-foreground shadow-sm",
+      className
+    )}
+    {...props}
+  />
+))
+Card.displayName = "Card"
+
+const CardHeader = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    className={cn("flex flex-col space-y-1.5 p-6", className)}
+    {...props}
+  />
+))
+CardHeader.displayName = "CardHeader"
+
+const CardTitle = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    className={cn(
+      "text-2xl font-semibold leading-none tracking-tight",
+      className
+    )}
+    {...props}
+  />
+))
+CardTitle.displayName = "CardTitle"
+
+const CardDescription = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+))
+CardDescription.displayName = "CardDescription"
+
+const CardContent = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
+))
+CardContent.displayName = "CardContent"
+
+const CardFooter = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    className={cn("flex items-center p-6 pt-0", className)}
+    {...props}
+  />
+))
+CardFooter.displayName = "CardFooter"
+
+export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
diff --git a/frontend/components/ui/custom/button.tsx b/frontend/components/ui/custom/button-custom.tsx
similarity index 87%
rename from frontend/components/ui/custom/button.tsx
rename to frontend/components/ui/custom/button-custom.tsx
index 5f28698a..c75ac443 100644
--- a/frontend/components/ui/custom/button.tsx
+++ b/frontend/components/ui/custom/button-custom.tsx
@@ -15,7 +15,7 @@ export default function Button({ title, withArrowIcon, onClick }: Props) {
     <button
       type="button"
       onClick={onClick}
-      className="flex h-3/4 items-center rounded bg-color-1 pl-2 pr-4 text-xxs"
+      className="primary flex items-center rounded pl-2 pr-4"
     >
       {title}
 
diff --git a/frontend/components/ui/custom/spinner.tsx b/frontend/components/ui/custom/spinner.tsx
new file mode 100644
index 00000000..47fd94cc
--- /dev/null
+++ b/frontend/components/ui/custom/spinner.tsx
@@ -0,0 +1,7 @@
+import { Loader2 } from "lucide-react"
+
+import { cn } from "@/libs/utils"
+
+export default function Spinner({ className }: { className?: string }) {
+  return <Loader2 className={cn("size-8 animate-spin", className)} />
+}
diff --git a/frontend/components/ui/date-range-selector.tsx b/frontend/components/ui/date-range-selector.tsx
new file mode 100644
index 00000000..b96c4193
--- /dev/null
+++ b/frontend/components/ui/date-range-selector.tsx
@@ -0,0 +1,53 @@
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "./select"
+
+type DateRangeSelectorProps = {
+  onValueChange: (value: string) => void
+  disabled?: boolean
+  defaultValue?: string
+  className?: string
+}
+
+const DATE_RANGE_OPTIONS = [
+  { label: "Last 7 days", value: "7" },
+  { label: "Last 15 days", value: "15" },
+  { label: "Last month", value: "30" },
+  { label: "Last year", value: "365" },
+]
+
+export function DateRangeSelector({
+  onValueChange,
+  disabled = false,
+  defaultValue,
+  className = "float-right w-40",
+}: DateRangeSelectorProps) {
+  return (
+    <Select
+      onValueChange={onValueChange}
+      defaultValue={defaultValue || DATE_RANGE_OPTIONS[0].value}
+    >
+      <SelectTrigger
+        className={`${className} border border-input bg-background text-white hover:bg-accent hover:text-white`}
+        disabled={disabled}
+      >
+        <SelectValue placeholder="Date range" />
+      </SelectTrigger>
+      <SelectContent className="bg-background text-white">
+        {DATE_RANGE_OPTIONS.map((option) => (
+          <SelectItem
+            key={option.value}
+            value={option.value}
+            className="text-white data-[highlighted]:bg-accent data-[highlighted]:text-white"
+          >
+            {option.label}
+          </SelectItem>
+        ))}
+      </SelectContent>
+    </Select>
+  )
+}
diff --git a/frontend/components/ui/dialog.tsx b/frontend/components/ui/dialog.tsx
index 852e7b63..83ca9149 100644
--- a/frontend/components/ui/dialog.tsx
+++ b/frontend/components/ui/dialog.tsx
@@ -36,7 +36,7 @@ const DialogContent = React.forwardRef<
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+        "fixed left-1/2 top-1/2 z-50 grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
         className
       )}
       {...props}
diff --git a/frontend/components/ui/dropdown.tsx b/frontend/components/ui/dropdown2.tsx
similarity index 90%
rename from frontend/components/ui/dropdown.tsx
rename to frontend/components/ui/dropdown2.tsx
index da2eccc3..b149684e 100644
--- a/frontend/components/ui/dropdown.tsx
+++ b/frontend/components/ui/dropdown2.tsx
@@ -18,7 +18,7 @@ export default function Dropdown({ className, options, onSelect }: Props) {
     >
       <select
         id="countries"
-        className="w-full bg-color-3 p-1 text-xxs text-white"
+        className="w-full bg-color-3 p-1 text-base text-white"
       >
         {options.map((option) => (
           <option key={option} value={option}>
diff --git a/frontend/components/ui/input.tsx b/frontend/components/ui/input.tsx
new file mode 100644
index 00000000..e337a9f2
--- /dev/null
+++ b/frontend/components/ui/input.tsx
@@ -0,0 +1,22 @@
+import * as React from "react"
+
+import { cn } from "@/libs/utils"
+
+const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<"input">>(
+  ({ className, type, ...props }, ref) => {
+    return (
+      <input
+        type={type}
+        className={cn(
+          "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+          className
+        )}
+        ref={ref}
+        {...props}
+      />
+    )
+  }
+)
+Input.displayName = "Input"
+
+export { Input }
diff --git a/frontend/components/ui/label.tsx b/frontend/components/ui/label.tsx
new file mode 100644
index 00000000..4a31cf96
--- /dev/null
+++ b/frontend/components/ui/label.tsx
@@ -0,0 +1,24 @@
+import * as React from "react"
+import * as LabelPrimitive from "@radix-ui/react-label"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "@/libs/utils"
+
+const labelVariants = cva(
+  "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+)
+
+const Label = React.forwardRef<
+  React.ElementRef<typeof LabelPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> &
+    VariantProps<typeof labelVariants>
+>(({ className, ...props }, ref) => (
+  <LabelPrimitive.Root
+    ref={ref}
+    className={cn(labelVariants(), className)}
+    {...props}
+  />
+))
+Label.displayName = LabelPrimitive.Root.displayName
+
+export { Label }
diff --git a/frontend/components/ui/list-card.tsx b/frontend/components/ui/list-card.tsx
index 40bedcb2..fd89f2ff 100644
--- a/frontend/components/ui/list-card.tsx
+++ b/frontend/components/ui/list-card.tsx
@@ -1,32 +1,65 @@
 import { Item } from "@/types/item"
+import { cn } from "@/libs/utils"
 import ListItem from "@/components/ui/list-item"
+import { Skeleton } from "@/components/ui/skeleton"
 
 type Props = {
   title: string
   items: Item[]
   enableViewDetails?: boolean
+  loading?: boolean
+  titleClassName?: string
+  skeletonCount?: number
 }
 
-export default function ListCard({ title, items, enableViewDetails }: Props) {
-  const hasNoData = !!(items?.length == 0) 
+export default function ListCard({
+  title,
+  items,
+  enableViewDetails,
+  loading,
+  titleClassName,
+  skeletonCount = 5,
+}: Props) {
+  const hasNoData = !!(items?.length == 0 && !loading)
 
   return (
-    <div className="min-h-50 rounded bg-color-2 pl-5 pr-10 pt-2">
-      <div className="mb-3 block text-xs font-semibold uppercase text-white">
+    <div className="relative flex h-full min-h-52 flex-1 flex-col gap-4">
+      <div
+        className={cn(
+          "block h-10 text-lg font-semibold uppercase text-white",
+          titleClassName
+        )}
+      >
         {title}
       </div>
-      {hasNoData && (
-              <div className="mb-3 block text-xxs font-light text-white">
-              No data found
+      <div className="h-full flex-1 overflow-y-scroll rounded bg-color-2 px-2 py-1 xl:p-4">
+        {hasNoData && (
+          <div className="text-md mb-3 block font-light text-white">
+            No data found
+          </div>
+        )}
+
+        {loading && (
+          <>
+            {[...Array(skeletonCount)].map((_, index) => (
+              <Skeleton
+                key={`skeleton-${index}`}
+                className="mb-1 h-12 w-full opacity-10 xl:mb-2 xl:h-12"
+              />
+            ))}
+          </>
+        )}
+
+        {!loading &&
+          items.map((item, index) => (
+            <div key={item.id}>
+              <ListItem item={item} enableViewDetails={enableViewDetails} />
+              {index < items.length - 1 && (
+                <div className="my-0.5 border-b border-white opacity-20" />
+              )}
             </div>
-      )}
-      {items.map((item) => (
-        <ListItem
-          item={item}
-          key={item.id}
-          enableViewDetails={enableViewDetails}
-        />
-      ))}
+          ))}
+      </div>
     </div>
   )
 }
diff --git a/frontend/components/ui/list-item.tsx b/frontend/components/ui/list-item.tsx
index 3afa8c9b..18fea88d 100644
--- a/frontend/components/ui/list-item.tsx
+++ b/frontend/components/ui/list-item.tsx
@@ -1,9 +1,12 @@
 "use client"
 
 import { useRouter } from "next/navigation"
+import { COUNTRIES_ISO3 } from "@/constants/countries-iso3.constants"
+import { getCountryNameFromIso3 } from "@/utils/vessel.utils"
+import { ChevronRight } from "lucide-react"
 
 import { Item } from "@/types/item"
-import Button from "@/components/ui/custom/button"
+import { Button } from "@/components/ui/button"
 
 type Props = {
   item: Item
@@ -11,7 +14,7 @@ type Props = {
 }
 
 export default function ListItem({ item, enableViewDetails }: Props) {
-  const { id, title, description, value, type } = item
+  const { id, title, description, value, type, countryIso3 } = item
   const router = useRouter()
   let showViewDetailsButton = !!enableViewDetails
 
@@ -19,18 +22,32 @@ export default function ListItem({ item, enableViewDetails }: Props) {
     router.push(`/details/${type}/${id}`)
   }
 
+  const countryLabel = getCountryNameFromIso3(countryIso3)
+
   return (
-    <div className="my-1.5 flex">
-      <div className="flex w-full border-b-1 border-color-5">
-        <div className="w-full pb-1">
-          <div className="text-xxs text-white">{title}</div>
-          <div className="text-xxxs text-color-4">{description}</div>
+    <div className="flex min-h-12 gap-8 p-0">
+      <div className="flex-1">
+        <div className="text-md text-white">{title}</div>
+        <div className="text-sm text-color-4">{description}</div>
+      </div>
+      {type === "vessel" && (
+        <div className="flex w-24 items-center text-sm text-white">
+          {countryLabel}
         </div>
-        <div className="block text-sm text-white">{value}</div>
+      )}
+      <div className="flex w-16 items-center justify-end text-sm text-white">
+        {value}
       </div>
-      <div className="ml-6 flex">
+      <div className="flex w-24 items-center">
         {showViewDetailsButton && (
-          <Button title="View" withArrowIcon onClick={onClickViewDetails} />
+          <Button
+            className="flex items-center gap-2 border-none text-base"
+            title="View"
+            onClick={onClickViewDetails}
+          >
+            View
+            <ChevronRight className="size-4" />
+          </Button>
         )}
       </div>
     </div>
diff --git a/frontend/components/ui/select.tsx b/frontend/components/ui/select.tsx
new file mode 100644
index 00000000..c94fa86d
--- /dev/null
+++ b/frontend/components/ui/select.tsx
@@ -0,0 +1,158 @@
+import * as React from "react"
+import * as SelectPrimitive from "@radix-ui/react-select"
+import { Check, ChevronDown, ChevronUp } from "lucide-react"
+
+import { cn } from "@/libs/utils"
+
+const Select = SelectPrimitive.Root
+
+const SelectGroup = SelectPrimitive.Group
+
+const SelectValue = SelectPrimitive.Value
+
+const SelectTrigger = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
+>(({ className, children, ...props }, ref) => (
+  <SelectPrimitive.Trigger
+    ref={ref}
+    className={cn(
+      "flex h-10 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
+      className
+    )}
+    {...props}
+  >
+    {children}
+    <SelectPrimitive.Icon asChild>
+      <ChevronDown className="size-4 opacity-50" />
+    </SelectPrimitive.Icon>
+  </SelectPrimitive.Trigger>
+))
+SelectTrigger.displayName = SelectPrimitive.Trigger.displayName
+
+const SelectScrollUpButton = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.ScrollUpButton
+    ref={ref}
+    className={cn(
+      "flex cursor-default items-center justify-center py-1",
+      className
+    )}
+    {...props}
+  >
+    <ChevronUp className="size-4" />
+  </SelectPrimitive.ScrollUpButton>
+))
+SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName
+
+const SelectScrollDownButton = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.ScrollDownButton
+    ref={ref}
+    className={cn(
+      "flex cursor-default items-center justify-center py-1",
+      className
+    )}
+    {...props}
+  >
+    <ChevronDown className="size-4" />
+  </SelectPrimitive.ScrollDownButton>
+))
+SelectScrollDownButton.displayName =
+  SelectPrimitive.ScrollDownButton.displayName
+
+const SelectContent = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
+>(({ className, children, position = "popper", ...props }, ref) => (
+  <SelectPrimitive.Portal>
+    <SelectPrimitive.Content
+      ref={ref}
+      className={cn(
+        "relative z-50 max-h-96 min-w-32 overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        position === "popper" &&
+          "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+        className
+      )}
+      position={position}
+      {...props}
+    >
+      <SelectScrollUpButton />
+      <SelectPrimitive.Viewport
+        className={cn(
+          "p-1",
+          position === "popper" &&
+            "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]"
+        )}
+      >
+        {children}
+      </SelectPrimitive.Viewport>
+      <SelectScrollDownButton />
+    </SelectPrimitive.Content>
+  </SelectPrimitive.Portal>
+))
+SelectContent.displayName = SelectPrimitive.Content.displayName
+
+const SelectLabel = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Label>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.Label
+    ref={ref}
+    className={cn("py-1.5 pl-8 pr-2 text-sm font-semibold", className)}
+    {...props}
+  />
+))
+SelectLabel.displayName = SelectPrimitive.Label.displayName
+
+const SelectItem = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Item>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
+>(({ className, children, ...props }, ref) => (
+  <SelectPrimitive.Item
+    ref={ref}
+    className={cn(
+      "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      className
+    )}
+    {...props}
+  >
+    <span className="absolute left-2 flex size-3.5 items-center justify-center">
+      <SelectPrimitive.ItemIndicator>
+        <Check className="size-4" />
+      </SelectPrimitive.ItemIndicator>
+    </span>
+
+    <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+  </SelectPrimitive.Item>
+))
+SelectItem.displayName = SelectPrimitive.Item.displayName
+
+const SelectSeparator = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Separator>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.Separator
+    ref={ref}
+    className={cn("-mx-1 my-1 h-px bg-muted", className)}
+    {...props}
+  />
+))
+SelectSeparator.displayName = SelectPrimitive.Separator.displayName
+
+export {
+  Select,
+  SelectGroup,
+  SelectValue,
+  SelectTrigger,
+  SelectContent,
+  SelectLabel,
+  SelectItem,
+  SelectSeparator,
+  SelectScrollUpButton,
+  SelectScrollDownButton,
+}
diff --git a/frontend/components/ui/skeleton.tsx b/frontend/components/ui/skeleton.tsx
new file mode 100644
index 00000000..6bd0f9ed
--- /dev/null
+++ b/frontend/components/ui/skeleton.tsx
@@ -0,0 +1,15 @@
+import { cn } from "@/libs/utils"
+
+function Skeleton({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) {
+  return (
+    <div
+      className={cn("animate-pulse rounded-md bg-muted", className)}
+      {...props}
+    />
+  )
+}
+
+export { Skeleton }
diff --git a/frontend/components/ui/tooltip-map-template.tsx b/frontend/components/ui/tooltip-map-template.tsx
index ac4a4aff..5bb94c43 100644
--- a/frontend/components/ui/tooltip-map-template.tsx
+++ b/frontend/components/ui/tooltip-map-template.tsx
@@ -1,6 +1,7 @@
-import { VesselPosition } from "@/types/vessel"
 import Image from "next/image"
 
+import { VesselPosition } from "@/types/vessel"
+
 export interface MapTooltipTypes {
   vesselInfo: VesselPosition
   orientation?: "landscape" | "portrait"
@@ -10,13 +11,16 @@ const MapTooltip = ({
   vesselInfo,
   orientation = "portrait",
 }: MapTooltipTypes) => {
-  const { vessel: { mmsi, ship_name, imo, length }, timestamp } = vesselInfo
+  const {
+    vessel: { mmsi, ship_name, imo, length },
+    timestamp,
+  } = vesselInfo
 
   return (
     <>
       {orientation === "portrait" && (
         <div className="max-w-[288px] rounded-lg border border-gray-200 bg-white shadow dark:border-gray-700 dark:bg-gray-800">
-          <Image
+          {/* <Image
             className="rounded-t-lg"
             src="/img/scrombus.jpg"
             alt="default fishing vessel image"
@@ -29,7 +33,7 @@ const MapTooltip = ({
             alt="country flag"
             width={36}
             height={24}
-          />
+          /> */}
           <div className="bg-slate-700 p-5">
             <h5 className="mb-1 text-xl font-bold tracking-tight text-gray-100 dark:text-white">
               {ship_name}
diff --git a/frontend/components/ui/zone-map-tooltip.tsx b/frontend/components/ui/zone-map-tooltip.tsx
new file mode 100644
index 00000000..9aa1bf28
--- /dev/null
+++ b/frontend/components/ui/zone-map-tooltip.tsx
@@ -0,0 +1,27 @@
+
+import { ZoneWithGeometry } from "@/types/zone"
+
+export interface ZoneMapTooltipProps {
+  zoneInfo: ZoneWithGeometry
+}
+
+const ZoneMapTooltip = ({ zoneInfo }: ZoneMapTooltipProps) => {
+  const { name, category, sub_category } = zoneInfo
+
+  return (
+    <>
+      <div className="max-w-[288px] rounded-lg border border-gray-200 bg-white shadow dark:border-gray-700 dark:bg-gray-800">
+        <div className="bg-slate-700 p-5">
+          <h5 className="mb-1 text-xl font-bold tracking-tight text-gray-100 dark:text-white">
+            {name}
+          </h5>
+          <p className="mb-3 font-normal text-gray-200 dark:text-gray-400">
+            {category} / {sub_category}
+          </p>
+        </div>
+      </div>
+    </>
+  )
+}
+
+export default ZoneMapTooltip
diff --git a/frontend/constants/countries-iso3.constants.ts b/frontend/constants/countries-iso3.constants.ts
new file mode 100644
index 00000000..3d98103f
--- /dev/null
+++ b/frontend/constants/countries-iso3.constants.ts
@@ -0,0 +1,1247 @@
+export const COUNTRIES_ISO3 = [
+  {
+    code: "AFG",
+    name: "Afghanistan",
+    eu: false,
+  },
+  {
+    code: "ALA",
+    name: "Åland Islands",
+    eu: false,
+  },
+  {
+    code: "ALB",
+    name: "Albania",
+    eu: false,
+  },
+  {
+    code: "DZA",
+    name: "Algeria",
+    eu: false,
+  },
+  {
+    code: "ASM",
+    name: "American Samoa",
+    eu: false,
+  },
+  {
+    code: "AND",
+    name: "Andorra",
+    eu: false,
+  },
+  {
+    code: "AGO",
+    name: "Angola",
+    eu: false,
+  },
+  {
+    code: "AIA",
+    name: "Anguilla",
+    eu: false,
+  },
+  {
+    code: "ATA",
+    name: "Antarctica",
+    eu: false,
+  },
+  {
+    code: "ATG",
+    name: "Antigua and Barbuda",
+    eu: false,
+  },
+  {
+    code: "ARG",
+    name: "Argentina",
+    eu: false,
+  },
+  {
+    code: "ARM",
+    name: "Armenia",
+    eu: false,
+  },
+  {
+    code: "ABW",
+    name: "Aruba",
+    eu: false,
+  },
+  {
+    code: "AUS",
+    name: "Australia",
+    eu: false,
+  },
+  {
+    code: "AUT",
+    name: "Austria",
+    eu: true,
+  },
+  {
+    code: "AZE",
+    name: "Azerbaijan",
+    eu: false,
+  },
+  {
+    code: "BHS",
+    name: "Bahamas",
+    eu: false,
+  },
+  {
+    code: "BHR",
+    name: "Bahrain",
+    eu: false,
+  },
+  {
+    code: "BGD",
+    name: "Bangladesh",
+    eu: false,
+  },
+  {
+    code: "BRB",
+    name: "Barbados",
+    eu: false,
+  },
+  {
+    code: "BLR",
+    name: "Belarus",
+    eu: false,
+  },
+  {
+    code: "BEL",
+    name: "Belgium",
+    eu: true,
+  },
+  {
+    code: "BLZ",
+    name: "Belize",
+    eu: false,
+  },
+  {
+    code: "BEN",
+    name: "Benin",
+    eu: false,
+  },
+  {
+    code: "BMU",
+    name: "Bermuda",
+    eu: false,
+  },
+  {
+    code: "BTN",
+    name: "Bhutan",
+    eu: false,
+  },
+  {
+    code: "BOL",
+    name: "Bolivia, Plurinational State of",
+    eu: false,
+  },
+  {
+    code: "BES",
+    name: "Bonaire, Sint Eustatius and Saba",
+    eu: false,
+  },
+  {
+    code: "BIH",
+    name: "Bosnia and Herzegovina",
+    eu: false,
+  },
+  {
+    code: "BWA",
+    name: "Botswana",
+    eu: false,
+  },
+  {
+    code: "BVT",
+    name: "Bouvet Island",
+    eu: false,
+  },
+  {
+    code: "BRA",
+    name: "Brazil",
+    eu: false,
+  },
+  {
+    code: "IOT",
+    name: "British Indian Ocean Territory",
+    eu: false,
+  },
+  {
+    code: "BRN",
+    name: "Brunei Darussalam",
+    eu: false,
+  },
+  {
+    code: "BGR",
+    name: "Bulgaria",
+    eu: true,
+  },
+  {
+    code: "BFA",
+    name: "Burkina Faso",
+    eu: false,
+  },
+  {
+    code: "BDI",
+    name: "Burundi",
+    eu: false,
+  },
+  {
+    code: "KHM",
+    name: "Cambodia",
+    eu: false,
+  },
+  {
+    code: "CMR",
+    name: "Cameroon",
+    eu: false,
+  },
+  {
+    code: "CAN",
+    name: "Canada",
+    eu: false,
+  },
+  {
+    code: "CPV",
+    name: "Cape Verde",
+    eu: false,
+  },
+  {
+    code: "CYM",
+    name: "Cayman Islands",
+    eu: false,
+  },
+  {
+    code: "CAF",
+    name: "Central African Republic",
+    eu: false,
+  },
+  {
+    code: "TCD",
+    name: "Chad",
+    eu: false,
+  },
+  {
+    code: "CHL",
+    name: "Chile",
+    eu: false,
+  },
+  {
+    code: "CHN",
+    name: "China",
+    eu: false,
+  },
+  {
+    code: "CXR",
+    name: "Christmas Island",
+    eu: false,
+  },
+  {
+    code: "CCK",
+    name: "Cocos (Keeling) Islands",
+    eu: false,
+  },
+  {
+    code: "COL",
+    name: "Colombia",
+    eu: false,
+  },
+  {
+    code: "COM",
+    name: "Comoros",
+    eu: false,
+  },
+  {
+    code: "COG",
+    name: "Congo",
+    eu: false,
+  },
+  {
+    code: "COD",
+    name: "Congo, the Democratic Republic of the",
+    eu: false,
+  },
+  {
+    code: "COK",
+    name: "Cook Islands",
+    eu: false,
+  },
+  {
+    code: "CRI",
+    name: "Costa Rica",
+    eu: false,
+  },
+  {
+    code: "CIV",
+    name: "Côte d'Ivoire",
+    eu: false,
+  },
+  {
+    code: "HRV",
+    name: "Croatia",
+    eu: true,
+  },
+  {
+    code: "CUB",
+    name: "Cuba",
+    eu: false,
+  },
+  {
+    code: "CUW",
+    name: "Curaçao",
+    eu: false,
+  },
+  {
+    code: "CYP",
+    name: "Cyprus",
+    eu: true,
+  },
+  {
+    code: "CZE",
+    name: "Czech Republic",
+    eu: true,
+  },
+  {
+    code: "DNK",
+    name: "Denmark",
+    eu: true,
+  },
+  {
+    code: "DJI",
+    name: "Djibouti",
+    eu: false,
+  },
+  {
+    code: "DMA",
+    name: "Dominica",
+    eu: false,
+  },
+  {
+    code: "DOM",
+    name: "Dominican Republic",
+    eu: false,
+  },
+  {
+    code: "ECU",
+    name: "Ecuador",
+    eu: false,
+  },
+  {
+    code: "EGY",
+    name: "Egypt",
+    eu: false,
+  },
+  {
+    code: "SLV",
+    name: "El Salvador",
+    eu: false,
+  },
+  {
+    code: "GNQ",
+    name: "Equatorial Guinea",
+    eu: false,
+  },
+  {
+    code: "ERI",
+    name: "Eritrea",
+    eu: false,
+  },
+  {
+    code: "EST",
+    name: "Estonia",
+    eu: true,
+  },
+  {
+    code: "ETH",
+    name: "Ethiopia",
+    eu: false,
+  },
+  {
+    code: "FLK",
+    name: "Falkland Islands (Malvinas)",
+    eu: false,
+  },
+  {
+    code: "FRO",
+    name: "Faroe Islands",
+    eu: false,
+  },
+  {
+    code: "FJI",
+    name: "Fiji",
+    eu: false,
+  },
+  {
+    code: "FIN",
+    name: "Finland",
+    eu: true,
+  },
+  {
+    code: "FRA",
+    name: "France",
+    eu: true,
+  },
+  {
+    code: "GUF",
+    name: "French Guiana",
+    eu: false,
+  },
+  {
+    code: "PYF",
+    name: "French Polynesia",
+    eu: false,
+  },
+  {
+    code: "ATF",
+    name: "French Southern Territories",
+    eu: false,
+  },
+  {
+    code: "GAB",
+    name: "Gabon",
+    eu: false,
+  },
+  {
+    code: "GMB",
+    name: "Gambia",
+    eu: false,
+  },
+  {
+    code: "GEO",
+    name: "Georgia",
+    eu: false,
+  },
+  {
+    code: "DEU",
+    name: "Germany",
+    eu: true,
+  },
+  {
+    code: "GHA",
+    name: "Ghana",
+    eu: false,
+  },
+  {
+    code: "GIB",
+    name: "Gibraltar",
+    eu: false,
+  },
+  {
+    code: "GRC",
+    name: "Greece",
+    eu: true,
+  },
+  {
+    code: "GRL",
+    name: "Greenland",
+    eu: false,
+  },
+  {
+    code: "GRD",
+    name: "Grenada",
+    eu: false,
+  },
+  {
+    code: "GLP",
+    name: "Guadeloupe",
+    eu: false,
+  },
+  {
+    code: "GUM",
+    name: "Guam",
+    eu: false,
+  },
+  {
+    code: "GTM",
+    name: "Guatemala",
+    eu: false,
+  },
+  {
+    code: "GGY",
+    name: "Guernsey",
+    eu: false,
+  },
+  {
+    code: "GIN",
+    name: "Guinea",
+    eu: false,
+  },
+  {
+    code: "GNB",
+    name: "Guinea-Bissau",
+    eu: false,
+  },
+  {
+    code: "GUY",
+    name: "Guyana",
+    eu: false,
+  },
+  {
+    code: "HTI",
+    name: "Haiti",
+    eu: false,
+  },
+  {
+    code: "HMD",
+    name: "Heard Island and McDonald Islands",
+    eu: false,
+  },
+  {
+    code: "VAT",
+    name: "Holy See (Vatican City State)",
+    eu: false,
+  },
+  {
+    code: "HND",
+    name: "Honduras",
+    eu: false,
+  },
+  {
+    code: "HKG",
+    name: "Hong Kong",
+    eu: false,
+  },
+  {
+    code: "HUN",
+    name: "Hungary",
+    eu: true,
+  },
+  {
+    code: "ISL",
+    name: "Iceland",
+    eu: false,
+  },
+  {
+    code: "IND",
+    name: "India",
+    eu: false,
+  },
+  {
+    code: "IDN",
+    name: "Indonesia",
+    eu: false,
+  },
+  {
+    code: "IRN",
+    name: "Iran, Islamic Republic of",
+    eu: false,
+  },
+  {
+    code: "IRQ",
+    name: "Iraq",
+    eu: false,
+  },
+  {
+    code: "IRL",
+    name: "Ireland",
+    eu: true,
+  },
+  {
+    code: "IMN",
+    name: "Isle of Man",
+    eu: false,
+  },
+  {
+    code: "ISR",
+    name: "Israel",
+    eu: false,
+  },
+  {
+    code: "ITA",
+    name: "Italy",
+    eu: true,
+  },
+  {
+    code: "JAM",
+    name: "Jamaica",
+    eu: false,
+  },
+  {
+    code: "JPN",
+    name: "Japan",
+    eu: false,
+  },
+  {
+    code: "JEY",
+    name: "Jersey",
+    eu: false,
+  },
+  {
+    code: "JOR",
+    name: "Jordan",
+    eu: false,
+  },
+  {
+    code: "KAZ",
+    name: "Kazakhstan",
+    eu: false,
+  },
+  {
+    code: "KEN",
+    name: "Kenya",
+    eu: false,
+  },
+  {
+    code: "KIR",
+    name: "Kiribati",
+    eu: false,
+  },
+  {
+    code: "PRK",
+    name: "Korea, Democratic People's Republic of",
+    eu: false,
+  },
+  {
+    code: "KOR",
+    name: "Korea, Republic of",
+    eu: false,
+  },
+  {
+    code: "KWT",
+    name: "Kuwait",
+    eu: false,
+  },
+  {
+    code: "KGZ",
+    name: "Kyrgyzstan",
+    eu: false,
+  },
+  {
+    code: "LAO",
+    name: "Lao People's Democratic Republic",
+    eu: false,
+  },
+  {
+    code: "LVA",
+    name: "Latvia",
+    eu: true,
+  },
+  {
+    code: "LBN",
+    name: "Lebanon",
+    eu: false,
+  },
+  {
+    code: "LSO",
+    name: "Lesotho",
+    eu: false,
+  },
+  {
+    code: "LBR",
+    name: "Liberia",
+    eu: false,
+  },
+  {
+    code: "LBY",
+    name: "Libya",
+    eu: false,
+  },
+  {
+    code: "LIE",
+    name: "Liechtenstein",
+    eu: false,
+  },
+  {
+    code: "LTU",
+    name: "Lithuania",
+    eu: true,
+  },
+  {
+    code: "LUX",
+    name: "Luxembourg",
+    eu: true,
+  },
+  {
+    code: "MAC",
+    name: "Macao",
+    eu: false,
+  },
+  {
+    code: "MKD",
+    name: "Macedonia, the former Yugoslav Republic of",
+    eu: false,
+  },
+  {
+    code: "MDG",
+    name: "Madagascar",
+    eu: false,
+  },
+  {
+    code: "MWI",
+    name: "Malawi",
+    eu: false,
+  },
+  {
+    code: "MYS",
+    name: "Malaysia",
+    eu: false,
+  },
+  {
+    code: "MDV",
+    name: "Maldives",
+    eu: false,
+  },
+  {
+    code: "MLI",
+    name: "Mali",
+    eu: false,
+  },
+  {
+    code: "MLT",
+    name: "Malta",
+    eu: true,
+  },
+  {
+    code: "MHL",
+    name: "Marshall Islands",
+    eu: false,
+  },
+  {
+    code: "MTQ",
+    name: "Martinique",
+    eu: false,
+  },
+  {
+    code: "MRT",
+    name: "Mauritania",
+    eu: false,
+  },
+  {
+    code: "MUS",
+    name: "Mauritius",
+    eu: false,
+  },
+  {
+    code: "MYT",
+    name: "Mayotte",
+    eu: false,
+  },
+  {
+    code: "MEX",
+    name: "Mexico",
+    eu: false,
+  },
+  {
+    code: "FSM",
+    name: "Micronesia, Federated States of",
+    eu: false,
+  },
+  {
+    code: "MDA",
+    name: "Moldova, Republic of",
+    eu: false,
+  },
+  {
+    code: "MCO",
+    name: "Monaco",
+    eu: false,
+  },
+  {
+    code: "MNG",
+    name: "Mongolia",
+    eu: false,
+  },
+  {
+    code: "MNE",
+    name: "Montenegro",
+    eu: false,
+  },
+  {
+    code: "MSR",
+    name: "Montserrat",
+    eu: false,
+  },
+  {
+    code: "MAR",
+    name: "Morocco",
+    eu: false,
+  },
+  {
+    code: "MOZ",
+    name: "Mozambique",
+    eu: false,
+  },
+  {
+    code: "MMR",
+    name: "Myanmar",
+    eu: false,
+  },
+  {
+    code: "NAM",
+    name: "Namibia",
+    eu: false,
+  },
+  {
+    code: "NRU",
+    name: "Nauru",
+    eu: false,
+  },
+  {
+    code: "NPL",
+    name: "Nepal",
+    eu: false,
+  },
+  {
+    code: "NLD",
+    name: "Netherlands",
+    eu: true,
+  },
+  {
+    code: "NCL",
+    name: "New Caledonia",
+    eu: false,
+  },
+  {
+    code: "NZL",
+    name: "New Zealand",
+    eu: false,
+  },
+  {
+    code: "NIC",
+    name: "Nicaragua",
+    eu: false,
+  },
+  {
+    code: "NER",
+    name: "Niger",
+    eu: false,
+  },
+  {
+    code: "NGA",
+    name: "Nigeria",
+    eu: false,
+  },
+  {
+    code: "NIU",
+    name: "Niue",
+    eu: false,
+  },
+  {
+    code: "NFK",
+    name: "Norfolk Island",
+    eu: false,
+  },
+  {
+    code: "MNP",
+    name: "Northern Mariana Islands",
+    eu: false,
+  },
+  {
+    code: "NOR",
+    name: "Norway",
+    eu: false,
+  },
+  {
+    code: "OMN",
+    name: "Oman",
+    eu: false,
+  },
+  {
+    code: "PAK",
+    name: "Pakistan",
+    eu: false,
+  },
+  {
+    code: "PLW",
+    name: "Palau",
+    eu: false,
+  },
+  {
+    code: "PSE",
+    name: "Palestinian Territory, Occupied",
+    eu: false,
+  },
+  {
+    code: "PAN",
+    name: "Panama",
+    eu: false,
+  },
+  {
+    code: "PNG",
+    name: "Papua New Guinea",
+    eu: false,
+  },
+  {
+    code: "PRY",
+    name: "Paraguay",
+    eu: false,
+  },
+  {
+    code: "PER",
+    name: "Peru",
+    eu: false,
+  },
+  {
+    code: "PHL",
+    name: "Philippines",
+    eu: false,
+  },
+  {
+    code: "PCN",
+    name: "Pitcairn",
+    eu: false,
+  },
+  {
+    code: "POL",
+    name: "Poland",
+    eu: true,
+  },
+  {
+    code: "PRT",
+    name: "Portugal",
+    eu: true,
+  },
+  {
+    code: "PRI",
+    name: "Puerto Rico",
+    eu: false,
+  },
+  {
+    code: "QAT",
+    name: "Qatar",
+    eu: false,
+  },
+  {
+    code: "REU",
+    name: "Réunion",
+    eu: false,
+  },
+  {
+    code: "ROU",
+    name: "Romania",
+    eu: true,
+  },
+  {
+    code: "RUS",
+    name: "Russian Federation",
+    eu: false,
+  },
+  {
+    code: "RWA",
+    name: "Rwanda",
+    eu: false,
+  },
+  {
+    code: "BLM",
+    name: "Saint Barthélemy",
+    eu: false,
+  },
+  {
+    code: "SHN",
+    name: "Saint Helena, Ascension and Tristan da Cunha",
+    eu: false,
+  },
+  {
+    code: "KNA",
+    name: "Saint Kitts and Nevis",
+    eu: false,
+  },
+  {
+    code: "LCA",
+    name: "Saint Lucia",
+    eu: false,
+  },
+  {
+    code: "MAF",
+    name: "Saint Martin (French part)",
+    eu: false,
+  },
+  {
+    code: "SPM",
+    name: "Saint Pierre and Miquelon",
+    eu: false,
+  },
+  {
+    code: "VCT",
+    name: "Saint Vincent and the Grenadines",
+    eu: false,
+  },
+  {
+    code: "WSM",
+    name: "Samoa",
+    eu: false,
+  },
+  {
+    code: "SMR",
+    name: "San Marino",
+    eu: false,
+  },
+  {
+    code: "STP",
+    name: "Sao Tome and Principe",
+    eu: false,
+  },
+  {
+    code: "SAU",
+    name: "Saudi Arabia",
+    eu: false,
+  },
+  {
+    code: "SEN",
+    name: "Senegal",
+    eu: false,
+  },
+  {
+    code: "SRB",
+    name: "Serbia",
+    eu: false,
+  },
+  {
+    code: "SYC",
+    name: "Seychelles",
+    eu: false,
+  },
+  {
+    code: "SLE",
+    name: "Sierra Leone",
+    eu: false,
+  },
+  {
+    code: "SGP",
+    name: "Singapore",
+    eu: false,
+  },
+  {
+    code: "SXM",
+    name: "Sint Maarten (Dutch part)",
+    eu: false,
+  },
+  {
+    code: "SVK",
+    name: "Slovakia",
+    eu: true,
+  },
+  {
+    code: "SVN",
+    name: "Slovenia",
+    eu: true,
+  },
+  {
+    code: "SLB",
+    name: "Solomon Islands",
+    eu: false,
+  },
+  {
+    code: "SOM",
+    name: "Somalia",
+    eu: false,
+  },
+  {
+    code: "ZAF",
+    name: "South Africa",
+    eu: false,
+  },
+  {
+    code: "SGS",
+    name: "South Georgia and the South Sandwich Islands",
+    eu: false,
+  },
+  {
+    code: "SSD",
+    name: "South Sudan",
+    eu: false,
+  },
+  {
+    code: "ESP",
+    name: "Spain",
+    eu: true,
+  },
+  {
+    code: "LKA",
+    name: "Sri Lanka",
+    eu: false,
+  },
+  {
+    code: "SDN",
+    name: "Sudan",
+    eu: false,
+  },
+  {
+    code: "SUR",
+    name: "Suriname",
+    eu: false,
+  },
+  {
+    code: "SJM",
+    name: "Svalbard and Jan Mayen",
+    eu: false,
+  },
+  {
+    code: "SWZ",
+    name: "Swaziland",
+    eu: false,
+  },
+  {
+    code: "SWE",
+    name: "Sweden",
+    eu: true,
+  },
+  {
+    code: "CHE",
+    name: "Switzerland",
+    eu: false,
+  },
+  {
+    code: "SYR",
+    name: "Syrian Arab Republic",
+    eu: false,
+  },
+  {
+    code: "TWN",
+    name: "Taiwan, Province of China",
+    eu: false,
+  },
+  {
+    code: "TJK",
+    name: "Tajikistan",
+    eu: false,
+  },
+  {
+    code: "TZA",
+    name: "Tanzania, United Republic of",
+    eu: false,
+  },
+  {
+    code: "THA",
+    name: "Thailand",
+    eu: false,
+  },
+  {
+    code: "TLS",
+    name: "Timor-Leste",
+    eu: false,
+  },
+  {
+    code: "TGO",
+    name: "Togo",
+    eu: false,
+  },
+  {
+    code: "TKL",
+    name: "Tokelau",
+    eu: false,
+  },
+  {
+    code: "TON",
+    name: "Tonga",
+    eu: false,
+  },
+  {
+    code: "TTO",
+    name: "Trinidad and Tobago",
+    eu: false,
+  },
+  {
+    code: "TUN",
+    name: "Tunisia",
+    eu: false,
+  },
+  {
+    code: "TUR",
+    name: "Turkey",
+    eu: false,
+  },
+  {
+    code: "TKM",
+    name: "Turkmenistan",
+    eu: false,
+  },
+  {
+    code: "TCA",
+    name: "Turks and Caicos Islands",
+    eu: false,
+  },
+  {
+    code: "TUV",
+    name: "Tuvalu",
+    eu: false,
+  },
+  {
+    code: "UGA",
+    name: "Uganda",
+    eu: false,
+  },
+  {
+    code: "UKR",
+    name: "Ukraine",
+    eu: false,
+  },
+  {
+    code: "ARE",
+    name: "United Arab Emirates",
+    eu: false,
+  },
+  {
+    code: "GBR",
+    name: "United Kingdom",
+    eu: true,
+  },
+  {
+    code: "USA",
+    name: "United States",
+    eu: false,
+  },
+  {
+    code: "UMI",
+    name: "United States Minor Outlying Islands",
+    eu: false,
+  },
+  {
+    code: "URY",
+    name: "Uruguay",
+    eu: false,
+  },
+  {
+    code: "UZB",
+    name: "Uzbekistan",
+    eu: false,
+  },
+  {
+    code: "VUT",
+    name: "Vanuatu",
+    eu: false,
+  },
+  {
+    code: "VEN",
+    name: "Venezuela, Bolivarian Republic of",
+    eu: false,
+  },
+  {
+    code: "VNM",
+    name: "Viet Nam",
+    eu: false,
+  },
+  {
+    code: "VGB",
+    name: "Virgin Islands, British",
+    eu: false,
+  },
+  {
+    code: "VIR",
+    name: "Virgin Islands, U.S.",
+    eu: false,
+  },
+  {
+    code: "WLF",
+    name: "Wallis and Futuna",
+    eu: false,
+  },
+  {
+    code: "ESH",
+    name: "Western Sahara",
+    eu: false,
+  },
+  {
+    code: "YEM",
+    name: "Yemen",
+    eu: false,
+  },
+  {
+    code: "ZMB",
+    name: "Zambia",
+    eu: false,
+  },
+  {
+    code: "ZWE",
+    name: "Zimbabwe",
+    eu: false,
+  },
+]
diff --git a/frontend/constants/totals.constants.ts b/frontend/constants/totals.constants.ts
new file mode 100644
index 00000000..a3bfa498
--- /dev/null
+++ b/frontend/constants/totals.constants.ts
@@ -0,0 +1,2 @@
+export const TOTAL_VESSELS = 1700
+export const TOTAL_AMPS = 720
diff --git a/frontend/libs/dateUtils.ts b/frontend/libs/dateUtils.ts
index e0f851af..d6d8ac0a 100644
--- a/frontend/libs/dateUtils.ts
+++ b/frontend/libs/dateUtils.ts
@@ -1,29 +1,43 @@
+export function convertDurationInHours(durationPattern: string): number {
+  const matches = durationPattern.match(
+    /P(?:(\d+)Y)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+(?:\.\d+)?)S)?)?/
+  )
 
-import { Temporal } from '@js-temporal/polyfill';
+  if (!matches) {
+    throw new Error("Invalid duration pattern")
+  }
 
-export function convertDurationInHours(durationPattern: string): number {
-  const duration = Temporal.Duration.from(durationPattern);
-  const durationHours = duration.total({ relativeTo: Temporal.Now.plainDateISO(), unit: "hours"})
-  return ~~durationHours; // round without decimals
-}
+  const [
+    _,
+    years = "0",
+    days = "0",
+    hours = "0",
+    minutes = "0",
+    seconds = "0",
+  ] = matches
+
+  const totalHours =
+    parseInt(years) * 365 * 24 + // converting years to hours (approximate)
+    parseInt(days) * 24 +
+    parseInt(hours) +
+    parseInt(minutes) / 60 +
+    parseFloat(seconds) / 3600
 
-// format date like: 2023-07-15T17:16:27
-export function format(date: Date) {
-  return (
-    [
-      date.getFullYear(),
-      padTwoDigits(date.getMonth() + 1),
-      padTwoDigits(date.getDate()),
-    ].join("-") +
-    "T" +
-    [
-      padTwoDigits(date.getHours()),
-      padTwoDigits(date.getMinutes()),
-      padTwoDigits(date.getSeconds()),
-    ].join(":")
-  );
+  return Math.floor(totalHours)
 }
 
 function padTwoDigits(num: number) {
-  return num.toString().padStart(2, "0");
+  return num.toString().padStart(2, "0")
+}
+
+export function getDateRange(days: number) {
+  const today = new Date()
+  const start = new Date(today)
+  start.setDate(today.getDate() - days)
+  start.setHours(0, 0, 0, 0)
+
+  return {
+    startAt: start.toISOString(),
+    endAt: today.toISOString(),
+  }
 }
diff --git a/frontend/libs/mapper.tsx b/frontend/libs/mapper.tsx
index 5af91d82..19054524 100644
--- a/frontend/libs/mapper.tsx
+++ b/frontend/libs/mapper.tsx
@@ -1,29 +1,35 @@
-import { Item } from "@/types/item";
-import { VesselTrackingTimeDto } from "@/types/vessel";
-import { ZoneVisitTimeDto } from "@/types/zone";
+import { Item } from "@/types/item"
+import { VesselMetrics } from "@/types/vessel"
+import { ZoneMetrics, ZoneVisitTimeDto } from "@/types/zone"
+import { convertDurationInHours } from "@/libs/dateUtils"
 
-import { convertDurationInHours } from "@/libs/dateUtils";
-
-export function convertVesselDtoToItem(vesselDtos: VesselTrackingTimeDto[]): Item[] {
-  return vesselDtos?.map((vesselDto: VesselTrackingTimeDto) => {
-    return {
-      id: `${vesselDto.vessel_id}`,
-      title: vesselDto.vessel_ship_name,
-      description: `IMO ${vesselDto.vessel_imo} / MMSI ${vesselDto.vessel_mmsi} / ${vesselDto.vessel_length} mètres`,
-      value: `${convertDurationInHours(vesselDto.total_time_at_sea)}h`,
-      type: "vessel"
-    }
-  });
+export function convertVesselDtoToItem(metrics: VesselMetrics[]): Item[] {
+  return metrics
+    ?.map((vesselMetrics) => {
+      const vessel = vesselMetrics.vessel
+      return {
+        id: `${vessel.id}`,
+        title: vessel.ship_name,
+        description: `IMO ${vessel.imo} / MMSI ${vessel.mmsi} / ${vessel.length} m`,
+        value: `${convertDurationInHours(vesselMetrics.total_time_at_sea)}h`,
+        type: "vessel",
+        countryIso3: vessel.country_iso3,
+      }
+    })
+    .sort((a, b) => {
+      return Number(b.value.split("h")[0]) - Number(a.value.split("h")[0])
+    })
 }
 
-export function convertZoneDtoToItem(zoneDtos: ZoneVisitTimeDto[]): Item[] {
-  return zoneDtos?.map((zoneDto: ZoneVisitTimeDto) => {
+export function convertZoneDtoToItem(zoneMetrics: ZoneMetrics[]): Item[] {
+  return zoneMetrics?.map((zoneMetrics) => {
+    const { zone, visiting_duration } = zoneMetrics
     return {
-      id: `${zoneDto.zone_id}`,
-      title: zoneDto.zone_name,
-      description: zoneDto.zone_sub_category,
-      value: `${convertDurationInHours(zoneDto.visiting_duration)}h`,
-      type: "amp"
+      id: `${zone.id}`,
+      title: zone.name,
+      description: zone.sub_category,
+      value: `${convertDurationInHours(visiting_duration)}h`,
+      type: "amp",
     }
   })
 }
diff --git a/frontend/middleware.ts b/frontend/middleware.ts
new file mode 100644
index 00000000..5c0c9fbb
--- /dev/null
+++ b/frontend/middleware.ts
@@ -0,0 +1,29 @@
+import { NextResponse } from "next/server"
+import type { NextRequest } from "next/server"
+
+export function middleware(request: NextRequest) {
+  const token = request.cookies.get("auth-token")
+
+  // Skip middleware for login page and api routes
+  if (
+    request.nextUrl.pathname.startsWith("/login") ||
+    request.nextUrl.pathname.startsWith("/api")
+  ) {
+    return NextResponse.next()
+  }
+
+  if (!token) {
+    return NextResponse.redirect(new URL("/login", request.url))
+  }
+
+  if (request.nextUrl.pathname === "/") {
+    return NextResponse.redirect(new URL("/dashboard", request.url))
+  }
+
+  return NextResponse.next()
+}
+
+export const config = {
+  matcher:
+    "/((?!api|_next/static|_next/image|img|icons|favicon.ico|sitemap.xml|robots.txt).*)",
+}
diff --git a/frontend/next.config.mjs b/frontend/next.config.mjs
index 0e72169a..bc71f136 100644
--- a/frontend/next.config.mjs
+++ b/frontend/next.config.mjs
@@ -1,15 +1,9 @@
-// @ts-check
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  async redirects() {
-    return [
-      {
-        source: "/",
-        destination: "/dashboard",
-        permanent: true,
-      },
-    ]
+  experimental: {
+    serverMinification: false
   },
+  staticPageGenerationTimeout: 1000 * 60 * 5 // 5 minutes
 }
 
 export default nextConfig
diff --git a/frontend/package.json b/frontend/package.json
index fd95c70c..b1d761be 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -4,8 +4,9 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "find . -path './node_modules' -prune -o -name '*.gz' -exec gzip --decompress {} + && next build",
-    "start": "next start",
+    "build": "next build",
+    "start": "next start -p 8080",
+    "install": "next build",
     "lint": "next lint",
     "lint:fix": "next lint --fix",
     "preview": "next build && next start",
@@ -14,31 +15,34 @@
     "format:check": "prettier --check \"**/*.{ts,tsx,mdx}\" --cache"
   },
   "dependencies": {
+    "@deck.gl/extensions": "^9.0.36",
     "@heroicons/react": "^2.1.3",
-    "@js-temporal/polyfill": "^0.4.4",
     "@loaders.gl/core": "^4.2.0",
     "@loaders.gl/obj": "^4.2.0",
     "@radix-ui/react-dialog": "^1.0.5",
-    "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-dropdown-menu": "^2.1.2",
+    "@radix-ui/react-label": "^2.1.0",
+    "@radix-ui/react-select": "^2.1.2",
+    "@radix-ui/react-slot": "^1.1.0",
     "@types/chroma-js": "^2.4.4",
     "axios": "^1.7.2",
     "chroma-js": "^2.4.2",
     "class-variance-authority": "^0.4.0",
     "clsx": "^1.2.1",
     "cmdk": "^1.0.0",
-    "deck.gl": "^9.0.1",
+    "deck.gl": "^9.0.36",
     "framer-motion": "^11.1.3",
     "jotai": "^2.8.0",
     "jotai-zustand": "^0.3.0",
     "lucide-react": "^0.371.0",
     "maplibre-gl": "^4.1.1",
-    "next": "^13.4.8",
-    "next-template": "link:",
+    "next": "^13.5.7",
     "next-themes": "^0.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-map-gl": "^7.1.7",
     "sharp": "^0.31.3",
+    "swr": "^2.2.5",
     "tailwind-merge": "^1.13.2",
     "tailwindcss-animate": "^1.0.6",
     "zustand": "^4.5.2"
diff --git a/frontend/public/icons/boat-animated.svg b/frontend/public/icons/boat-animated.svg
new file mode 100644
index 00000000..c92415ce
--- /dev/null
+++ b/frontend/public/icons/boat-animated.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#2CE2B0" stroke-width="1" stroke-linecap="round" stroke-linejoin="round">
+  <g>
+    <animateTransform
+      attributeName="transform"
+      type="rotate"
+      values="-5 12 18; 5 12 18; -5 12 18"
+      dur="1s"
+      repeatCount="indefinite"/>
+    <path d="M22 18H2a4 4 0 0 0 4 4h12a4 4 0 0 0 4-4Z"/>
+    <path d="M21 14 10 2 3 14h18Z"/>
+    <path d="M10 2v16"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/frontend/public/img/login-cover.jpg b/frontend/public/img/login-cover.jpg
new file mode 100644
index 00000000..b3a13956
Binary files /dev/null and b/frontend/public/img/login-cover.jpg differ
diff --git a/frontend/public/img/map-vessel.png b/frontend/public/img/map-vessel.png
new file mode 100644
index 00000000..7e7153ee
Binary files /dev/null and b/frontend/public/img/map-vessel.png differ
diff --git a/frontend/public/img/placeholder-zone.png b/frontend/public/img/placeholder-zone.png
new file mode 100644
index 00000000..dfdaa49b
Binary files /dev/null and b/frontend/public/img/placeholder-zone.png differ
diff --git a/frontend/public/trawlwatch.svg b/frontend/public/trawlwatch.svg
index c9914027..24d69d1f 100644
--- a/frontend/public/trawlwatch.svg
+++ b/frontend/public/trawlwatch.svg
@@ -1,20 +1,3 @@
-<svg width="150" height="80" viewBox="0 0 150 80" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g clip-path="url(#clip0_1337_36686)">
-<g clip-path="url(#clip1_1337_36686)">
-<path d="M85.3863 71.5391C80.2557 48.9853 75.2602 27.0155 70.2648 5.04573C70.0814 5.05064 69.8979 5.05555 69.7145 5.06045C61.9487 25.612 54.1876 46.1587 46.1804 67.3532C60.7372 56.1843 71.5969 57.1559 85.3863 71.5342V71.5391ZM21.2996 38.3366C20.2137 44.8141 19.1518 51.1347 17.9693 58.1962C17.5156 56.7584 17.2647 56.0419 17.0668 55.3059C15.643 50.1238 14.2577 44.9319 12.7663 39.7695C12.5926 39.1659 11.8927 38.3464 11.3715 38.2924C9.55187 38.1108 7.70331 38.2237 5.57481 38.2237C5.84027 39.2444 6.01886 40.0148 6.23605 40.7706C8.19562 47.5867 10.1648 54.4029 12.1244 61.2191C13.5675 66.2294 13.5675 66.0969 18.6161 66.2589C20.8266 66.3276 21.4927 65.4148 21.8547 63.4421C22.849 58.0245 23.9977 52.6314 24.963 47.8517C25.7014 51.6745 26.5026 56.0861 27.4052 60.4732C28.6022 66.2932 28.636 66.2245 34.4857 66.2098C36.0785 66.2098 36.7301 65.6307 37.1355 64.1193C38.4 59.3936 39.8239 54.717 41.1608 50.0109C42.2468 46.1882 43.2941 42.3556 44.4139 38.3464H37.8691C36.0978 44.8092 34.3506 51.2034 32.5985 57.5975C31.7056 54.3538 31.1602 51.1789 30.6197 48.0039C30.0743 44.8092 29.5385 41.6097 28.9883 38.3415H21.3093L21.2996 38.3366ZM90.8692 24.714C89.8026 20.322 88.8276 16.2196 87.7802 12.1318C87.6161 11.4939 87.1576 10.4732 86.757 10.4339C84.8602 10.2523 82.9344 10.3554 80.719 10.3554C82.4035 16.4944 83.948 22.0592 85.449 27.6387C86.7329 32.4037 86.7136 32.2908 91.5546 32.4331C93.6831 32.4969 94.4988 31.7608 94.8656 29.6753C95.4303 26.4659 96.3328 23.3204 97.1823 19.7675C97.8532 22.5156 98.36 24.822 98.9826 27.0891C100.464 32.4871 100.488 32.4331 105.923 32.3693C107.361 32.3497 108.042 31.9473 108.394 30.431C109.369 26.2254 110.561 22.0739 111.643 17.8929C112.27 15.4687 112.864 13.0347 113.559 10.2572C112.376 10.2572 111.512 10.2572 110.648 10.2572C106.309 10.2818 107.241 9.87447 106.285 13.707C105.397 17.255 104.774 20.8716 103.959 24.8269C102.791 20.3073 101.623 16.2539 100.725 12.1367C100.069 9.12366 97.8677 10.6007 96.2894 10.267C94.6773 9.92845 94.0354 10.8118 93.712 12.3232C92.8481 16.3668 91.8731 20.3858 90.874 24.714H90.8692ZM136.75 66.0282C136.75 62.1171 136.712 58.3778 136.774 54.6385C136.794 53.5147 136.914 52.3419 137.271 51.2917C137.851 49.5889 139.25 49.0246 140.94 49.1914C142.668 49.3632 143.174 50.6783 143.285 52.126C143.416 53.8337 143.353 55.5561 143.358 57.2688C143.367 60.164 143.358 63.0642 143.358 66.1558C145.197 66.1558 146.635 66.1165 148.068 66.1656C149.289 66.2098 149.791 65.7092 149.777 64.4383C149.724 59.6193 149.883 54.7906 149.676 49.9815C149.468 45.1871 145.559 42.5274 141.026 44.0486C139.492 44.5639 138.193 45.7956 136.591 46.8212V34.6316H130.505V66.0282H136.75ZM24.934 32.3399C26.6474 32.3399 27.9265 32.2368 29.1814 32.3644C30.9865 32.546 31.5608 31.8295 31.5319 30.0089C31.4547 24.9397 31.5464 19.8706 31.5705 14.8014C31.5753 13.3635 31.5705 11.9257 31.5705 10.2425C32.8978 10.2425 33.8486 10.2425 34.8043 10.2425C37.9061 10.2327 39.3187 8.64602 39.042 5.48247C39.013 5.16841 38.8875 4.86416 38.7427 4.31455C35.2193 4.31455 31.696 4.31455 28.1726 4.31455C24.6493 4.31455 21.1597 4.31455 17.7232 4.31455C17.1279 8.21745 18.5968 10.1869 22.1298 10.2229C22.2119 10.2229 22.2939 10.2327 22.3711 10.2229C24.572 9.86956 25.0354 10.8952 24.9823 13.0053C24.8375 19.2866 24.9292 25.5777 24.9292 32.3301L24.934 32.3399ZM104.229 60.1199C102.95 60.4536 101.768 61.0768 100.653 60.959C99.7742 60.8707 98.3117 59.9334 98.2634 59.2807C98.0173 55.9929 98.1524 52.6756 98.1524 49.2061C99.4122 49.2061 100.363 49.2061 101.314 49.2061C102.265 49.2061 103.307 49.2061 104.253 49.2061V44.1664H98.0366V38.7439C95.9081 39.0677 93.7941 38.9156 92.2641 39.8087C91.458 40.2798 91.6704 42.5617 91.4243 44.0192C90.4638 44.1468 89.5419 44.2645 88.6635 44.3823V49.0736C89.7108 49.1914 90.5603 49.2846 91.6511 49.4122C91.6511 52.6265 91.6608 55.7132 91.6511 58.7949C91.627 64.6346 94.325 67.3384 100.02 66.6367C106.681 65.8123 105.749 65.8515 104.229 60.1248V60.1199ZM122.261 58.6477C120.321 59.9285 119.071 61.3271 117.69 61.4792C116.628 61.5921 114.896 60.3996 114.341 59.32C112.946 56.6063 112.951 53.5442 114.452 50.8599C115.012 49.8588 116.575 48.9362 117.705 48.9117C118.675 48.8921 119.708 50.1532 120.634 50.9482C120.948 51.2181 121.011 51.7874 121.267 52.4155C123.014 51.8953 124.66 51.4095 126.272 50.9286C126.233 48.3326 125.195 46.566 123.386 45.2754C117.985 41.4281 109.447 44.3185 107.907 50.801C107.255 53.5491 107.241 56.7191 107.873 59.4721C109.447 66.2834 118.694 69.213 124.047 64.7425C125.302 63.6924 126.045 62.0043 127.232 60.3064C124.916 59.531 123.25 58.9765 122.266 58.6477H122.261ZM130.442 -9.99992C130.442 -15.7267 130.485 -21.3455 130.365 -26.9594C130.355 -27.4403 129.255 -28.2844 128.646 -28.2991C123.748 -28.4119 118.839 -28.4267 113.94 -28.2942C113.337 -28.2794 112.309 -27.2833 112.236 -26.6502C111.585 -20.9873 111.633 -20.9775 117.294 -20.9824C117.618 -20.9824 117.936 -20.9824 118.26 -20.9824C121.555 -20.9889 123.201 -19.3024 123.197 -15.923C123.191 -11.4377 125.606 -9.46503 130.442 -10.0048V-9.99992ZM0.0387874 -19.1225C0.0387874 -19.1225 0.0339609 -19.1225 0.0291344 -19.1225C0.0291344 -16.7572 0.0967058 -14.3919 0.00500174 -12.0266C-0.0577431 -10.3778 0.458695 -9.69076 2.18659 -9.73983C8.16666 -9.90177 7.21101 -9.00374 7.2641 -14.6814C7.32684 -21.002 7.27858 -20.9529 13.4372 -20.9971C18.8043 -21.0363 18.2348 -19.8635 18.3217 -26.1497C18.3217 -26.3116 18.3844 -26.5423 18.3024 -26.6306C17.7328 -27.2293 17.144 -28.2794 16.5407 -28.2991C11.6418 -28.4316 6.74766 -28.3531 1.85356 -28.3874C0.511787 -28.3923 -0.00465131 -27.8084 0.0243079 -26.4687C0.0773997 -24.0199 0.0387874 -21.5761 0.0387874 -19.1274V-19.1225ZM123.27 86.0891C123.27 89.0727 123.144 91.9091 123.313 94.7308C123.434 96.7427 122.662 97.2776 120.837 97.204C118.125 97.0911 115.402 97.1746 112.772 97.1746C110.923 103.107 111.778 104.418 117.304 104.511C118.588 104.531 119.872 104.506 121.156 104.506C124.177 104.506 127.194 104.506 130.23 104.506V86.0989H123.279L123.27 86.0891ZM0.0773997 86.0547C0.0773997 91.8502 0.0291344 97.4494 0.164277 103.044C0.17393 103.525 1.41917 104.344 2.10937 104.369C5.79201 104.506 9.4843 104.437 13.1718 104.452C18.6161 104.472 18.7464 104.383 18.0466 98.9068C17.9645 98.2689 16.9992 97.312 16.3766 97.2531C14.1516 97.047 11.8879 97.0617 9.65323 97.1991C7.71297 97.3169 7.13378 96.5072 7.20618 94.6424C7.31236 91.8208 7.23514 88.9893 7.23514 86.0547H0.0725731H0.0773997ZM122.821 32.173C122.821 21.9316 122.845 11.9797 122.753 2.02286C122.748 1.49779 121.841 0.786233 121.209 0.521241C120.591 0.261156 119.775 0.545777 119.066 0.442725C116.759 0.109031 116.054 0.992336 116.117 3.40671C116.315 10.9933 116.247 18.5898 116.281 26.1813C116.291 28.1246 116.281 30.0629 116.281 32.173H122.821ZM46.7451 10.2621C45.7026 10.2621 44.8145 10.3701 43.965 10.2425C41.5855 9.88919 40.9581 10.9295 41.0498 13.2458C41.2284 17.8095 41.1512 22.388 41.1463 26.9615C41.1367 32.865 41.1222 32.865 46.9864 32.2319C47.1264 32.2172 47.2519 32.0651 47.387 31.9718C47.4498 31.8197 47.5608 31.6725 47.5608 31.5204C47.6187 28.7478 47.6235 25.9703 47.7249 23.1977C47.9131 18.1039 49.3176 16.7888 54.3855 16.8231C54.7571 16.8231 55.1336 16.7397 55.6066 16.6808C55.8238 14.3941 56.0265 12.2447 56.2437 9.92354C52.1074 9.4868 49.419 11.1651 47.5608 14.9339C47.2567 13.1918 47.0299 11.9159 46.7403 10.267L46.7451 10.2621Z" fill="#1EE0AB"/>
-</g>
-<rect opacity="0.5" x="6.2832" y="0.319824" width="143.502" height="66.9832" fill="url(#pattern0)"/>
-</g>
-<defs>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_1337_36686" transform="matrix(0.00340713 0 0 0.00729927 -0.0110693 0)"/>
-</pattern>
-<clipPath id="clip0_1337_36686">
-<rect width="150" height="80" fill="white"/>
-</clipPath>
-<clipPath id="clip1_1337_36686">
-<rect width="149.786" height="132.903" fill="white" transform="translate(0 -28.3872)"/>
-</clipPath>
-<image id="image0_1337_36686" width="300" height="137" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAACJCAYAAACW2wWcAAAAAXNSR0IArs4c6QAADv9JREFUeF7tXW2WnEgM29w1x8pddx8vw4b0AJYl1weF8rddtizL6oKZJD/+8R8zYAamZODXr1//RsB+/vz5I4pZ6fNXNbvS4NzL2gwgZnVk4C3GZcNaW/fu7oEMZM1qb/ENpmXDeqCgDXltBljD2lhZ3bRsWGtr3909kAEb1vXQbFgPFLQhr82ADcuGtbbC3d1SDNiwbFhLCdrNrM2ADWuwYSkDGCXN1V9ejuLVdWMGlH1ZXbdd3mEpA4jH2yZi9cG3Yc1ZKxhQ9mV13dqwLhS2+uArFss52jBgwxr4SKiQ30YOWFYbFsaTo+oZUHZmdd02v2Ep5NdLAc+4+uBxJhzZmwFlZ1bXrQ3Lj4S999H1AgZsWH4kTC/J6t9UaUJ8oBsDNiwbVlpsNqw0ZT5QxIANy4aVlpINK02ZDxQxYMOyYaWlZMNKU+YDRQzYsGxYaSnZsNKU+UARAzasgYa1lVYGUKSBdBobVpoyHyhiQNmX1XXb/Nca9hkqQyjSAZzmbuhoH6hwqvPBTU4QeNc7yh/SxmedLfdZbbUmOstPzJ912TxbXrUHhM+RMd0MK9ukMrS9VuXwsnii2tX5svyOis/2rc6SqRfN7ow7ps6VwbC5bFijVP1VVxlc9fCyWCpuaUf6mSUaPL7T8lkeFQ7YWgzXlbXYXNWan1E/096wKh4lGeG1/Pa0ELX3mdl59uK7uk51vhmNh8VkwwKYYwV0XDA2x2rfmr14UOpkOVdqnZlwdT5A4o8JsWEBo2IFZMM6J7eCz2hsbA3mnRlb6+rGyObLGm3E4Yyf27CAqbAC2gXJnmeWB2hneIjCB/pYqNTILj5by4aVl6INC+BMESR7VnnZDLQ0NEThpJdhoabVopcWOYcOvLC4DQsgUxEQkD4MQZc0TDRJgMInyoVSI3OzVer4hpUXpA0L4EwRJZA+DEGXNEw0UQDLKcIFm/uTnpa1qn/tJWOyE8kgDcWGBVBWtQBAqdMQZHHY3KPOKZxGfCi5s4/ibC0bFqc8GxbAGytKIDUUEi0olGSyIIXTiA8ld+aWpdSxYXGCtGEBvCnCBNKHIdGChgkmDWB5jfhg857RNMJYFPwRN5NKAYZlwwKoUgQEpA9DVhWhwmuLF9a9DCuaZwteQpE9JMCGBQxKERCQ/jYkEreaf+R5hVcb1vnkVtbL1rENC9hYZbGu0q8uLIBW6d9J62VYWx/VtaLZK3qLciNzmTnGhgVORxHRscTqggLp/D+M5bXaRO5wn9Vicd8Z4I6hZe7sfGaLt2GBE1FEtJewWX0nm+W12kR6GRaiAZYTxAxBuU8bZsMCR6OI6A1CAmn8Fqbw+rn8Sq4If1UtG1bE9P3nNiyQP3UZEKGCUJYLY7mtMhGE0KpaiA5YPt7wxWjDQtQq/kcaiEhBGEuGsQtaZSIIqVW1EC2wfNiwkEk2jplleLPgaEz3kPQst8flZ3OgDVfUQsxqw6P0gtZA+54tzjcscCIWEUgUEVbBrZIDhbybAVsLNRM2v29Y6CQbxs0yPBYHKtKGFD4itcovez5Djg0rw1abWN+wQF7ZhbBhYQSr/GbPb3NhziiPbKgWsriODKM1sKnMF2XDAmfCimh1AYH0hWEqv5nz7E2JPZd9VMv08kns6nqzYYWr9DuAFdHqAgLpC8NYfsPEJwGK8TD1bFgsa9/P2bBALtmFsmGBBAtfCniF35E2rCxj88TbsMBZ2LBAooQwluNsyd6Glf3SUnjI1spyNzrehgVOgBXR6gIC6YPCWI6h5F9BVb8AqtSMzio8rK43G1aknq/PWRGtLiCQPjiM5RktYMNCmZozzoYFzEVZIhsWQPAhROEaqWTDQliaN8aGBcxGWSIbFkDwwobFzN96u9aMDQvYJwsIIKkoROE6gnBlHiNq3mFV8DAGGfE20+c2LGAaFhBAUmGIwvcdDBtW4ZAGpbJhAcQrC7T6Nx5AXzpE4duG9XP6nU4L4nBg+uYU8VaZxQwYlCE/7azCN2NY25kWNVn9KVjYmk/RiA0LmJQFBJBUHKJwfgYlWuTqehuGqOYVZQoWtmbx+Jqls2EB1FpAAEnFIQrnNqziYUyUzoYFDoNdoNW/8UD60mEs31eFojlU1/MNKz1y6IANC6KJf8cRLQpY/nVh1QaCzKGyJlLPj4R5WduwQM5YMSvCBaEtG8ZyzjwSVr94V+au9K3UfYKQbFjglFgRrS4gkD4qjOX8s1hmBiNqfuJVMGR6pYYy+NCyhlU9OFZE1TgG66V7eZb3I9DMDCrqKe+v1JteptfuwywoaMMCSWSFvLqAQProMJb3vSDD/4iaR4KU+ky/9HAGHLRhJUjPCml18SSok0KzvLO3qwrTqJj5iH6lAXU8PL1hdeQCLnUmqAqhwgAc+I2BfSaew9risGGtPV93ZwaWYsCGtdQ43YwZWJsBG9ba83V3ZmApBmxYS43TzZgBngHmZX/vd4Y2LH6+PmkGlmLAhrXUON2MGVibARvW2vN1d2ZgKQZsWEuN082YgbUZsGGtPV93ZwaWYsCGtdQ43YwZWJuBRxjWE0CuLRN3ZwbmYOAJXvCDAbnRW/X7F2z944grsCg4KurPIdn3oPDfPfw+a2YHemufNqwq02JIOlsrlTgFh1r7PTbRr1N0np7dn5mgnFVfFjKqkAyrwrQYkmxYmRG/J5bRkg3rYYa1wWUGvbepDlypXen0LA61//fYSftOmRl6fjaslDIZkVXfsBQMFnxq3M2C2Rl6fi8zLOWxkBWZDavZ3j82MaslG5YNCxY9KzIbFkzxawJZLdmwHmhYo95jsSK72kJGfAoGpt5rHKRzo+wcPUMbFixVVmQ2LJji1wSyWrJhvdCw2PdYrMhsWK/xIbhRVks2rIca1ojHQlZkMxiWhQ57SZdAVkuzzRHpoxVmpPbnMDNYrvJncvz1L44ygPcGMkVVc6wyrJ79dtnalxVR5qdQldV6VEvtowoPgyOqnc0Z5SszrOxjYbaRaOiMcSoYImJRvI7LMaDMLFfpOrpi9i36UHExmK5qMrmOjF/l/fZvuiuFMoQpde6E1wtDpk7VojiP9rcyqvhTZt9K98iyR/0z2D65YHJknphsWNEUTz5XBEuU85EDA5ULwRLLzr8ndgYjg+9YhzkfzeCzj9calkIuI4ZoMP4cY0CZG1YhjmLmPwJ3FieDcavBnItZ/hNx7KPUsND3WC0bRIekYEBrZIbiWIwBZW5YhTgqO/+RmDNYR+KMWN/7OP1/CRXgCEFKfrSxKI7FgPQX1fbnPAPs3PiK309mNPAkvDNgjd5nLWdYyC1PGUxGrJVL4ly/GVBmV8UhqoEZsCL7sPMyC96zOTW7YSEEtSYmEpRSP8pdtRTOc86AMrsqThENzIDz2O8TMX/Oa+vh8r+qVwiPyFFyI6JrWT/KjeBzDM9Aa+0gyBANzIDThoVME/gPKloPMxIUWz/KC9LjMIEBdnZCyW9HIx3MgPHsdhJxMCPuT9PtfsPqQcqdoJT6kVAjQfjzGgaUGVYgiHRQhe9YpyJnL9wVHF+9x2piWHfvsbLEM7/nYcNqJZl582Z1lX1cQjtXcOw1rvSr5u5hWK12b/eUS8PaAhSCqkhnDKvSMCMRoUJ2XFsGWmiVQazguNPtjkXJ39qwovwVnvIqw2o5bEbcPlPHwCyz7YGDrREZCpsXMdoqw7VhgTsTDRtM47BGDPRYtgh6TwzZWoh+sznZx2q2zu2vNVQ54ueQM2B3kjNn7h7hmDx+JIzWdI7PZ5htbwx39RCDUnaTNSv1sfD2hqUm/yQtO1DlpyRnA8vWt1nNYUYICna2mceZCAeLgTGXs91k86iXk2xdlqcN57KG9SlEhaTsQCJh+/N6BmaYL4thFn31ws/WaW5YqmkoNyy1tnLlrV9HZ4wYUJagyjBYDFX1I46iz3vhZ+tAhlX5WJgFOoNhzSKmSGxv/zyrrRZfSAyGmfTF4Gceqdk6UxuW+v6r6oY1k6Debkp3/StLUDVjBkNV7QptMPhtWF/MV7w0V37KuAtgJkFViHLVHOyyMQt3xSGDYSZ9MfgZ/tg68A2r4rEwC7LCsHYys7VbPC6sahSz9DXDjBkMNqycgsKfEu7pmGEcbynZ8zMY1kxiyo31fdFZfbX4UmIwzKQxBr9vWIWPhOraziQmtZfVz7PLxiycHwn/ZiC7J8qs4BuW+liYWZgrApRGM/X9/opha+wZRRvZhbNh2bD+YuBOQIowMytVJeJMTcfyDCi6qJo1i6GqPs/e75O98LN1NoyPumEppGaHOYuIsrjfGq8sQdWsWQxV9dXZ98LP1rFh3Ux4FhGpInzLeWUJqmbNYqiqr866F362Ttqwet1wRj8SziIgVYBvOq8sQdW8R2E41lV6YfFna7J1pjSsqHmlWXSBIwxoHsf1Y0DRRdW8e2OI6mX7ivJdTbNXnUcaVo9bXnYA/dbSla4YYJdtz1c1cwVHBkO2DpI7m5Pljq1DGVZrw2hJLLruCAY0l+P6MKAsAbJ46GOXigPRXqsabF4E81EFbB0b1skuZcnvs46uEjGgLMFn7l0Ddzlb/q5gy9xbr9X5szujzCr1aw37YJWCkfCQ5kfXj3rw5/0ZaKmJs256/GAIMc4s0y1wIzu75A0LbbylOFEMWaE4vj0DLXVxdQs766onjgyrkbZZ3FHeT4xsHfqRsNV7rEzjStNXQ87UzwjFsX0YaKEJVis9saDsRvpmMUd5bVjCXyO4G26WeFQojuvDALtwLLoWj1cslugcom2WPyT30EdC37AiefjzEQywC8dijRa1Nx72NrifY/FGPExxw2phWpnGWXJ9w2LX8xnnWuhCMYKeeBScyj5n9laps52lfkqoOvIZsdmm1cY/MTD1n7HC70LZ0yBQzfTEpOiaxYnyUOEbNqwvFrOkv8sGntUtu3jZLjOa6YXp2EMGn3IB6FVHvmEpTSrfBMezVULIkp4Vt+P7MlCli8pXCD0w7XgZPbP4srXYOiWGVWFa2YarDUup33cNXS3DgLIYSB1WN6vhyvLA9r/VkR4JK4wj2+yVkBQSEHE65pkMsLqIuq3QbTU2FROLJ1tXqVNmWNGA/bkZGMkAuyTKIxba78zY0B56xdmwejHtOmYgwcCdiWVvNImy04f+B6rLtDR6Q+5MAAAAAElFTkSuQmCC"/>
-</defs>
+<svg width="75" height="66" viewBox="0 0 75 66" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M42.754 49.6238C40.185 38.4236 37.6838 27.5133 35.1825 16.6031C35.0906 16.6055 34.9988 16.608 34.907 16.6104C31.0185 26.8164 27.1324 37.0199 23.1231 47.5451C30.4119 41.9986 35.8495 42.4811 42.754 49.6214V49.6238ZM10.665 33.1354C10.1212 36.3522 9.58957 39.491 8.99748 42.9977C8.77031 42.2837 8.64464 41.9279 8.54555 41.5624C7.83263 38.989 7.13903 36.4107 6.39227 33.847C6.30527 33.5472 5.95485 33.1403 5.69384 33.1135C4.78275 33.0233 3.85715 33.0793 2.79138 33.0793C2.9243 33.5862 3.01372 33.9688 3.12247 34.3441C4.10365 37.729 5.08967 41.114 6.07085 44.4989C6.79344 46.987 6.79344 46.9212 9.32132 47.0017C10.4282 47.0358 10.7617 46.5825 10.9429 45.6028C11.4408 42.9125 12.0159 40.2342 12.4993 37.8606C12.869 39.759 13.2702 41.9499 13.7221 44.1285C14.3215 47.0187 14.3384 46.9846 17.2674 46.9773C18.065 46.9773 18.3912 46.6897 18.5942 45.9391C19.2274 43.5924 19.9403 41.2699 20.6097 38.9329C21.1535 37.0345 21.6779 35.1313 22.2386 33.1403H18.9616C18.0746 36.3497 17.1998 39.5251 16.3225 42.7004C15.8754 41.0896 15.6023 39.5129 15.3317 37.9362C15.0586 36.3497 14.7903 34.7608 14.5148 33.1378H10.6698L10.665 33.1354ZM45.4994 26.3704C44.9653 24.1893 44.4771 22.152 43.9527 20.1221C43.8705 19.8053 43.6409 19.2984 43.4403 19.2789C42.4906 19.1887 41.5263 19.2399 40.4171 19.2399C41.2605 22.2885 42.0338 25.052 42.7854 27.8228C43.4283 30.1891 43.4186 30.1331 45.8426 30.2037C46.9083 30.2354 47.3167 29.8699 47.5004 28.8342C47.7832 27.2404 48.2351 25.6783 48.6604 23.914C48.9964 25.2787 49.2501 26.424 49.5619 27.5499C50.3038 30.2305 50.3159 30.2037 53.0371 30.1721C53.7573 30.1623 54.098 29.9625 54.2744 29.2095C54.7626 27.121 55.3595 25.0593 55.9009 22.983C56.215 21.7792 56.5123 20.5705 56.8603 19.1911C56.2682 19.1911 55.8356 19.1911 55.403 19.1911C53.2304 19.2033 53.6968 19.0011 53.2183 20.9043C52.7737 22.6662 52.4619 24.4623 52.0535 26.4265C51.4686 24.182 50.8838 22.1691 50.4343 20.1245C50.1056 18.6282 49.0036 19.3617 48.2133 19.196C47.4062 19.0279 47.0847 19.4665 46.9228 20.2171C46.4902 22.2252 46.0021 24.221 45.5018 26.3704H45.4994ZM68.4726 46.8871C68.4726 44.9449 68.4532 43.0879 68.4847 41.231C68.4943 40.6729 68.5547 40.0905 68.7336 39.569C69.0236 38.7233 69.7244 38.4431 70.5703 38.5259C71.4355 38.6112 71.6892 39.2643 71.7448 39.9832C71.81 40.8313 71.7786 41.6867 71.781 42.5372C71.7859 43.975 71.781 45.4152 71.781 46.9505C72.7018 46.9505 73.422 46.931 74.1397 46.9554C74.7512 46.9773 75.0025 46.7287 74.9953 46.0976C74.9687 43.7045 75.0484 41.3065 74.9445 38.9183C74.8406 36.5374 72.8831 35.2166 70.6138 35.972C69.8453 36.2279 69.1952 36.8396 68.3928 37.3489V31.2955H65.3454V46.8871H68.4726ZM12.4848 30.1574C13.3427 30.1574 13.9831 30.1063 14.6115 30.1696C15.5153 30.2598 15.8029 29.904 15.7884 28.9999C15.7498 26.4825 15.7957 23.9651 15.8078 21.4478C15.8102 20.7337 15.8078 20.0197 15.8078 19.1838C16.4723 19.1838 16.9484 19.1838 17.4269 19.1838C18.9801 19.179 19.6874 18.391 19.5488 16.82C19.5343 16.664 19.4715 16.5129 19.399 16.24C17.6348 16.24 15.8706 16.24 14.1064 16.24C12.3422 16.24 10.5949 16.24 8.87423 16.24C8.57617 18.1782 9.31165 19.1562 11.0807 19.1741C11.1218 19.1741 11.1628 19.179 11.2015 19.1741C12.3035 18.9986 12.5355 19.5079 12.5089 20.5558C12.4364 23.6751 12.4824 26.7993 12.4824 30.1526L12.4848 30.1574ZM52.1888 43.953C51.5484 44.1187 50.9563 44.4282 50.398 44.3698C49.9582 44.3259 49.2259 43.8604 49.2018 43.5363C49.0785 41.9036 49.1462 40.2562 49.1462 38.5332C49.7769 38.5332 50.253 38.5332 50.7291 38.5332C51.2052 38.5332 51.7272 38.5332 52.2009 38.5332V36.0305H49.0882V33.3377C48.0224 33.4985 46.9639 33.423 46.1978 33.8665C45.7942 34.1004 45.9006 35.2336 45.7773 35.9574C45.2964 36.0207 44.8348 36.0792 44.3949 36.1377V38.4675C44.9194 38.5259 45.3447 38.5722 45.8909 38.6356C45.8909 40.2318 45.8957 41.7646 45.8909 43.2951C45.8788 46.195 47.2297 47.5378 50.0815 47.1893C53.4165 46.7799 52.9501 46.7994 52.1888 43.9555V43.953ZM61.2176 43.2219C60.2461 43.858 59.6202 44.5525 58.929 44.6281C58.3973 44.6841 57.5297 44.0919 57.2518 43.5558C56.5534 42.2082 56.5558 40.6875 57.3074 39.3545C57.5877 38.8574 58.3707 38.3992 58.9363 38.387C59.422 38.3773 59.9392 39.0036 60.4032 39.3984C60.5603 39.5324 60.5917 39.8151 60.7198 40.127C61.5946 39.8687 62.4187 39.6274 63.2259 39.3886C63.2066 38.0995 62.687 37.2222 61.7807 36.5812C59.0764 34.6707 54.8013 36.106 54.0303 39.3253C53.7041 40.6899 53.6968 42.2642 54.0134 43.6314C54.8013 47.0138 59.4317 48.4687 62.1118 46.2486C62.7402 45.7271 63.1123 44.8888 63.7068 44.0456C62.5468 43.6606 61.7131 43.3852 61.22 43.2219H61.2176ZM65.3139 9.1314C65.3139 6.28748 65.3357 3.49717 65.2753 0.709293C65.2704 0.470471 64.7194 0.0513152 64.4149 0.0440044C61.962 -0.0120456 59.5042 -0.0193564 57.0512 0.0464413C56.7491 0.0537522 56.2344 0.548454 56.1981 0.862821C55.8719 3.67506 55.896 3.67994 58.7308 3.6775C58.8928 3.6775 59.0523 3.6775 59.2142 3.6775C60.864 3.67425 61.6881 4.51175 61.6865 6.19C61.6832 8.41738 62.8924 9.39703 65.3139 9.12897V9.1314ZM0.0194214 4.60111C0.0194214 4.60111 0.0170047 4.60111 0.014588 4.60111C0.014588 5.77572 0.0484218 6.95033 0.00250444 8.12494C-0.0289127 8.94376 0.229675 9.28493 1.09485 9.26056C4.08915 9.18014 3.61064 9.6261 3.63723 6.80655C3.66864 3.66775 3.64448 3.69212 6.72819 3.67019C9.41557 3.6507 9.1304 4.23313 9.1739 1.11139C9.1739 1.03097 9.20531 0.916434 9.16423 0.872568C8.87906 0.57526 8.58422 0.0537522 8.28213 0.0440044C5.82918 -0.0217934 3.37864 0.0171979 0.928102 0.000139211C0.256258 -0.00229774 -0.00232897 0.2877 0.0121713 0.952988C0.038755 2.16903 0.0194214 3.38263 0.0194214 4.59867V4.60111ZM61.7227 56.8494C61.7227 58.3311 61.6599 59.7396 61.7445 61.1409C61.8049 62.14 61.4182 62.4056 60.5047 62.3691C59.1465 62.313 57.7835 62.3545 56.4664 62.3545C55.5408 65.3007 55.9685 65.9514 58.7357 65.9977C59.3785 66.0075 60.0214 65.9953 60.6642 65.9953C62.1771 65.9953 63.6875 65.9953 65.2076 65.9953V56.8543H61.7275L61.7227 56.8494ZM0.038755 56.8323C0.038755 59.7104 0.014588 62.4909 0.0822557 65.2691C0.0870891 65.5079 0.710599 65.9148 1.05619 65.927C2.90013 65.9953 4.74891 65.9612 6.59527 65.9685C9.32132 65.9782 9.38657 65.9343 9.03614 63.2147C8.99506 62.8979 8.51172 62.4227 8.19997 62.3935C7.08586 62.2911 5.95243 62.2984 4.8335 62.3666C3.86198 62.4251 3.57198 62.023 3.60823 61.097C3.66139 59.6958 3.62273 58.2896 3.62273 56.8323H0.0363383H0.038755ZM61.498 30.0746C61.498 24.9887 61.51 20.0465 61.4641 15.1019C61.4617 14.8412 61.0074 14.4878 60.6908 14.3562C60.3814 14.2271 59.973 14.3684 59.6178 14.3172C58.4626 14.1515 58.1097 14.5902 58.1412 15.7892C58.2402 19.5567 58.2064 23.3291 58.2233 27.0991C58.2282 28.0641 58.2233 29.0267 58.2233 30.0746H61.498ZM23.4059 19.1936C22.8839 19.1936 22.4392 19.2472 22.0138 19.1838C20.8224 19.0084 20.5082 19.525 20.5542 20.6752C20.6436 22.9416 20.6049 25.2153 20.6025 27.4865C20.5977 30.4182 20.5904 30.4182 23.5267 30.1038C23.5968 30.0965 23.6596 30.021 23.7273 29.9747C23.7587 29.8991 23.8143 29.826 23.8143 29.7505C23.8433 28.3736 23.8457 26.9943 23.8965 25.6174C23.9907 23.0878 24.694 22.4347 27.2315 22.4518C27.4176 22.4518 27.6061 22.4104 27.8429 22.3811C27.9517 21.2455 28.0532 20.1781 28.1619 19.0254C26.0908 18.8085 24.7447 19.642 23.8143 21.5136C23.662 20.6484 23.5485 20.0148 23.4035 19.196L23.4059 19.1936Z" fill="#1EE0AB"/>
 </svg>
diff --git a/frontend/services/backend-rest-client.ts b/frontend/services/backend-rest-client.ts
index 9c015e9d..26f695f0 100644
--- a/frontend/services/backend-rest-client.ts
+++ b/frontend/services/backend-rest-client.ts
@@ -1,62 +1,140 @@
+import { TOTAL_AMPS } from "@/constants/totals.constants"
+import axios, { InternalAxiosRequestConfig } from "axios"
 
-import { Vessel, VesselExcursion, VesselExcursionSegment, VesselPositions, VesselTrackingTimeDto } from "@/types/vessel";
-import { ZoneVisitTimeDto } from "@/types/zone";
-import axios, { InternalAxiosRequestConfig } from "axios";
-import { log } from "console";
+import {
+  Vessel,
+  VesselExcursion,
+  VesselExcursionSegment,
+  VesselMetrics,
+  VesselPositions,
+} from "@/types/vessel"
+import { ZoneMetrics, ZoneVesselMetrics, ZoneWithGeometry } from "@/types/zone"
 
-const BASE_URL = process.env.NEXT_PUBLIC_BACKEND_BASE_URL;
-const API_KEY = process.env.NEXT_PUBLIC_BACKEND_API_KEY ?? 'no-key-found';
+const BASE_URL = process.env.NEXT_PUBLIC_BACKEND_BASE_URL
+const API_KEY = process.env.NEXT_PUBLIC_BACKEND_API_KEY ?? "no-key-found"
+const CACHE_CONTROL_HEADER = "public, max-age=2592000" // 30 days in seconds
 
 // Authenticate all requests to Bloom backend
 axios.interceptors.request.use((request: InternalAxiosRequestConfig) => {
-  request.headers.set('x-key', API_KEY);
-    return request;
-});
+  request.headers.set("x-key", API_KEY)
+  return request
+})
 
 export function getVessels() {
-  const url = `${BASE_URL}/vessels`;
-  console.log(`GET ${url}`);
-  return axios.get<Vessel[]>(url);
+  const url = `${BASE_URL}/vessels`
+  console.log(`GET ${url}`)
+  return axios.get<Vessel[]>(url)
+}
+
+export function getVesselsAtSea(startAt: string, endAt: string) {
+  const url = `${BASE_URL}/metrics/vessels-at-sea?start_at=${startAt}&end_at=${endAt}`
+  console.log(`GET ${url}`)
+  return axios.get<number>(url)
+}
+
+export function getVesselsTrackedCount() {
+  const url = `${BASE_URL}/vessels/trackedCount`
+  console.log(`GET ${url}`)
+  return axios.get<number>(url)
 }
 
 export function getVesselsLatestPositions() {
-  const url = `${BASE_URL}/vessels/all/positions/last`;
-  console.log(`GET ${url}`);
-  return axios.get<VesselPositions>(url);
+  const url = `${BASE_URL}/vessels/all/positions/last`
+  console.log(`GET ${url}`)
+  return axios.get<VesselPositions>(url)
 }
 
 export function getVesselExcursion(vesselId: number) {
-  const url = `${BASE_URL}/vessels/${vesselId}/excursions`;
-  console.log(`GET ${url}`);
-  return axios.get<VesselExcursion[]>(url);
+  const url = `${BASE_URL}/vessels/${vesselId}/excursions`
+  console.log(`GET ${url}`)
+  return axios.get<VesselExcursion[]>(url)
 }
 
 export function getVesselSegments(vesselId: number, excursionId: number) {
-  const url = `${BASE_URL}/vessels/${vesselId}/excursions/${excursionId}/segments`;
-  console.log(`GET ${url}`);
-  return axios.get<VesselExcursionSegment[]>(url);
+  const url = `${BASE_URL}/vessels/${vesselId}/excursions/${excursionId}/segments`
+  console.log(`GET ${url}`)
+  return axios.get<VesselExcursionSegment[]>(url)
 }
 
 export async function getVesselFirstExcursionSegments(vesselId: number) {
   try {
-    const response = await getVesselExcursion(vesselId);
-    const excursionId = response?.data[0]?.id;
-    return !!excursionId ? getVesselSegments(vesselId, excursionId) : [];
-
-  } catch(error) {
-    console.error(error);
-    return [];
+    const response = await getVesselExcursion(vesselId)
+    const excursionId = response?.data[0]?.id
+    if (!!excursionId) {
+      const segments = await getVesselSegments(vesselId, excursionId)
+      return segments.data
+    }
+    return []
+  } catch (error) {
+    console.error(error)
+    return []
   }
 }
 
-export function getTopVesselsInActivity(startAt: string, endAt: string, topVesselsLimit: number) {
-  const url = `${BASE_URL}/metrics/vessels-in-activity?start_at=${startAt}&end_at=${endAt}&limit=${topVesselsLimit}&order=DESC`;
-  console.log(`GET ${url}`);
-  return axios.get<VesselTrackingTimeDto[]>(url);
+export function getTopVesselsInActivity(
+  startAt: string,
+  endAt: string,
+  topVesselsLimit: number
+) {
+  const url = `${BASE_URL}/metrics/vessels-in-activity?start_at=${startAt}&end_at=${endAt}&limit=${topVesselsLimit}&order=DESC`
+  console.log(`GET ${url}`)
+  return axios.get<VesselMetrics[]>(url)
+}
+
+export function getTopZonesVisited(
+  startAt: string,
+  endAt: string,
+  topZonesLimit: number,
+  category?: string
+) {
+  const url = `${BASE_URL}/metrics/zone-visited?${
+    category ? `category=${category}&` : ""
+  }start_at=${startAt}&end_at=${endAt}&limit=${topZonesLimit}&order=DESC`
+  console.log(`GET ${url}`)
+  return axios.get<ZoneMetrics[]>(url)
+}
+
+export async function getZoneDetails(
+  zoneId: string,
+  startAt: string,
+  endAt: string
+) {
+  const url = `${BASE_URL}/metrics/zones/${zoneId}/visiting-time-by-vessel?start_at=${startAt}&end_at=${endAt}&order=DESC&limit=10`
+  console.log(`GET ${url}`)
+  const response = await axios.get<ZoneVesselMetrics[]>(url)
+  console.log(response)
+  return response
 }
 
-export function getTopZonesVisited(startAt: string, endAt: string, topZonesLimit: number) {
-  const url = `${BASE_URL}/metrics/zone-visited?start_at=${startAt}&end_at=${endAt}&limit=${topZonesLimit}&order=DESC`;
-  console.log(`GET ${url}`);
-  return axios.get<ZoneVisitTimeDto[]>(url);
+export async function getZones() {
+  const url = `${BASE_URL}/zones`
+  console.log(`GET ${url}`)
+
+  // Calculate ranges for batches of 10
+  const ranges = []
+  for (let i = 0; i < TOTAL_AMPS; i += 100) {
+    const end = Math.min(i + 99, TOTAL_AMPS - 1)
+    ranges.push(`items=${i}-${end}`)
+  }
+
+  // Add start time
+  const startTime = performance.now()
+
+  // Make parallel requests for each range
+  const responses = await Promise.all(
+    ranges.map((range) =>
+      axios.get<ZoneWithGeometry[]>(url, {
+        headers: { range, "Cache-Control": CACHE_CONTROL_HEADER },
+      })
+    )
+  )
+
+  // Calculate and log duration
+  const duration = performance.now() - startTime
+  console.log(`Fetched zones in ${(duration / 1000).toFixed(2)}s`)
+
+  // Combine all responses
+  return {
+    data: responses.flatMap((response) => response.data),
+  }
 }
diff --git a/frontend/services/dashboard.service.ts b/frontend/services/dashboard.service.ts
new file mode 100644
index 00000000..a5bf271d
--- /dev/null
+++ b/frontend/services/dashboard.service.ts
@@ -0,0 +1,153 @@
+import { TOTAL_VESSELS } from "@/constants/totals.constants"
+import {
+  getTopVesselsInActivity,
+  getTopZonesVisited,
+  getVesselsAtSea,
+  getVesselsTrackedCount,
+} from "@/services/backend-rest-client"
+import { swrOptions } from "@/services/swr"
+import useSWR from "swr"
+
+import { convertVesselDtoToItem, convertZoneDtoToItem } from "@/libs/mapper"
+
+const TOP_ITEMS_SIZE = 5
+
+type DashboardData = {
+  topVesselsInActivity: any[]
+  topAmpsVisited: any[]
+  totalVesselsInActivity: number
+  totalAmpsVisited: number
+  totalVesselsTracked: number
+  isLoading: {
+    topVesselsInActivity: boolean
+    topAmpsVisited: boolean
+    totalVesselsInActivity: boolean
+    totalAmpsVisited: boolean
+    totalVesselsTracked: boolean
+  }
+}
+
+export const useDashboardData = (
+  startAt: string,
+  endAt: string
+): DashboardData => {
+  const {
+    data: topVesselsInActivity = [],
+    isLoading: topVesselsInActivityLoading,
+  } = useSWR(
+    `topVesselsInActivity-${startAt}-${endAt}`,
+    async () => {
+      try {
+        const response = await getTopVesselsInActivity(
+          startAt,
+          endAt,
+          TOP_ITEMS_SIZE
+        )
+        return convertVesselDtoToItem(response?.data || [])
+      } catch (error) {
+        console.log(
+          "An error occurred while fetching top vessels in activity: " + error
+        )
+        return []
+      }
+    },
+    swrOptions
+  )
+
+  const { data: topAmpsVisited = [], isLoading: topAmpsVisitedLoading } =
+    useSWR(
+      `topAmpsVisited-${startAt}-${endAt}`,
+      async () => {
+        try {
+          const response = await getTopZonesVisited(
+            startAt,
+            endAt,
+            TOP_ITEMS_SIZE,
+            "amp"
+          )
+          return convertZoneDtoToItem(response?.data || [])
+        } catch (error) {
+          console.log(
+            "An error occurred while fetching top amps visited: " + error
+          )
+          return []
+        }
+      },
+      swrOptions
+    )
+
+  const {
+    data: totalVesselsInActivity = 0,
+    isLoading: totalVesselsInActivityLoading,
+  } = useSWR(
+    `totalVesselsInActivity-${startAt}-${endAt}`,
+    async () => {
+      try {
+        const response = await getVesselsAtSea(startAt, endAt)
+        return response?.data
+      } catch (error) {
+        console.log(
+          "An error occurred while fetching total vessels in activity: " + error
+        )
+        return 0
+      }
+    },
+    swrOptions
+  )
+
+  const { data: totalAmpsVisited = 0, isLoading: totalAmpsVisitedLoading } =
+    useSWR(
+      `totalAmpsVisited-${startAt}-${endAt}`,
+      async () => {
+        try {
+          const response = await getTopZonesVisited(
+            startAt,
+            endAt,
+            100000,
+            "amp"
+          )
+          return response?.data?.length
+        } catch (error) {
+          console.log(
+            "An error occurred while fetching total amps visited: " + error
+          )
+          return 0
+        }
+      },
+      swrOptions
+    )
+
+  const {
+    data: totalVesselsTracked = TOTAL_VESSELS,
+    isLoading: totalVesselsTrackedLoading,
+  } = useSWR(
+    "vesselsTrackedCount",
+    async () => {
+      try {
+        const response = await getVesselsTrackedCount()
+        return response?.data
+      } catch (error) {
+        console.log(
+          "An error occurred while fetching vessels tracked count: " + error
+        )
+        return TOTAL_VESSELS
+      }
+    },
+    swrOptions
+  )
+
+  return {
+    topVesselsInActivity,
+    topAmpsVisited,
+    totalVesselsInActivity,
+    totalAmpsVisited,
+    totalVesselsTracked,
+    isLoading: {
+      topVesselsInActivity: topVesselsInActivityLoading,
+      topAmpsVisited: topAmpsVisitedLoading,
+      totalVesselsInActivity: totalVesselsInActivityLoading,
+      totalAmpsVisited: totalAmpsVisitedLoading,
+      totalVesselsTracked: totalVesselsTrackedLoading,
+    },
+  }
+}
diff --git a/frontend/services/swr.ts b/frontend/services/swr.ts
new file mode 100644
index 00000000..4133e5ab
--- /dev/null
+++ b/frontend/services/swr.ts
@@ -0,0 +1,7 @@
+export const swrOptions = {
+  refreshInterval: 1000 * 60 * 60,
+  revalidateOnFocus: false,
+  dedupingInterval: 1000 * 60 * 60,
+  keepPreviousData: true,
+  revalidateOnMount: true,
+}
diff --git a/frontend/styles/globals.css b/frontend/styles/globals.css
index fbb6eaf4..03f874d2 100644
--- a/frontend/styles/globals.css
+++ b/frontend/styles/globals.css
@@ -4,7 +4,7 @@
 
 @layer base {
   :root {
-    --background: 0 0% 100%;
+    --background: 223 33% 22%;
     --foreground: 222.2 47.4% 11.2%;
 
     --muted: 210 40% 96.1%;
@@ -19,13 +19,13 @@
     --card: 0 0% 100%;
     --card-foreground: 222.2 47.4% 11.2%;
 
-    --primary: 222.2 47.4% 11.2%;
-    --primary-foreground: 210 40% 98%;
+    --primary: 164 76% 53%;
+    --primary-foreground: 222.2 47.4% 11.2%;
 
     --secondary: 210 40% 96.1%;
     --secondary-foreground: 222.2 47.4% 11.2%;
 
-    --accent: 210 40% 96.1%;
+    --accent: 223 33% 26%;
     --accent-foreground: 222.2 47.4% 11.2%;
 
     --destructive: 0 100% 50%;
@@ -75,7 +75,7 @@
     @apply border-border;
   }
   body {
-    @apply font-unito bg-background text-foreground;
+    @apply bg-background font-unito text-foreground;
     font-feature-settings:
       "rlig" 1,
       "calt" 1;
diff --git a/frontend/types/item.tsx b/frontend/types/item.ts
similarity index 91%
rename from frontend/types/item.tsx
rename to frontend/types/item.ts
index 0a60290d..233a17ac 100644
--- a/frontend/types/item.tsx
+++ b/frontend/types/item.ts
@@ -4,6 +4,7 @@ export type Item = {
   description: string
   value: string
   type: string
+  countryIso3?: string
 }
 
 export type ItemDetails = {
diff --git a/frontend/types/vessel.ts b/frontend/types/vessel.ts
new file mode 100644
index 00000000..f504340b
--- /dev/null
+++ b/frontend/types/vessel.ts
@@ -0,0 +1,131 @@
+export type Vessel = {
+  id: number
+  mmsi: number
+  ship_name: string
+  width: number
+  length: number
+  country_iso3: string
+  type: string | null
+  imo: number | null
+  cfr: string
+  external_marking: string
+  ircs: string
+  length_class: string
+}
+
+export type VesselMetrics = {
+  vessel: VesselDetails
+  total_time_at_sea: string
+}
+
+export type VesselDetails = {
+  id: number
+  imo: number
+  mmsi: number
+  ship_name: string
+  width: number | null
+  length: number
+  country_iso3: string
+  type: string
+  external_marking: string
+  ircs: string
+  tracking_activated: boolean
+  tracking_status: string
+  created_at: string
+  updated_at: string | null
+  check: string
+  length_class: string
+}
+
+export type VesselPositions = VesselPosition[]
+
+export interface VesselPosition {
+  arrival_port: string
+  excurision_id: number
+  heading: number
+  position: VesselPositionCoordinates
+  speed: number
+  timestamp: string
+  vessel: Vessel
+}
+
+export interface VesselPositionCoordinates {
+  coordinates: number[]
+  type: string
+}
+
+export type VesselExcursionSegmentGeo = {
+  speed: number
+  heading?: number
+  navigational_status: string
+  geometry: {
+    type: string
+    coordinates: number[][]
+  }
+}
+
+export type VesselExcursionSegmentsGeo = {
+  vesselId: number
+  type: any
+  features: any
+}
+
+export type VesselExcursionSegments = {
+  vesselId: number
+  segments: VesselExcursionSegment[]
+}
+
+export type VesselExcursion = {
+  id: number
+  vessel_id: number
+  departure_port_id: number
+  departure_at: string
+  departure_position: {
+    coordinates: number[]
+  }
+  arrival_port_id: number
+  arrival_at: number
+  arrival_position: number
+  excursion_duration: number
+  total_time_at_sea: string
+  total_time_in_amp: string
+  total_time_in_territorial_waters: string
+  total_time_in_costal_waters: string
+  total_time_fishing: string
+  total_time_fishing_in_amp: string
+  total_time_fishing_in_territorial_waters: string
+  total_time_fishing_in_costal_waters: string
+  total_time_extincting_amp: string
+  created_at: string
+  updated_at: String
+}
+
+export type VesselExcursionSegment = {
+  id: number
+  vessel_id: number
+  excursion_id: number
+  timestamp_start: string
+  timestamp_end: string
+  segment_duration: string
+  start_position: Position
+  end_position: Position
+  course: number
+  distance: number
+  average_speed: number
+  speed_at_start: number
+  speed_at_end: number
+  heading_at_start: number
+  heading_at_end: number
+  type: string
+  in_amp_zone: boolean
+  in_territorial_waters: boolean
+  in_costal_waters: boolean
+  last_vessel_segment: boolean
+  created_at: string
+  updated_at: string
+}
+
+export type Position = {
+  type: string
+  coordinates: number[]
+}
diff --git a/frontend/types/vessel.tsx b/frontend/types/vessel.tsx
deleted file mode 100644
index d51ef047..00000000
--- a/frontend/types/vessel.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-export type Vessel = {
-  id: number
-  mmsi: number
-  ship_name: string
-  width: number
-  length: number
-  country_iso3: string
-  type: string | null
-  imo: number | null
-  cfr: string
-  external_marking: string
-  ircs: string
-  length_class: string
-}
-
-export type VesselTrackingTimeDto = {
-  vessel_id: number;
-  vessel_mmsi: number;
-  vessel_ship_name: string;
-  vessel_width: number;
-  vessel_length: number;
-  vessel_country_iso3: string;
-  vessel_type: string;
-  vessel_imo: number;
-  vessel_cfr: string;
-  vessel_external_marking: string;
-  vessel_ircs: string;
-  vessel_home_port_id: number;
-  vessel_details: string;
-  vessel_tracking_activated: boolean
-  vessel_tracking_status: string;
-  vessel_length_class: string;
-  vessel_check: string;
-  total_time_at_sea: string;
-}
-
-export type VesselPositions = VesselPosition[]
-
-export interface VesselPosition {
-  arrival_port: string;
-  excurision_id: number;
-  heading: number;
-  position: VesselPositionCoordinates;
-  speed: number;
-  timestamp: string;
-  vessel: Vessel;
-}
-
-export interface VesselPositionCoordinates {
-  coordinates: number[];
-  type: string;
-}
-
-export type VesselExcursionSegmentGeo = {
-  speed: number
-  heading?: number
-  navigational_status: string
-  geometry: {
-    type: string;
-    coordinates: number[][];
-  } 
-}
-
-export type VesselExcursionSegmentsGeo = {
-  vesselId: number
-  type: any;
-  features: any;
-}
-
-export type VesselExcursionSegments = {
-  vesselId: number;
-  segments: VesselExcursionSegment[];
-}
-
-export type VesselExcursion = {
-    id: number;
-    vessel_id: number;
-    departure_port_id: number;
-    departure_at: string;
-    departure_position: {
-      coordinates: number[];
-    }
-    arrival_port_id: number;
-    arrival_at: number;
-    arrival_position: number;
-    excursion_duration: number;
-    total_time_at_sea: string;
-    total_time_in_amp: string;
-    total_time_in_territorial_waters: string;
-    total_time_in_costal_waters: string;
-    total_time_fishing: string;
-    total_time_fishing_in_amp: string;
-    total_time_fishing_in_territorial_waters: string;
-    total_time_fishing_in_costal_waters: string;
-    total_time_extincting_amp: string;
-    created_at: string;
-    updated_at: String;
-}
-
-export type VesselExcursionSegment = {
-    id: number;
-    vessel_id: number;
-    excursion_id: number;
-    timestamp_start: string;
-    timestamp_end: string;
-    segment_duration: string;
-    start_position: Position
-    end_position: Position;
-    course: number;
-    distance: number;
-    average_speed: number;
-    speed_at_start: number;
-    speed_at_end: number;
-    heading_at_start: number;
-    heading_at_end: number;
-    type: string;
-    in_amp_zone: boolean;
-    in_territorial_waters: boolean;
-    in_costal_waters: boolean;
-    last_vessel_segment: boolean;
-    created_at: string;
-    updated_at: string;
-}
-
-export type Position = {
-  type: string;
-  coordinates: number[]
-}
\ No newline at end of file
diff --git a/frontend/types/zone.ts b/frontend/types/zone.ts
new file mode 100644
index 00000000..1fd99e82
--- /dev/null
+++ b/frontend/types/zone.ts
@@ -0,0 +1,43 @@
+import { VesselDetails } from "./vessel"
+
+export enum ZoneCategory {
+  AMP = "amp",
+  TERRITORIAL_SEAS = "Territorial seas",
+  FISHING_COASTAL_WATERS = "Fishing coastal waters (6-12 NM)",
+}
+
+export type ZoneVisitTimeDto = {
+  zone_id: number
+  zone_category: string
+  zone_sub_category: string
+  zone_name: string
+  visiting_duration: string
+}
+
+export interface ZoneDetails {
+  id: number
+  created_at: string
+  updated_at: string
+  category: string
+  sub_category: string
+  name: string
+}
+
+export interface ZoneMetrics {
+  zone: ZoneDetails
+  visiting_duration: string
+  vessel_visiting_time_by_zone: string
+}
+
+export type ZoneVesselMetrics = {
+  zone: ZoneDetails
+  vessel: VesselDetails
+  zone_visiting_time_by_vessel: string
+}
+
+export type ZoneWithGeometry = ZoneDetails & {
+  geometry: {
+    type: string
+    coordinates: number[][][]
+  }
+}
diff --git a/frontend/types/zone.tsx b/frontend/types/zone.tsx
deleted file mode 100644
index 73b13334..00000000
--- a/frontend/types/zone.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-
-export type ZoneVisitTimeDto = {
-  zone_id: number;
-  zone_category: string;
-  zone_sub_category: string;
-  zone_name: string;
-  visiting_duration: string;
-}
\ No newline at end of file
diff --git a/frontend/utils/vessel.utils.ts b/frontend/utils/vessel.utils.ts
new file mode 100644
index 00000000..6b4ec00f
--- /dev/null
+++ b/frontend/utils/vessel.utils.ts
@@ -0,0 +1,10 @@
+import { COUNTRIES_ISO3 } from "@/constants/countries-iso3.constants"
+
+export const getCountryNameFromIso3 = (
+  countryIso3: string | null | undefined
+): string => {
+  if (!countryIso3) return ""
+  return (
+    COUNTRIES_ISO3.find((country) => country.code === countryIso3)?.name ?? ""
+  )
+}