diff --git a/backend/app/routers/dive_sites.py b/backend/app/routers/dive_sites.py
index 0ca2c55f..3d95f6a7 100644
--- a/backend/app/routers/dive_sites.py
+++ b/backend/app/routers/dive_sites.py
@@ -3680,12 +3680,12 @@ async def get_dive_site_dives(
     request: Request,
     dive_site_id: int,
     limit: int = Query(10, ge=1, le=50),
+    sort_by: str = Query("recent", description="Sort order: 'recent' (dive date desc) or 'rating' (rating desc, then date desc)"),
     db: Session = Depends(get_db),
     current_user: User = Depends(get_current_user_optional)
 ):
     """
-    Get top dives for a specific dive site, ordered by rating (descending).
-    If no rating is available, returns the first 10 dives.
+    Get dives for a specific dive site, ordered by recent date (descending) or rating (descending).
     """
     # Check if dive site exists
     dive_site = db.query(DiveSite).filter(DiveSite.id == dive_site_id).first()
@@ -3710,13 +3710,18 @@ async def get_dive_site_dives(
             )
         )
 
-    # Order by rating (descending) first, then by dive date (descending)
-    # Dives with no rating will be ordered by dive date
-    query = query.order_by(
-        desc(Dive.user_rating),  # Highest rating first
-        desc(Dive.dive_date),    # Most recent first
-        desc(Dive.dive_time)     # Most recent time first
-    )
+    # Order by rating or recent date
+    if sort_by == "rating":
+        query = query.order_by(
+            desc(Dive.user_rating),  # Highest rating first
+            desc(Dive.dive_date),    # Most recent first
+            desc(Dive.dive_time)     # Most recent time first
+        )
+    else:
+        query = query.order_by(
+            desc(Dive.dive_date),    # Most recent first
+            desc(Dive.dive_time)     # Most recent time first
+        )
 
     # Limit results
     dives = query.limit(limit).all()
diff --git a/backend/app/routers/seo.py b/backend/app/routers/seo.py
index f497844d..271bd21b 100644
--- a/backend/app/routers/seo.py
+++ b/backend/app/routers/seo.py
@@ -10,10 +10,20 @@
 from fastapi import APIRouter, Depends, HTTPException, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 import httpx
-from sqlalchemy.orm import Session, joinedload
+from sqlalchemy.orm import Session, joinedload, selectinload
 
 from app.database import get_db
-from app.models import Dive, DiveRoute, DiveSite, DivingCenter, DivingOrganization, User, MediaType
+from app.models import (
+    Dive,
+    DiveRoute,
+    DiveSite,
+    DivingCenter,
+    DivingOrganization,
+    User,
+    MediaType,
+    DiveSiteTag,
+    CenterDiveSite,
+)
 
 def make_absolute_url(url: str, base_url: str) -> str:
     if not url:
@@ -278,7 +288,15 @@ async def get_prerendered_page(request: Request, path: str, db: Session = Depend
                 site = (
                     db.query(DiveSite)
                     .filter(DiveSite.id == site_id, DiveSite.status == "approved", DiveSite.deleted_at.is_(None))
-                    .options(joinedload(DiveSite.difficulty), joinedload(DiveSite.ratings), joinedload(DiveSite.media))
+                    .options(
+                        joinedload(DiveSite.difficulty),
+                        joinedload(DiveSite.ratings),
+                        joinedload(DiveSite.media),
+                        selectinload(DiveSite.aliases),
+                        selectinload(DiveSite.tags).joinedload(DiveSiteTag.tag),
+                        selectinload(DiveSite.routes),
+                        selectinload(DiveSite.center_relationships).joinedload(CenterDiveSite.diving_center),
+                    )
                     .first()
                 )
                 if not site:
diff --git a/backend/generate_static_content.py b/backend/generate_static_content.py
index c3ca9fed..8f49318c 100644
--- a/backend/generate_static_content.py
+++ b/backend/generate_static_content.py
@@ -12,9 +12,20 @@
 if current_dir not in sys.path:
     sys.path.append(current_dir)
 
-from sqlalchemy.orm import Session, joinedload
+from sqlalchemy.orm import Session, joinedload, selectinload
 from app.database import SessionLocal
-from app.models import DiveSite, DiveRoute, DivingCenter, Dive, ParsedDiveTrip, User, DivingOrganization, CertificationLevel
+from app.models import (
+    DiveSite,
+    DiveRoute,
+    DivingCenter,
+    Dive,
+    ParsedDiveTrip,
+    User,
+    DivingOrganization,
+    CertificationLevel,
+    DiveSiteTag,
+    CenterDiveSite,
+)
 from app.seo_geo import (
     distinct_approved_countries,
     distinct_approved_regions_by_country,
@@ -192,7 +203,19 @@ def generate_content(db: Session, r2_client=None):
     BASE_URL = CANONICAL_BASE_URL.rstrip("/")
 
     # Data gathering
-    sites = db.query(DiveSite).filter(DiveSite.status == 'approved').all()
+    sites = (
+        db.query(DiveSite)
+        .filter(DiveSite.status == 'approved', DiveSite.deleted_at.is_(None))
+        .options(
+            joinedload(DiveSite.difficulty),
+            joinedload(DiveSite.ratings),
+            selectinload(DiveSite.aliases),
+            selectinload(DiveSite.tags).joinedload(DiveSiteTag.tag),
+            selectinload(DiveSite.routes),
+            selectinload(DiveSite.center_relationships).joinedload(CenterDiveSite.diving_center),
+        )
+        .all()
+    )
     routes = db.query(DiveRoute).filter(DiveRoute.deleted_at == None).all()
     centers = db.query(DivingCenter).all()
     # LLM markdown: all public logs; sitemap uses the substantial subset below
@@ -222,6 +245,17 @@ def generate_content(db: Session, r2_client=None):
             content_sites.append(f"- **Max Depth**: {site.max_depth}m\n")
         if site.difficulty:
             content_sites.append(f"- **Difficulty**: {site.difficulty.label}\n")
+        if site.ratings:
+            avg_score = sum(r.score for r in site.ratings) / len(site.ratings)
+            content_sites.append(f"- **Rating**: {avg_score:.1f}/10 ({len(site.ratings)} reviews)\n")
+        if site.aliases:
+            alias_list = [a.alias for a in site.aliases if getattr(a, "alias", None)]
+            if alias_list:
+                content_sites.append(f"- **Also Known As**: {', '.join(alias_list)}\n")
+        if site.tags:
+            tag_list = [t.tag.name for t in site.tags if getattr(t, "tag", None) and getattr(t.tag, "name", None)]
+            if tag_list:
+                content_sites.append(f"- **Tags**: {', '.join(tag_list)}\n")
 
         # Description & Details
         if site.description:
@@ -236,6 +270,27 @@ def generate_content(db: Session, r2_client=None):
         if site.access_instructions:
             content_sites.append(f"\n**Access**:\n{site.access_instructions}\n")
 
+        if site.center_relationships:
+            centers_list = [rel.diving_center for rel in site.center_relationships if getattr(rel, "diving_center", None)]
+            if centers_list:
+                content_sites.append("\n**Associated Diving Centers**:\n")
+                for center in centers_list:
+                    c_slug = get_diving_center_slug(center)
+                    c_url = f"{BASE_URL}/diving-centers/{center.id}/{c_slug}" if c_slug else f"{BASE_URL}/diving-centers/{center.id}"
+                    c_loc = ", ".join(filter(None, [getattr(center, "city", None), getattr(center, "country", None)]))
+                    extra = f" ({c_loc})" if c_loc else ""
+                    content_sites.append(f"- [{center.name}]({c_url}){extra}\n")
+
+        if site.routes:
+            active_routes = [r for r in site.routes if not getattr(r, "deleted_at", None)]
+            if active_routes:
+                content_sites.append("\n**Dive Routes**:\n")
+                for route in active_routes:
+                    r_slug = slugify(route.name) if getattr(route, "name", None) else ""
+                    r_url = f"{BASE_URL}/dive-routes/{route.id}/{r_slug}" if r_slug else f"{BASE_URL}/dive-routes/{route.id}"
+                    r_type = f" ({route.route_type.name})" if getattr(route, "route_type", None) and getattr(route.route_type, "name", None) else ""
+                    content_sites.append(f"- [{route.name or f'Route #{route.id}'}]({r_url}){r_type}\n")
+
         content_sites.append("\n---\n\n")
 
     # 2. Dive Routes
diff --git a/backend/static_html.py b/backend/static_html.py
index dbe806b7..176a53d2 100644
--- a/backend/static_html.py
+++ b/backend/static_html.py
@@ -284,6 +284,7 @@ def _paragraph_block(label: str, value: str) -> str:
 
 def render_dive_site_main(site: DiveSite, avg_rating: Optional[float], total_ratings: int) -> str:
     from app.seo_geo import geo_hub_path
+    from generate_static_content import get_diving_center_slug, slugify
 
     crumbs = [("Home", "/"), ("Dive Sites", "/dive-sites")]
     if site.country:
@@ -305,6 +306,12 @@ def render_dive_site_main(site: DiveSite, avg_rating: Optional[float], total_rat
     if location:
         lines.append(f"<p><strong>Location:</strong> {escape_text(location)}</p>")
 
+    aliases = getattr(site, "aliases", None) or []
+    if aliases:
+        alias_names = [getattr(a, "alias", str(a)) for a in aliases if getattr(a, "alias", str(a))]
+        if alias_names:
+            lines.append(f"<p><strong>Also known as:</strong> {escape_text(', '.join(alias_names))}</p>")
+
     meta_bits = []
     if site.max_depth:
         meta_bits.append(f"Max depth: {format_depth(site.max_depth)}m")
@@ -315,6 +322,18 @@ def render_dive_site_main(site: DiveSite, avg_rating: Optional[float], total_rat
     if meta_bits:
         lines.append(f"<p>{escape_text(' · '.join(meta_bits))}</p>")
 
+    tags = getattr(site, "tags", None) or []
+    if tags:
+        tag_names = []
+        for t in tags:
+            tag_obj = getattr(t, "tag", None)
+            if tag_obj and getattr(tag_obj, "name", None):
+                tag_names.append(tag_obj.name)
+            elif isinstance(t, str):
+                tag_names.append(t)
+        if tag_names:
+            lines.append(f"<p><strong>Tags:</strong> {escape_text(', '.join(tag_names))}</p>")
+
     if total_ratings > 0 and avg_rating is not None:
         lines.append(
             f"<p><strong>Rating:</strong> {escape_text(f'{avg_rating:.1f}/10')} "
@@ -330,6 +349,33 @@ def render_dive_site_main(site: DiveSite, avg_rating: Optional[float], total_rat
     if site.safety_information:
         lines.append(_paragraph_block("Safety", site.safety_information))
 
+    center_rels = getattr(site, "center_relationships", None) or []
+    if center_rels:
+        centers = [getattr(rel, "diving_center", None) for rel in center_rels if getattr(rel, "diving_center", None)]
+        if centers:
+            lines.append("<h2>Associated Diving Centers</h2><ul>")
+            for center in centers:
+                c_slug = get_diving_center_slug(center)
+                c_href = f"/diving-centers/{center.id}/{c_slug}" if c_slug else f"/diving-centers/{center.id}"
+                c_name = escape_text(center.name)
+                c_location = ", ".join(filter(None, [getattr(center, "city", None), getattr(center, "country", None)]))
+                extra = f" ({escape_text(c_location)})" if c_location else ""
+                lines.append(f'<li><a href="{escape_text(c_href)}">{c_name}</a>{extra}</li>')
+            lines.append("</ul>")
+
+    routes = getattr(site, "routes", None) or []
+    active_routes = [r for r in routes if not getattr(r, "deleted_at", None)]
+    if active_routes:
+        lines.append("<h2>Dive Routes</h2><ul>")
+        for route in active_routes:
+            r_slug = slugify(route.name) if getattr(route, "name", None) else ""
+            r_href = f"/dive-routes/{route.id}/{r_slug}" if r_slug else f"/dive-routes/{route.id}"
+            r_name = escape_text(route.name or f"Route #{route.id}")
+            r_type_obj = getattr(route, "route_type", None)
+            r_type = f" ({escape_text(r_type_obj.name)})" if r_type_obj and getattr(r_type_obj, "name", None) else ""
+            lines.append(f'<li><a href="{escape_text(r_href)}">{r_name}</a>{r_type}</li>')
+        lines.append("</ul>")
+
     lines.extend([
         '<nav aria-label="Related pages">',
         '<a href="/dive-sites">All Dive Sites</a>',
diff --git a/backend/tests/test_dive_sites.py b/backend/tests/test_dive_sites.py
index f8256a54..cabc02a1 100644
--- a/backend/tests/test_dive_sites.py
+++ b/backend/tests/test_dive_sites.py
@@ -968,6 +968,43 @@ def test_get_dive_site_dives_empty(self, client, db_session, test_dive_site):
         data = response.json()
         assert len(data) == 0
 
+    def test_get_dive_site_dives_sorting(self, client, db_session, test_user, test_dive_site):
+        """Test getting dives sorted by recent (default) vs rating."""
+        from app.models import Dive
+        from datetime import date
+
+        dive_older_high_rated = Dive(
+            name="Older Top Rated Dive",
+            user_id=test_user.id,
+            dive_site_id=test_dive_site.id,
+            dive_date=date(2023, 5, 1),
+            user_rating=10
+        )
+        dive_newer_low_rated = Dive(
+            name="Newer Low Rated Dive",
+            user_id=test_user.id,
+            dive_site_id=test_dive_site.id,
+            dive_date=date(2024, 6, 1),
+            user_rating=5
+        )
+
+        db_session.add_all([dive_older_high_rated, dive_newer_low_rated])
+        db_session.commit()
+
+        # Default / recent sort: Newer dive comes first
+        response_recent = client.get(f"/api/v1/dive-sites/{test_dive_site.id}/dives?sort_by=recent")
+        assert response_recent.status_code == status.HTTP_200_OK
+        data_recent = response_recent.json()
+        assert len(data_recent) >= 2
+        assert data_recent[0]["name"] == "Newer Low Rated Dive"
+
+        # Rating sort: Higher rated dive comes first
+        response_rating = client.get(f"/api/v1/dive-sites/{test_dive_site.id}/dives?sort_by=rating")
+        assert response_rating.status_code == status.HTTP_200_OK
+        data_rating = response_rating.json()
+        assert len(data_rating) >= 2
+        assert data_rating[0]["name"] == "Older Top Rated Dive"
+
 class TestDiveSitesAdvancedFeatures:
     """Test advanced dive site features and edge cases."""
 
diff --git a/backend/tests/test_static_html.py b/backend/tests/test_static_html.py
index f8791545..61ffa98d 100644
--- a/backend/tests/test_static_html.py
+++ b/backend/tests/test_static_html.py
@@ -43,6 +43,47 @@ def __init__(self, score):
         self.score = score
 
 
+class MockAlias:
+    def __init__(self, alias):
+        self.alias = alias
+
+
+class MockAvailableTag:
+    def __init__(self, name):
+        self.name = name
+
+
+class MockSiteTag:
+    def __init__(self, name):
+        self.tag = MockAvailableTag(name)
+
+
+class MockCenter:
+    def __init__(self, id, name, city="Anavissos", country="Greece"):
+        self.id = id
+        self.name = name
+        self.city = city
+        self.country = country
+
+
+class MockCenterRel:
+    def __init__(self, center):
+        self.diving_center = center
+
+
+class MockRouteType:
+    def __init__(self, name):
+        self.name = name
+
+
+class MockRoute:
+    def __init__(self, id, name, route_type_name="Scenic", deleted_at=None):
+        self.id = id
+        self.name = name
+        self.route_type = MockRouteType(route_type_name)
+        self.deleted_at = deleted_at
+
+
 class MockSite:
     def __init__(self, **kwargs):
         self.name = kwargs.get("name", "Agia Anna")
@@ -57,6 +98,10 @@ def __init__(self, **kwargs):
         self.safety_information = kwargs.get("safety_information")
         self.difficulty = kwargs.get("difficulty", MockDifficulty())
         self.ratings = kwargs.get("ratings", [MockRating(9), MockRating(8)])
+        self.aliases = kwargs.get("aliases", [])
+        self.tags = kwargs.get("tags", [])
+        self.center_relationships = kwargs.get("center_relationships", [])
+        self.routes = kwargs.get("routes", [])
 
 
 def test_strip_html_tags():
@@ -166,3 +211,24 @@ def test_dive_site_schema_omits_aggregate_rating_when_unrated():
     )
     assert schema["@type"] == "TouristAttraction"
     assert "aggregateRating" not in schema
+
+
+def test_render_dive_site_main_includes_aliases_tags_centers_routes():
+    site = MockSite(
+        aliases=[MockAlias("Fish Farm"), MockAlias("Ιχθυοτροφείο")],
+        tags=[MockSiteTag("Deep"), MockSiteTag("Wall")],
+        center_relationships=[MockCenterRel(MockCenter(54, "Aqualized", city="Anavissos", country="Greece"))],
+        routes=[MockRoute(12, "Canyon Traverse", "Wall Dive")],
+    )
+    html = render_dive_site_main(site, 8.5, 2)
+    assert "Also known as:" in html
+    assert "Fish Farm, Ιχθυοτροφείο" in html
+    assert "Tags:" in html
+    assert "Deep, Wall" in html
+    assert "Associated Diving Centers" in html
+    assert "/diving-centers/54/" in html
+    assert "Aqualized" in html
+    assert "Dive Routes" in html
+    assert "/dive-routes/12/" in html
+    assert "Canyon Traverse" in html
+
diff --git a/frontend/src/components/DiveSiteSidebar.jsx b/frontend/src/components/DiveSiteSidebar.jsx
index fb0b83ec..ea57e153 100644
--- a/frontend/src/components/DiveSiteSidebar.jsx
+++ b/frontend/src/components/DiveSiteSidebar.jsx
@@ -1,13 +1,18 @@
 import { Collapse } from 'antd';
-import { Link, MapPin } from 'lucide-react';
+import { Clock, MapPin, Star } from 'lucide-react';
 import React from 'react';
-import { useNavigate } from 'react-router-dom';
+import { Link as RouterLink, useNavigate } from 'react-router-dom';
 
 import { formatCost, DEFAULT_CURRENCY } from '../utils/currency';
+import { formatDate } from '../utils/dateHelpers';
 import { decodeHtmlEntities } from '../utils/htmlDecode';
-import { slugify, getDiveSiteSlug } from '../utils/slugify';
+import { slugify, getDiveSiteSlug, getDivingCenterSlug } from '../utils/slugify';
+import { getTagColor } from '../utils/tagHelpers';
 
 import WeatherConditionsCard from './MarineConditionsCard';
+import Button from './ui/Button';
+import DepthIcon from './ui/DepthIcon';
+import DifficultyBadge from './ui/DifficultyBadge';
 
 const DiveSiteSidebar = ({
   diveSite,
@@ -15,8 +20,10 @@ const DiveSiteSidebar = ({
   isWindLoading,
   setIsMarineExpanded,
   divingCenters,
+  recentDives,
   nearbyDiveSites,
   isNearbyLoading,
+  isNearbyExpanded,
   setIsNearbyExpanded,
 }) => {
   const navigate = useNavigate();
@@ -65,9 +72,17 @@ const DiveSiteSidebar = ({
           </h3>
           <div className='space-y-3'>
             {divingCenters.map(center => (
-              <div key={center.id} className='border border-gray-100 rounded-xl p-3 bg-gray-50/30'>
-                <div className='flex flex-col gap-0.5 mb-2'>
-                  <h4 className='font-bold text-gray-900 text-sm leading-tight'>{center.name}</h4>
+              <div
+                key={center.id}
+                className='border border-gray-100 rounded-xl p-3 bg-gray-50/30 hover:bg-gray-50 transition-colors'
+              >
+                <div className='flex flex-col gap-0.5 mb-1'>
+                  <RouterLink
+                    to={`/diving-centers/${center.id}/${getDivingCenterSlug(center)}`}
+                    className='font-bold text-blue-600 hover:text-blue-800 hover:underline text-sm leading-tight'
+                  >
+                    {center.name}
+                  </RouterLink>
                   {center.dive_cost && (
                     <span className='text-green-600 font-bold text-[10px] uppercase tracking-wider'>
                       {formatCost(center.dive_cost, center.currency || DEFAULT_CURRENCY)}
@@ -75,59 +90,133 @@ const DiveSiteSidebar = ({
                   )}
                 </div>
                 {center.description && (
-                  <p className='text-gray-500 text-[11px] mb-2 line-clamp-2 leading-relaxed'>
+                  <p className='text-gray-500 text-[11px] line-clamp-2 leading-relaxed'>
                     {decodeHtmlEntities(center.description)}
                   </p>
                 )}
-                <div className='flex flex-wrap gap-3 text-[11px] font-bold uppercase tracking-tight'>
-                  {center.email && (
-                    <a
-                      href={`mailto:${center.email}`}
-                      className='flex items-center text-blue-600 hover:text-blue-800'
-                      title='Email'
-                    >
-                      <Link className='h-3 w-3 mr-1 opacity-70' />
-                      Email
-                    </a>
+              </div>
+            ))}
+          </div>
+        </div>
+      )}
+
+      {/* Recent Dives - Between Diving Centers and Nearby Dive Sites */}
+      {recentDives && recentDives.length > 0 && (
+        <div
+          id='dives'
+          className='bg-white p-3 sm:p-6 rounded-xl shadow-sm border border-gray-100 scroll-mt-16'
+        >
+          <h3 className='text-base sm:text-lg font-bold text-gray-900 mb-3 sm:mb-4'>
+            Recent Dives
+          </h3>
+          <div className='space-y-3'>
+            {recentDives.slice(0, 5).map(dive => (
+              <div
+                key={dive.id}
+                className='border border-gray-100 rounded-xl p-3 bg-gray-50/30 hover:bg-gray-50 transition-colors'
+              >
+                <div className='flex items-start justify-between gap-1.5 mb-1'>
+                  <RouterLink
+                    to={`/dives/${dive.id}/${slugify(`${dive.name || dive.dive_site?.name || diveSite?.name || 'dive'}-${dive.dive_date}-dive-${dive.id}`)}`}
+                    className='font-bold text-blue-600 hover:text-blue-800 hover:underline text-xs sm:text-sm leading-tight truncate flex-1'
+                  >
+                    {dive.name || dive.dive_site?.name || 'Unnamed Dive'}
+                  </RouterLink>
+                  {dive.user_rating && (
+                    <div className='flex items-center bg-yellow-50 px-1.5 py-0.5 rounded border border-yellow-100 shrink-0'>
+                      <Star className='h-2.5 w-2.5 sm:h-3 sm:w-3 text-yellow-500 mr-0.5 fill-current' />
+                      <span className='text-[10px] font-bold text-yellow-700'>
+                        {dive.user_rating}/10
+                      </span>
+                    </div>
                   )}
-                  {center.phone && (
-                    <a
-                      href={`tel:${center.phone}`}
-                      className='flex items-center text-blue-600 hover:text-blue-800'
-                      title='Phone'
-                    >
-                      <Link className='h-3 w-3 mr-1 opacity-70' />
-                      Phone
-                    </a>
+                </div>
+
+                <div className='flex flex-wrap items-center gap-x-2 text-[10px] text-gray-500 mb-2'>
+                  <span>{formatDate(dive.dive_date)}</span>
+                  {dive.user_username && (
+                    <>
+                      <span>•</span>
+                      <RouterLink
+                        to={`/users/${dive.user_username}`}
+                        className='text-blue-500 hover:text-blue-700 font-medium'
+                      >
+                        {dive.user_username}
+                      </RouterLink>
+                    </>
                   )}
-                  {center.website && (
-                    <a
-                      href={center.website}
-                      target='_blank'
-                      rel='noopener noreferrer'
-                      className='flex items-center text-blue-600 hover:text-blue-800'
-                      title='Website'
-                    >
-                      <Link className='h-3 w-3 mr-1 opacity-70' />
-                      Web
-                    </a>
+                </div>
+
+                <div className='flex flex-wrap items-center gap-x-3 gap-y-1 text-[11px] mb-1.5'>
+                  {dive.max_depth && (
+                    <div className='flex items-center gap-1'>
+                      <DepthIcon className='text-divemap-blue font-bold' size={12} />
+                      <span className='text-gray-700 font-medium'>{dive.max_depth}m</span>
+                    </div>
+                  )}
+                  {dive.duration && (
+                    <div className='flex items-center gap-1'>
+                      <Clock className='w-3 h-3 text-gray-400' />
+                      <span className='text-gray-700 font-medium'>{dive.duration}min</span>
+                    </div>
+                  )}
+                  {dive.difficulty_code && (
+                    <DifficultyBadge
+                      code={dive.difficulty_code}
+                      label={dive.difficulty_label}
+                      size='xs'
+                    />
                   )}
                 </div>
+
+                {dive.dive_information && (
+                  <p className='text-[11px] text-gray-600 line-clamp-2 leading-relaxed border-t border-gray-100 pt-1.5 mt-1.5'>
+                    {decodeHtmlEntities(dive.dive_information)}
+                  </p>
+                )}
+
+                {dive.tags && dive.tags.length > 0 && (
+                  <div className='flex flex-wrap gap-1 mt-2'>
+                    {dive.tags.map(tag => (
+                      <span
+                        key={tag.id}
+                        className={`px-1.5 py-0.5 text-[9px] font-medium rounded-full ${getTagColor(tag.name)}`}
+                      >
+                        {tag.name}
+                      </span>
+                    ))}
+                  </div>
+                )}
               </div>
             ))}
           </div>
+
+          <div className='mt-3 sm:mt-4 text-center'>
+            <Button
+              to={`/dives?dive_site_id=${diveSite.id}`}
+              variant='secondary'
+              size='sm'
+              className='w-full'
+            >
+              More...
+            </Button>
+          </div>
         </div>
       )}
 
-      {/* Nearby Dive Sites - Desktop View Only */}
+      {/* Nearby Dive Sites */}
       {diveSite.latitude && diveSite.longitude && (
-        <div className='hidden lg:block bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden'>
+        <div
+          id='nearby'
+          className='bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden scroll-mt-16'
+        >
           <Collapse
             ghost
-            onChange={keys => setIsNearbyExpanded(keys.includes('nearby-desktop'))}
+            activeKey={isNearbyExpanded ? ['nearby-sidebar'] : []}
+            onChange={keys => setIsNearbyExpanded(keys.includes('nearby-sidebar'))}
             items={[
               {
-                key: 'nearby-desktop',
+                key: 'nearby-sidebar',
                 label: (
                   <span className='text-base sm:text-lg font-bold text-gray-900'>
                     Nearby Dive Sites
diff --git a/frontend/src/pages/DiveSiteDetail.jsx b/frontend/src/pages/DiveSiteDetail.jsx
index b8ae5f67..10487ad2 100644
--- a/frontend/src/pages/DiveSiteDetail.jsx
+++ b/frontend/src/pages/DiveSiteDetail.jsx
@@ -17,7 +17,6 @@ import {
   Globe,
   TrendingUp,
   RotateCcw,
-  Clock,
   Info,
   CloudSun,
   Route,
@@ -105,7 +104,6 @@ const DiveSiteDetail = () => {
   // Collapse states for lazy loading
   const [isMarineExpanded, setIsMarineExpanded] = useState(false);
   const [isNearbyExpanded, setIsNearbyExpanded] = useState(false);
-  const [isTopDivesExpanded, setIsTopDivesExpanded] = useState(false);
   const [isRoutesExpanded, setIsRoutesExpanded] = useState(false);
 
   // Helper to check if URL is video
@@ -209,9 +207,9 @@ const DiveSiteDetail = () => {
     }
   );
 
-  const { data: topDives } = useQuery(
+  const { data: recentDives } = useQuery(
     ['dive-site-dives', id],
-    () => api.get(`/api/v1/dive-sites/${id}/dives?limit=10`),
+    () => api.get(`/api/v1/dive-sites/${id}/dives?limit=5&sort_by=recent`),
     {
       select: response => response.data,
       enabled: !!diveSite,
@@ -536,111 +534,6 @@ const DiveSiteDetail = () => {
     setRating(score);
   };
 
-  const renderTopDivesList = () => (
-    <>
-      <div className='space-y-3'>
-        {topDives.map(dive => (
-          <div
-            key={dive.id}
-            className='border border-gray-100 rounded-xl p-3 hover:bg-gray-50 transition-colors bg-gray-50/30'
-          >
-            <div className='flex flex-col sm:flex-row sm:justify-between sm:items-start gap-1.5 mb-2'>
-              <RouterLink
-                to={`/dives/${dive.id}/${slugify(`${dive.name || dive.dive_site?.name || diveSite?.name || 'dive'}-${dive.dive_date}-dive-${dive.id}`)}`}
-                className='font-bold text-blue-600 hover:text-blue-800 hover:underline text-sm sm:text-base leading-tight'
-              >
-                {dive.name || dive.dive_site?.name || 'Unnamed Dive'}
-              </RouterLink>
-              {dive.user_rating && (
-                <div className='flex items-center bg-yellow-50 px-1.5 py-0.5 rounded border border-yellow-100 shrink-0'>
-                  <Star className='h-3 w-3 text-yellow-500 mr-1 fill-current' />
-                  <span className='text-[11px] font-bold text-yellow-700'>
-                    {dive.user_rating}/10
-                  </span>
-                </div>
-              )}
-            </div>
-
-            <div className='text-[11px] sm:text-sm text-gray-500 space-y-1.5 mb-2'>
-              <div className='flex flex-wrap items-center gap-x-3 gap-y-1'>
-                <div className='flex items-center gap-1'>
-                  <span className='font-semibold text-gray-400 uppercase text-[9px]'>Date:</span>
-                  <span className='text-gray-700'>{formatDate(dive.dive_date)}</span>
-                </div>
-
-                {dive.user_username && (
-                  <div className='flex items-center gap-1'>
-                    <span className='font-semibold text-gray-400 uppercase text-[9px]'>By:</span>
-                    <RouterLink
-                      to={`/users/${dive.user_username}`}
-                      className='text-blue-500 hover:text-blue-700 font-medium'
-                    >
-                      {dive.user_username}
-                    </RouterLink>
-                  </div>
-                )}
-              </div>
-
-              <div className='flex flex-wrap items-center gap-x-4 gap-y-1.5'>
-                {dive.max_depth && (
-                  <div className='flex items-center gap-1'>
-                    <DepthIcon className='text-divemap-blue font-bold' size={14} />
-                    <span className='text-gray-700 font-medium'>{dive.max_depth}m</span>
-                  </div>
-                )}
-
-                {dive.duration && (
-                  <div className='flex items-center gap-1'>
-                    <Clock className='w-3 h-3 text-gray-300' />
-                    <span className='text-gray-700 font-medium'>{dive.duration}min</span>
-                  </div>
-                )}
-
-                {dive.difficulty_code && (
-                  <div className='flex items-center gap-1'>
-                    <DifficultyBadge
-                      code={dive.difficulty_code}
-                      label={dive.difficulty_label}
-                      size='xs'
-                    />
-                  </div>
-                )}
-              </div>
-            </div>
-
-            {dive.dive_information && (
-              <p className='text-[13px] text-gray-600 line-clamp-2 leading-relaxed border-t border-gray-100 pt-2'>
-                {decodeHtmlEntities(dive.dive_information)}
-              </p>
-            )}
-
-            {dive.tags && dive.tags.length > 0 && (
-              <div className='flex flex-wrap gap-1 mt-2'>
-                {dive.tags.map(tag => (
-                  <span
-                    key={tag.id}
-                    className={`px-1.5 py-0.5 text-[9px] font-medium rounded-full ${getTagColor(tag.name)}`}
-                  >
-                    {tag.name}
-                  </span>
-                ))}
-              </div>
-            )}
-          </div>
-        ))}
-      </div>
-
-      <div className='mt-3 sm:mt-4 text-center'>
-        <RouterLink
-          to={`/dives?dive_site_id=${id}`}
-          className='inline-block px-3 py-1.5 text-blue-600 hover:text-blue-800 transition-colors text-xs sm:text-sm font-medium rounded-md'
-        >
-          View All Dives at This Site →
-        </RouterLink>
-      </div>
-    </>
-  );
-
   return (
     <div className='max-w-[95vw] xl:max-w-[1600px] mx-auto px-0 sm:px-4 lg:px-6 xl:px-8 py-3 sm:py-6 lg:py-8'>
       {diveSite && (
@@ -1020,9 +913,8 @@ const DiveSiteDetail = () => {
           </a>
           <a
             href='#dives'
-            onClick={() => setIsTopDivesExpanded(true)}
             className='flex flex-col items-center justify-center p-1.5 rounded-xl bg-white border border-gray-200 shadow-sm active:scale-95 transition-transform flex-1 min-w-0 group'
-            title='Top Dives'
+            title='Recent Dives'
           >
             <TrendingUp className='w-4 h-4 sm:w-5 sm:h-5 text-blue-600 group-hover:text-blue-800' />
             <span className='text-[10px] sm:text-xs font-bold text-gray-500 uppercase tracking-tight mt-0.5 truncate max-w-full'>
@@ -1297,108 +1189,13 @@ const DiveSiteDetail = () => {
             </div>
           </div>
 
-          {/* Nearby Dive Sites - Mobile View Only */}
-          {diveSite.latitude && diveSite.longitude && (
-            <div
-              id='nearby'
-              className='lg:hidden bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden scroll-mt-16'
-            >
-              <Collapse
-                ghost
-                activeKey={isNearbyExpanded ? ['nearby'] : []}
-                onChange={keys => {
-                  setIsNearbyExpanded(keys.includes('nearby'));
-                }}
-                items={[
-                  {
-                    key: 'nearby',
-                    label: (
-                      <span className='text-base sm:text-lg font-bold text-gray-900'>
-                        Nearby Dive Sites
-                      </span>
-                    ),
-                    children: (
-                      <div className='grid grid-cols-1 sm:grid-cols-2 gap-2'>
-                        {isNearbyLoading ? (
-                          <div className='text-center py-4 text-[10px] text-gray-400 font-bold uppercase tracking-wider'>
-                            Loading nearby sites...
-                          </div>
-                        ) : nearbyDiveSites && nearbyDiveSites.length > 0 ? (
-                          nearbyDiveSites.slice(0, 6).map(site => (
-                            <button
-                              key={site.id}
-                              onClick={() =>
-                                navigate(`/dive-sites/${site.id}/${getDiveSiteSlug(site)}`)
-                              }
-                              className='flex items-center p-2 border border-gray-100 rounded-xl hover:bg-gray-50 transition-colors text-left w-full shadow-sm'
-                            >
-                              <MapPin className='w-3.5 h-3.5 mr-2 flex-shrink-0 text-blue-500' />
-                              <div className='min-w-0 flex-1'>
-                                <div className='font-bold text-gray-900 text-xs truncate leading-tight'>
-                                  {site.name}
-                                </div>
-                                <div className='text-[10px] text-gray-400 font-medium'>
-                                  {site.distance_km} km away
-                                </div>
-                              </div>
-                            </button>
-                          ))
-                        ) : (
-                          <div className='text-center py-4 text-xs text-gray-500 italic'>
-                            No nearby dive sites found.
-                          </div>
-                        )}
-                      </div>
-                    ),
-                  },
-                ]}
-              />
-            </div>
-          )}
-
-          {/* Top Dives */}
-          {topDives && topDives.length > 0 && (
-            <>
-              {/* Desktop View */}
-              <div className='hidden lg:block bg-white p-3 sm:p-6 rounded-xl shadow-sm border border-gray-100 scroll-mt-16'>
-                <h2 className='text-base sm:text-xl font-bold text-gray-900 mb-3 sm:mb-4'>
-                  Top Dives
-                </h2>
-                {renderTopDivesList()}
-              </div>
-
-              {/* Mobile View */}
-              <div
-                id='dives'
-                className='lg:hidden bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden scroll-mt-16'
-              >
-                <Collapse
-                  ghost
-                  activeKey={isTopDivesExpanded ? ['top-dives-mobile'] : []}
-                  onChange={keys => setIsTopDivesExpanded(keys.includes('top-dives-mobile'))}
-                  items={[
-                    {
-                      key: 'top-dives-mobile',
-                      label: (
-                        <span className='text-base sm:text-xl font-bold text-gray-900'>
-                          Top Dives
-                        </span>
-                      ),
-                      children: <div className='-mt-2'>{renderTopDivesList()}</div>,
-                    },
-                  ]}
-                />
-              </div>
-            </>
-          )}
-
-          {/* Access Instructions - Mobile View Only */}
-          {diveSite.access_instructions && (
-            <div className='lg:hidden bg-white p-3 sm:p-6 rounded-xl shadow-sm border border-gray-100'>
+          {/* Marine Life */}
+          {diveSite.marine_life && (
+            <div className='bg-white p-3 sm:p-6 rounded-xl shadow-sm border border-gray-100'>
               <h2 className='text-base sm:text-xl font-bold text-gray-900 mb-2 sm:mb-4'>
-                Access Instructions
+                Marine Life
               </h2>
-              <RichText content={diveSite.access_instructions} className='text-xs sm:text-base' />
+              <RichText content={diveSite.marine_life} className='text-xs sm:text-base' />
             </div>
           )}
 
@@ -1412,13 +1209,13 @@ const DiveSiteDetail = () => {
             </div>
           )}
 
-          {/* Marine Life */}
-          {diveSite.marine_life && (
-            <div className='bg-white p-3 sm:p-6 rounded-xl shadow-sm border border-gray-100'>
+          {/* Access Instructions - Mobile View Only */}
+          {diveSite.access_instructions && (
+            <div className='lg:hidden bg-white p-3 sm:p-6 rounded-xl shadow-sm border border-gray-100'>
               <h2 className='text-base sm:text-xl font-bold text-gray-900 mb-2 sm:mb-4'>
-                Marine Life
+                Access Instructions
               </h2>
-              <RichText content={diveSite.marine_life} className='text-xs sm:text-base' />
+              <RichText content={diveSite.access_instructions} className='text-xs sm:text-base' />
             </div>
           )}
 
@@ -1523,8 +1320,10 @@ const DiveSiteDetail = () => {
           isWindLoading={isWindLoading}
           setIsMarineExpanded={setIsMarineExpanded}
           divingCenters={divingCenters}
+          recentDives={recentDives}
           nearbyDiveSites={nearbyDiveSites}
           isNearbyLoading={isNearbyLoading}
+          isNearbyExpanded={isNearbyExpanded}
           setIsNearbyExpanded={setIsNearbyExpanded}
         />
       </div>