diff --git a/.github/workflows/build.yml b/.github/workflows/check.yml
similarity index 74%
rename from .github/workflows/build.yml
rename to .github/workflows/check.yml
index 514f6e2..069e7dd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/check.yml
@@ -5,7 +5,8 @@ on:
     branches: [main, develop]
 
 jobs:
-  build:
+  check:
+    name: Check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -22,5 +23,11 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Astro check
+        run: pnpm astro check
+
+      - name: Prettier check
+        run: pnpm exec prettier --check src
+
       - name: Build
         run: pnpm build
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6a0b18f..57d7f4c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -34,6 +34,8 @@ jobs:
 
       - name: Build with Astro
         run: pnpm run build
+        env:
+          PUBLIC_GA_ID: ${{ secrets.PUBLIC_GA_ID }}
 
       - name: Upload artifact
         if: github.event_name != 'pull_request'
diff --git a/AGENTS.md b/AGENTS.md
index e6f3387..03d5db3 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -162,23 +162,51 @@ Agents (like Copilot) must adhere to these coding standards to ensure consistenc
 All new UI components and pages must be built with accessibility in mind from the start. Agents must prioritize the following core principles:
 
 ### 1. Semantic HTML & Structure
+
 - **Use HTML5 elements:** Prioritize `<header>`, `<nav>`, `<main>`, `<section>`, `<article>`, and `<footer>` over generic `<div>`s. Screen readers depend on this semantics.
 - **Heading hierarchy:** Always use headings in logical order (`<h1>` → `<h2>` → `<h3>`) without skipping levels.
 - **Actions vs Navigation:** Use `<button>` for actions and `<a>` solely for links/navigation. Avoid using `<div>` or `<span>` with `onClick` handlers.
 
 ### 2. Text Alternatives (Images & Icons)
+
 - **Image `alt` tags:** All `<img>` elements must have meaningful `alt` text. Describe the image's function or content (e.g., `alt="Persona usando la app en un celular"` not `alt="imagen1"`). If an image is purely decorative, strictly use `alt=""`.
 - **SVGs and ARIA:** Ensure decorative SVGs have `aria-hidden="true"`. Interactive SVGs must have an `aria-label` or `<title>`. Provide `aria-` attributes (`aria-expanded`, `aria-describedby`) for dynamic elements where visual context isn't enough.
 
 ### 3. Color and Contrast
+
 - **Contrast Ratios:** Ensure all text has sufficient contrast against its background. Avoid light grey text on white backgrounds.
-- **Do not rely on color alone:** Always provide an additional visual indicator alongside color (e.g., rather than saying "Fields in red are required", say "Fields marked with * are required").
+- **Do not rely on color alone:** Always provide an additional visual indicator alongside color (e.g., rather than saying "Fields in red are required", say "Fields marked with \* are required").
 
 ### 4. Keyboard Navigation
+
 - **Tab navigation:** All interactive elements must be fully functional using only the keyboard (`Tab` and `Enter`/`Space`).
 - **Visible Focus:** Ensure a clear, visible focus state for all focusable elements. Never use `outline: none;` without providing a custom visible focus ring (e.g., using Tailwind's `focus-visible:ring`).
 
+### 5. External Links & New Tab Notifications
+
+- **New tab links:** All links with `target="_blank"` must include `aria-label` that informs users the link opens in a new tab.
+- **Use centralized translations:** Use `menuTexts[lang].new_tab` for consistent translations across all languages:
+  - Spanish: `(se abre en nueva pestaña)`
+  - English: `(opens in new tab)`
+  - Catalan: `(s'obre en una pestanya nova)`
+- **Implementation example:**
+  ```astro
+  <a
+    href="https://example.com"
+    target="_blank"
+    rel="noopener noreferrer"
+    aria-label={`${linkText} ${menuTexts[lang].new_tab}`}
+  >
+    {linkText}
+  </a>
+  ```
+- **Required imports:** Always import `menuTexts` when adding external links:
+  ```astro
+  import {menuTexts} from '@/i18n/menu' const menuT = menuTexts[lang as keyof typeof menuTexts]
+  ```
+
 ### Agent Enforcement
+
 - When generating or modifying components, agents **must** proactively apply these accessibility standards without needing explicit prompting from the user.
 
 ## 5. SEO and Page Creation Guidelines
@@ -186,6 +214,7 @@ All new UI components and pages must be built with accessibility in mind from th
 Agents must ensure all new pages are optimized for search engines and follow the project's internationalization (i18n) structure.
 
 ### Multi-language Pages
+
 - All new pages must be placed in `src/pages/[lang]/`.
 - Use `getStaticPaths()` to support all configured locales (`es`, `en`, `ca`).
 - Example structure:
@@ -196,17 +225,20 @@ Agents must ensure all new pages are optimized for search engines and follow the
   ```
 
 ### Layout and Metadata
+
 - Every page **must** use the `Layout` component from `src/layouts/Layout.astro`.
 - Pass a unique and descriptive `title` and `description` (150-160 characters) to the `Layout` component.
 - The `Layout` component automatically handles canonical URLs, social media tags (OG/Twitter), and `hreflang` tags.
 
 ### Semantic HTML and Accessibility
+
 - **H1 Tags**: Use exactly one `<h1>` per page.
 - **Headings**: Maintain a logical hierarchy (`h2`, `h3`, etc.).
 - **Images**: All `<img>` tags must include a descriptive `alt` attribute.
 - **Links**: Use descriptive text for links. Avoid generic phrases like "click here".
 
 ### Analytics and Monitoring
+
 - Use the `PUBLIC_GA_ID` environment variable for Google Analytics.
 - Do not hardcode tracking IDs.
 
diff --git a/src/components/AccommodationPage.astro b/src/components/AccommodationPage.astro
index b9274d1..e415f01 100644
--- a/src/components/AccommodationPage.astro
+++ b/src/components/AccommodationPage.astro
@@ -1,5 +1,6 @@
 ---
 import { accommodationTexts } from '../i18n/accommodation'
+import { menuTexts } from '../i18n/menu'
 import StatusIcon from './icons/StatusIcon.astro'
 
 interface Props {
@@ -8,6 +9,25 @@ interface Props {
 
 const { lang } = Astro.props
 const t = accommodationTexts[lang as keyof typeof accommodationTexts]
+const menuT = menuTexts[lang as keyof typeof menuTexts]
+type AreaSlug =
+  | 'eixampleEsquerra'
+  | 'elRaval'
+  | 'santAntoni'
+  | 'ciutatVella'
+  | 'sants'
+  | 'poblenou22'
+  | 'elClot'
+  | 'lesCorts'
+  | 'eixampleDreta'
+  | 'collblanc'
+
+const walkingAreas: AreaSlug[] = ['eixampleEsquerra', 'elRaval', 'santAntoni', 'ciutatVella']
+const directMetroAreas: AreaSlug[] = ['sants', 'poblenou22', 'elClot']
+const transferAreas: AreaSlug[] = ['lesCorts', 'eixampleDreta', 'collblanc']
+
+const areaName = (slug: AreaSlug) => t[`accommodation.areas.${slug}.name` as keyof typeof t]
+const areaDesc = (slug: AreaSlug) => t[`accommodation.areas.${slug}.desc` as keyof typeof t]
 ---
 
 <div class="accommodation-container pb-20">
@@ -20,20 +40,72 @@ const t = accommodationTexts[lang as keyof typeof accommodationTexts]
     </p>
   </section>
 
-  <section
-    class="max-w-4xl bg-white/5 backdrop-blur-md p-8 md:p-12 rounded-3xl border border-white/10 mb-16 shadow-2xl"
-  >
-    <p class="text-lg text-pycon-gray-25 leading-relaxed">
-      {t['accommodation.intro']}
-    </p>
+  <!-- Areas -->
+  <section class="mb-24" aria-labelledby="accommodation-areas-heading">
+    <div class="flex items-center gap-4 mb-12">
+      <div class="h-px bg-white/20 flex-1" aria-hidden="true"></div>
+      <h2 id="accommodation-areas-heading" class="text-3xl font-bold text-white px-4">
+        {t['accommodation.areas.title']}
+      </h2>
+      <div class="h-px bg-white/20 flex-1" aria-hidden="true"></div>
+    </div>
+    <div class="max-w-4xl space-y-4 mb-12 text-pycon-gray-25 leading-relaxed">
+      <p class="text-lg">{t['accommodation.areas.transportIntro.p1']}</p>
+      <p class="text-lg">{t['accommodation.areas.transportIntro.p2']}</p>
+      <p class="text-lg">{t['accommodation.areas.transportIntro.p3']}</p>
+    </div>
+
+    <div class="space-y-16">
+      <div>
+        <h3 class="text-2xl font-bold text-white mb-6">{t['accommodation.areas.category.walking']}</h3>
+        <ul class="grid sm:grid-cols-2 lg:grid-cols-3 gap-8 list-none m-0 p-0">
+          {
+            walkingAreas.map((slug) => (
+              <li class="bg-pycon-black/40 p-8 rounded-2xl border border-white/5 hover:border-pycon-orange/50 transition-all motion-safe:hover:-translate-y-2">
+                <h4 class="text-xl font-bold text-pycon-orange mb-4 italic">{areaName(slug)}</h4>
+                <p class="text-pycon-gray-25 text-sm leading-relaxed">{areaDesc(slug)}</p>
+              </li>
+            ))
+          }
+        </ul>
+      </div>
+      <div>
+        <h3 class="text-2xl font-bold text-white mb-6">{t['accommodation.areas.category.directMetro']}</h3>
+        <ul class="grid sm:grid-cols-2 lg:grid-cols-3 gap-8 list-none m-0 p-0">
+          {
+            directMetroAreas.map((slug) => (
+              <li class="bg-pycon-black/40 p-8 rounded-2xl border border-white/5 hover:border-pycon-orange/50 transition-all motion-safe:hover:-translate-y-2">
+                <h4 class="text-xl font-bold text-pycon-orange mb-4 italic">{areaName(slug)}</h4>
+                <p class="text-pycon-gray-25 text-sm leading-relaxed">{areaDesc(slug)}</p>
+              </li>
+            ))
+          }
+        </ul>
+      </div>
+      <div>
+        <h3 class="text-2xl font-bold text-white mb-6">{t['accommodation.areas.category.transferMetro']}</h3>
+        <ul class="grid sm:grid-cols-2 lg:grid-cols-3 gap-8 list-none m-0 p-0">
+          {
+            transferAreas.map((slug) => (
+              <li class="bg-pycon-black/40 p-8 rounded-2xl border border-white/5 hover:border-pycon-orange/50 transition-all motion-safe:hover:-translate-y-2">
+                <h4 class="text-xl font-bold text-pycon-orange mb-4 italic">{areaName(slug)}</h4>
+                <p class="text-pycon-gray-25 text-sm leading-relaxed">{areaDesc(slug)}</p>
+              </li>
+            ))
+          }
+        </ul>
+      </div>
+    </div>
   </section>
 
   <!-- Hotels Section -->
-  <section class="mb-24">
+  <section class="mb-24" aria-labelledby="accommodation-hotels-heading">
     <div class="flex items-center gap-4 mb-12">
-      <div class="h-px bg-white/20 flex-1"></div>
-      <h2 class="text-3xl font-bold text-white px-4">{t['accommodation.hotels.title']}</h2>
-      <div class="h-px bg-white/20 flex-1"></div>
+      <div class="h-px bg-white/20 flex-1" aria-hidden="true"></div>
+      <h2 id="accommodation-hotels-heading" class="text-3xl font-bold text-white px-4">
+        {t['accommodation.hotels.title']}
+      </h2>
+      <div class="h-px bg-white/20 flex-1" aria-hidden="true"></div>
     </div>
 
     <div
@@ -41,12 +113,18 @@ const t = accommodationTexts[lang as keyof typeof accommodationTexts]
     >
       <!-- Shine effect -->
       <div
-        class="absolute -top-full -left-full w-[300%] h-[300%] bg-linear-to-br from-transparent via-pycon-yellow/5 to-transparent rotate-45 transition-transform duration-1000 group-hover:translate-x-[33%] group-hover:translate-y-[33%] pointer-events-none"
+        class="absolute -top-full -left-full w-[300%] h-[300%] bg-linear-to-br from-transparent via-pycon-yellow/5 to-transparent rotate-45 transition-transform duration-1000 motion-safe:group-hover:translate-x-[33%] motion-safe:group-hover:translate-y-[33%] pointer-events-none"
+        aria-hidden="true"
       >
       </div>
 
       <div class="relative z-10">
-        <StatusIcon type="construction" size="xl" role="img" aria-label="Construyendo" />
+        <StatusIcon
+          type="construction"
+          size="xl"
+          role="img"
+          aria-label={t['accommodation.a11y.constructionIcon']}
+        />
         <h3 class="text-2xl font-bold text-pycon-yellow mb-4">{t['accommodation.hotels.subtitle']}</h3>
         <p class="text-xl text-white font-medium max-w-2xl mx-auto italic opacity-80">
           {t['accommodation.hotels.disclaimer']}
@@ -55,59 +133,37 @@ const t = accommodationTexts[lang as keyof typeof accommodationTexts]
     </div>
   </section>
 
-  <!-- Areas -->
-  <section class="mb-24">
-    <h2 class="text-3xl font-bold text-white mb-12 flex items-center gap-3">
-      <span class="w-2 h-8 bg-pycon-red rounded-full"></span>
-      {t['accommodation.areas.title']}
-    </h2>
-    <div class="grid md:grid-cols-3 gap-8">
-      <div
-        class="bg-pycon-black/40 p-8 rounded-2xl border border-white/5 hover:border-pycon-orange/50 transition-all hover:-translate-y-2"
-      >
-        <h3 class="text-xl font-bold text-pycon-orange mb-4 italic">
-          {t['accommodation.areas.eixample.name']}
-        </h3>
-        <p class="text-pycon-gray-25 text-sm leading-relaxed">{t['accommodation.areas.eixample.desc']}</p>
-      </div>
-      <div
-        class="bg-pycon-black/40 p-8 rounded-2xl border border-white/5 hover:border-pycon-orange/50 transition-all hover:-translate-y-2 text-center"
-      >
-        <h3 class="text-xl font-bold text-pycon-orange mb-4 italic">
-          {t['accommodation.areas.gothic.name']}
-        </h3>
-        <p class="text-pycon-gray-25 text-sm leading-relaxed">{t['accommodation.areas.gothic.desc']}</p>
-      </div>
-      <div
-        class="bg-pycon-black/40 p-8 rounded-2xl border border-white/5 hover:border-pycon-orange/50 transition-all hover:-translate-y-2 text-right"
-      >
-        <h3 class="text-xl font-bold text-pycon-orange mb-4 italic">
-          {t['accommodation.areas.poblenou.name']}
-        </h3>
-        <p class="text-pycon-gray-25 text-sm leading-relaxed">{t['accommodation.areas.poblenou.desc']}</p>
-      </div>
-    </div>
-  </section>
-
   <!-- Apartments -->
   <section
     class="bg-linear-to-r from-pycon-red/20 to-pycon-orange/20 p-8 md:p-16 rounded-3xl border border-pycon-red/30"
+    aria-labelledby="accommodation-apartments-heading"
   >
     <div class="flex flex-col md:flex-row gap-12 items-center">
       <div class="flex-1">
-        <h2 class="text-3xl font-bold text-white mb-6 uppercase tracking-tight">
+        <h2
+          id="accommodation-apartments-heading"
+          class="text-3xl font-bold text-white mb-6 uppercase tracking-tight"
+        >
           {t['accommodation.apartments.title']}
         </h2>
         <p class="text-pycon-gray-25 text-lg mb-8 leading-relaxed">
           {t['accommodation.apartments.text']}
         </p>
         <a
-          href="https://meet.barcelona/es/alojarse-en-barcelona"
+          href={t['accommodation.apartments.linkUrl']}
           target="_blank"
-          class="inline-flex items-center gap-2 bg-white text-pycon-red font-bold px-6 py-3 rounded-lg hover:scale-105 transition-transform no-underline"
+          rel="noopener noreferrer"
+          aria-label={`${t['accommodation.apartments.link']} ${menuT.new_tab}`}
+          class="inline-flex items-center gap-2 bg-white text-pycon-red font-bold px-6 py-3 rounded-lg motion-safe:hover:scale-105 transition-transform no-underline focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-pycon-yellow"
         >
           {t['accommodation.apartments.link']}
-          <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"
+          <span class="sr-only"> ({t['accommodation.a11y.linkOpensNewTab']})</span>
+          <svg
+            class="w-5 h-5 shrink-0"
+            fill="none"
+            stroke="currentColor"
+            viewBox="0 0 24 24"
+            aria-hidden="true"
             ><path
               stroke-linecap="round"
               stroke-linejoin="round"
@@ -118,8 +174,9 @@ const t = accommodationTexts[lang as keyof typeof accommodationTexts]
       </div>
       <div
         class="w-48 h-48 bg-white/10 rounded-full flex items-center justify-center border border-white/20 shadow-2xl backdrop-blur-xl shrink-0"
+        aria-hidden="true"
       >
-        <StatusIcon type="city" size="xl" role="img" aria-label="Ubicación" />
+        <StatusIcon type="city" size="xl" />
       </div>
     </div>
   </section>
@@ -140,4 +197,10 @@ const t = accommodationTexts[lang as keyof typeof accommodationTexts]
       transform: translateY(0);
     }
   }
+
+  @media (prefers-reduced-motion: reduce) {
+    .accommodation-container {
+      animation: none;
+    }
+  }
 </style>
diff --git a/src/components/Button.astro b/src/components/Button.astro
index ed423ac..78e500d 100644
--- a/src/components/Button.astro
+++ b/src/components/Button.astro
@@ -24,7 +24,7 @@ const sizes = {
 }
 
 const baseClasses =
-  "inline-flex items-center justify-center font-['Outfit'] font-medium rounded-lg text-center transition-colors duration-200 cursor-pointer"
+  'inline-flex items-center justify-center font-medium rounded-lg text-center transition-colors duration-200 cursor-pointer'
 
 const Element = href ? 'a' : 'button'
 ---
diff --git a/src/components/LocationPage.astro b/src/components/LocationPage.astro
index 286aaef..07ec8b8 100644
--- a/src/components/LocationPage.astro
+++ b/src/components/LocationPage.astro
@@ -1,5 +1,6 @@
 ---
 import { locationTexts } from '../i18n/location'
+import { menuTexts } from '../i18n/menu'
 
 interface Props {
   lang: string
@@ -7,6 +8,7 @@ interface Props {
 
 const { lang } = Astro.props
 const t = locationTexts[lang as keyof typeof locationTexts]
+const menuT = menuTexts[lang as keyof typeof menuTexts]
 
 const transportIcons = {
   metro: 'M12 2L4.5 20.29L5.21 21L12 18L18.79 21L19.5 20.29L12 2Z',
@@ -19,7 +21,7 @@ const transportIcons = {
 
 <div class="location-container pb-20">
   <!-- Hero Section -->
-  <section class="relative h-[60vh] min-h-[400px] w-full overflow-hidden rounded-3xl mb-12 shadow-2xl">
+  <section class="relative h-[40vh] min-h-10 w-full overflow-hidden rounded-3xl mb-12 shadow-2xl">
     <img
       src="/images/Barcelona/seuUB.jpg"
       alt={t['location.hero.title']}
@@ -129,6 +131,7 @@ const transportIcons = {
           href="https://maps.app.goo.gl/bMt7iLyNT2N2Et786"
           target="_blank"
           rel="noopener noreferrer"
+          aria-label={`${t['location.map.link']} ${menuT.new_tab}`}
           class="inline-block w-full text-center bg-white text-pycon-red font-bold py-3 rounded-lg hover:bg-pycon-gray-25 transition-colors shadow-lg"
         >
           {t['location.map.link']}
diff --git a/src/components/home/SectionCallForProposals.astro b/src/components/home/SectionCallForProposals.astro
new file mode 100644
index 0000000..21d6423
--- /dev/null
+++ b/src/components/home/SectionCallForProposals.astro
@@ -0,0 +1,36 @@
+---
+import { texts } from '../../i18n/home'
+import SectionTitle from '../SectionTitle.astro'
+import Button from '../Button.astro'
+
+interface Props {
+  lang: string
+}
+
+const { lang } = Astro.props
+const t = texts[lang as keyof typeof texts]
+---
+
+<div class="flex flex-col items-center gap-6">
+  <SectionTitle title={t['cfp.title']} />
+
+  <div
+    class="bg-white/5 backdrop-blur-md p-8 rounded-2xl border border-white/10 hover:border-pycon-orange/50 transition-all shadow-xl w-full"
+  >
+    <p class="text-lg text-pycon-gray-25 leading-relaxed mb-6 text-center">
+      {t['cfp.description']}
+    </p>
+
+    <div class="flex justify-center">
+      <Button
+        variant="primary"
+        size="lg"
+        href="https://pretalx.com/pycones-2026/cfp"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        {t['cfp.button']}
+      </Button>
+    </div>
+  </div>
+</div>
diff --git a/src/components/index.astro b/src/components/index.astro
index f3ece26..1f5b989 100644
--- a/src/components/index.astro
+++ b/src/components/index.astro
@@ -1,6 +1,7 @@
 ---
 import Layout from '@/layouts/Layout.astro'
 import SectionMain from './home/SectionMain.astro'
+import SectionCallForProposals from './home/SectionCallForProposals.astro'
 import SectionSponsors from './home/SectionSponsors.astro'
 
 interface Props {
@@ -13,6 +14,7 @@ const { lang } = Astro.props
 <Layout title="PyConES 2026">
   <div class="flex flex-col gap-20">
     <SectionMain lang={lang} />
+    <SectionCallForProposals lang={lang} />
     <SectionSponsors lang={lang} />
   </div>
 </Layout>
diff --git a/src/i18n/accommodation/ca.ts b/src/i18n/accommodation/ca.ts
index 22d95a7..ef0ec68 100644
--- a/src/i18n/accommodation/ca.ts
+++ b/src/i18n/accommodation/ca.ts
@@ -2,24 +2,55 @@ export const ca = {
   'accommodation.title': 'Allotjament',
   'accommodation.hero.title': 'On allotjar-se',
   'accommodation.hero.subtitle': 'Recomanacions per a la teva estada a Barcelona',
-  'accommodation.intro':
-    "Barcelona és una de les ciutats amb més oferta hotelera d'Europa. Per a la PyConES 2026, recomanem buscar allotjament al districte de l'Eixample o a Ciutat Vella per estar a pocs minuts a peu de la seu (UB Edifici Històric).",
   'accommodation.hotels.title': 'Hotels Recomanats',
   'accommodation.hotels.subtitle': 'Convenis i opcions properes',
   'accommodation.hotels.disclaimer':
     'Estem treballant per tancar convenis exclusius amb descomptes per als assistents. Torna aviat per veure els codis promocionals!',
   'accommodation.areas.title': 'Millors Zones',
-  'accommodation.areas.eixample.name': "L'Eixample",
-  'accommodation.areas.eixample.desc':
-    'La zona més segura i elegant, amb arquitectura modernista i a un pas de la seu.',
-  'accommodation.areas.gothic.name': 'Barri Gòtic',
-  'accommodation.areas.gothic.desc':
-    'El centre històric, amb carrers màgics i molta vida nocturna, a 10 min de la UB.',
-  'accommodation.areas.poblenou.name': 'Poblenou / 22@',
-  'accommodation.areas.poblenou.desc':
-    'El hub tecnològic. Un poc més allunyat però molt ben connectat per metro (L1).',
+  'accommodation.areas.transportIntro.p1':
+    'Si has de tornar a casa en tren, les millors opcions són Sants, Eixample Esquerra o Les Corts (per anar a Sants Estació).',
+  'accommodation.areas.transportIntro.p2':
+    "Si tornes en avió, et recomanem els barris d'El Raval, Sant Antoni, Eixample Esquerra (Aerobús), Sants (tren Rodalies R2) o Les Corts i Collblanc (L9 Sud). Tanmateix hi ha una parada de l'autobús directe a l'aeroport (Aerobús) davant de la seu.",
+  'accommodation.areas.transportIntro.p3':
+    'Tindrem servei de consigna, així que si marxes el diumenge pots fer check-out i deixar les maletes aquí.',
+  'accommodation.areas.category.walking': 'A peu',
+  'accommodation.areas.category.directMetro': 'Metro directe',
+  'accommodation.areas.category.transferMetro': 'Metro amb transbord',
+  'accommodation.areas.eixampleEsquerra.name': 'Eixample Esquerra',
+  'accommodation.areas.eixampleEsquerra.desc':
+    "Costat esquerre de l'eixample, modernista i molt a prop de la UB a peu; bona opció si també fas servir Sants.",
+  'accommodation.areas.elRaval.name': 'El Raval',
+  'accommodation.areas.elRaval.desc':
+    'Barri cèntric i multicultural, a poca distància a peu de la seu; l’Aerobús enllaça bé amb l’aeroport.',
+  'accommodation.areas.santAntoni.name': 'Sant Antoni',
+  'accommodation.areas.santAntoni.desc':
+    'Mercat i terrasses, ambient de barri i una passejada còmoda fins a la universitat.',
+  'accommodation.areas.ciutatVella.name': 'Ciutat Vella',
+  'accommodation.areas.ciutatVella.desc':
+    'Nucli històric (Gòtic, Born…): ambient únic i ubicacions a prop de l’esdeveniment.',
+  'accommodation.areas.sants.name': 'Sants',
+  'accommodation.areas.sants.desc':
+    'Al costat de l’estació de Sants: ideal per trens de llarg recorregut i Rodalies cap a l’aeroport.',
+  'accommodation.areas.poblenou22.name': 'Poblenou / 22@',
+  'accommodation.areas.poblenou22.desc':
+    'Districte 22@ i platja; ben connectat per metro en línia directa al centre i la UB.',
+  'accommodation.areas.elClot.name': 'El Clot',
+  'accommodation.areas.elClot.desc':
+    'Barri consolidat amb bon accés en metro directe al centre on hi ha la seu.',
+  'accommodation.areas.lesCorts.name': 'Les Corts',
+  'accommodation.areas.lesCorts.desc':
+    'A prop de la L9 Sud a l’aeroport; per arribar a la seu sol cal transbord en metro.',
+  'accommodation.areas.eixampleDreta.name': 'Eixample Dreta',
+  'accommodation.areas.eixampleDreta.desc':
+    'Eixample dret: emblemàtic i ben comunicat, amb enllaços que sovint impliquen una correspondència.',
+  'accommodation.areas.collblanc.name': 'Collblanc',
+  'accommodation.areas.collblanc.desc':
+    'L9 Sud a l’aeroport; per arribar a la UB normalment faràs transbord.',
   'accommodation.apartments.title': 'Apartaments Turístics',
   'accommodation.apartments.text':
     "Si prefereixes un apartament, assegura't que compti amb llicència turística oficial (HUTB). Barcelona és molt estricta amb la regulació d'allotjaments.",
   'accommodation.apartments.link': "Veure guia d'allotjament segur a Barcelona",
+  'accommodation.apartments.linkUrl': 'https://meet.barcelona.cat/habitatgesturistics/ca',
+  'accommodation.a11y.constructionIcon': 'En construcció',
+  'accommodation.a11y.linkOpensNewTab': "s'obre en una pestanya nova",
 } as const
diff --git a/src/i18n/accommodation/en.ts b/src/i18n/accommodation/en.ts
index 7baa419..f3bdea3 100644
--- a/src/i18n/accommodation/en.ts
+++ b/src/i18n/accommodation/en.ts
@@ -2,24 +2,55 @@ export const en = {
   'accommodation.title': 'Accommodation',
   'accommodation.hero.title': 'Where to stay',
   'accommodation.hero.subtitle': 'Recommendations for your stay in Barcelona',
-  'accommodation.intro':
-    'Barcelona offers one of the largest hotel selections in Europe. For PyConES 2026, we recommend looking for accommodation in the Eixample district or Ciutat Vella to be within walking distance of the venue (UB Historic Building).',
   'accommodation.hotels.title': 'Recommended Hotels',
   'accommodation.hotels.subtitle': 'Agreements and nearby options',
   'accommodation.hotels.disclaimer':
     'We are working on exclusive discounts for attendees. Check back soon for promo codes!',
   'accommodation.areas.title': 'Best Areas',
-  'accommodation.areas.eixample.name': "L'Eixample",
-  'accommodation.areas.eixample.desc':
-    'The safest and most elegant area, with modernist architecture and very close to the venue.',
-  'accommodation.areas.gothic.name': 'Gothic Quarter',
-  'accommodation.areas.gothic.desc':
-    'The historical center, with magical streets and vibrant nightlife, 10 min from UB.',
-  'accommodation.areas.poblenou.name': 'Poblenou / 22@',
-  'accommodation.areas.poblenou.desc':
-    'The tech hub. Slightly further away but very well connected by metro (L1).',
+  'accommodation.areas.transportIntro.p1':
+    'If you are heading home by train, the best options are Sants, Eixample Esquerra, or Les Corts (for reaching Sants Estació).',
+  'accommodation.areas.transportIntro.p2':
+    'If you fly out, we suggest El Raval, Sant Antoni, Eixample Esquerra (Aerobús), Sants (Rodalies R2 to the airport), or Les Corts and Collblanc (L9 Sud). There is also a direct airport bus (Aerobús) stop in front of the venue.',
+  'accommodation.areas.transportIntro.p3':
+    'We will provide a luggage room, so if you leave on Sunday you can check out and leave your bags with us.',
+  'accommodation.areas.category.walking': 'On foot',
+  'accommodation.areas.category.directMetro': 'Direct metro',
+  'accommodation.areas.category.transferMetro': 'Metro with a change',
+  'accommodation.areas.eixampleEsquerra.name': 'Eixample Esquerra',
+  'accommodation.areas.eixampleEsquerra.desc':
+    'The left side of the Eixample: modernist and very close to UB on foot; a strong pick if you also use Sants.',
+  'accommodation.areas.elRaval.name': 'El Raval',
+  'accommodation.areas.elRaval.desc':
+    'A central, multicultural area within walking distance of the venue; Aerobús links well to the airport.',
+  'accommodation.areas.santAntoni.name': 'Sant Antoni',
+  'accommodation.areas.santAntoni.desc':
+    'Market halls and terraces, a lively neighbourhood feel, and an easy walk to the university.',
+  'accommodation.areas.ciutatVella.name': 'Ciutat Vella',
+  'accommodation.areas.ciutatVella.desc':
+    'The old city (Gòtic, Born…): unique atmosphere and locations close to the event.',
+  'accommodation.areas.sants.name': 'Sants',
+  'accommodation.areas.sants.desc':
+    'Next to Sants station: ideal for long-distance trains and Rodalies to the airport.',
+  'accommodation.areas.poblenou22.name': 'Poblenou / 22@',
+  'accommodation.areas.poblenou22.desc':
+    'The 22@ district by the beach; direct metro lines to the centre and UB.',
+  'accommodation.areas.elClot.name': 'El Clot',
+  'accommodation.areas.elClot.desc':
+    'An established neighbourhood with a direct metro ride to the city centre where the venue is.',
+  'accommodation.areas.lesCorts.name': 'Les Corts',
+  'accommodation.areas.lesCorts.desc':
+    'Near L9 Sud to the airport; reaching the venue usually means one metro change.',
+  'accommodation.areas.eixampleDreta.name': 'Eixample Dreta',
+  'accommodation.areas.eixampleDreta.desc':
+    'The right side of the Eixample: iconic and well connected, often with one interchange.',
+  'accommodation.areas.collblanc.name': 'Collblanc',
+  'accommodation.areas.collblanc.desc':
+    'L9 Sud to the airport; you will typically change lines to get to UB.',
   'accommodation.apartments.title': 'Tourist Apartments',
   'accommodation.apartments.text':
     'If you prefer an apartment, make sure it has an official tourist license (HUTB). Barcelona is very strict regarding accommodation regulations.',
   'accommodation.apartments.link': 'View safe accommodation guide in Barcelona',
+  'accommodation.apartments.linkUrl': 'https://meet.barcelona.cat/habitatgesturistics/en',
+  'accommodation.a11y.constructionIcon': 'Under construction',
+  'accommodation.a11y.linkOpensNewTab': 'opens in a new tab',
 } as const
diff --git a/src/i18n/accommodation/es.ts b/src/i18n/accommodation/es.ts
index e215478..18418e4 100644
--- a/src/i18n/accommodation/es.ts
+++ b/src/i18n/accommodation/es.ts
@@ -2,24 +2,55 @@ export const es = {
   'accommodation.title': 'Alojamiento',
   'accommodation.hero.title': 'Dónde alojarse',
   'accommodation.hero.subtitle': 'Recomendaciones para tu estancia en Barcelona',
-  'accommodation.intro':
-    "Barcelona es una de las ciudades con mayor oferta hotelera de Europa. Para la PyConES 2026, recomendamos buscar alojamiento en el distrito de l'Eixample o en Ciutat Vella para estar a pocos minutos a pie de la sede (UB Edifici Històric).",
   'accommodation.hotels.title': 'Hoteles Recomendados',
   'accommodation.hotels.subtitle': 'Convenios y opciones cercanas',
   'accommodation.hotels.disclaimer':
     'Estamos trabajando para cerrar convenios exclusivos con descuentos para los asistentes. ¡Vuelve pronto para ver los códigos promocionales!',
   'accommodation.areas.title': 'Mejores Zonas',
-  'accommodation.areas.eixample.name': "L'Eixample",
-  'accommodation.areas.eixample.desc':
-    'La zona más segura y elegante, con arquitectura modernista y a un paso de la sede.',
-  'accommodation.areas.gothic.name': 'Barrio Gótico',
-  'accommodation.areas.gothic.desc':
-    'El centro histórico, con calles mágicas y mucha vida nocturna, a 10 min de la UB.',
-  'accommodation.areas.poblenou.name': 'Poblenou / 22@',
-  'accommodation.areas.poblenou.desc':
-    'El hub tecnológico. Un poco más alejado pero muy bien conectado por metro (L1).',
+  'accommodation.areas.transportIntro.p1':
+    'Si tienes que volver a casa en tren, las mejores opciones son Sants, Eixample Esquerra o Les Corts (para ir a Sants Estació).',
+  'accommodation.areas.transportIntro.p2':
+    'Si vuelves en avión, te recomendamos los barrios de El Raval, Sant Antoni, Eixample Esquerra (Aerobús), Sants (tren Rodalies R2) o Les Corts y Collblanc (L9 Sud). No obstante hay una parada del autobús directo al aeropuerto (Aerobús) delante de la sede.',
+  'accommodation.areas.transportIntro.p3':
+    'Contaremos con servicio de consigna, por lo que si te vas el domingo, puedes hacer check-out y dejar tus maletas aquí.',
+  'accommodation.areas.category.walking': 'A pie',
+  'accommodation.areas.category.directMetro': 'Metro directo',
+  'accommodation.areas.category.transferMetro': 'Metro con transbordo',
+  'accommodation.areas.eixampleEsquerra.name': 'Eixample Esquerra',
+  'accommodation.areas.eixampleEsquerra.desc':
+    'Lado izquierdo del ensanche, modernista y muy cerca de la UB a pie; buena opción si también usas Sants.',
+  'accommodation.areas.elRaval.name': 'El Raval',
+  'accommodation.areas.elRaval.desc':
+    'Barrio céntrico y multicultural, a poca distancia andando de la sede; el Aerobús enlaza bien con el aeropuerto.',
+  'accommodation.areas.santAntoni.name': 'Sant Antoni',
+  'accommodation.areas.santAntoni.desc':
+    'Mercado y terrazas, ambiente de barrio y un paseo cómodo hasta la universidad.',
+  'accommodation.areas.ciutatVella.name': 'Ciutat Vella',
+  'accommodation.areas.ciutatVella.desc':
+    'Casco histórico (Gòtic, Born…): ambiente único y ubicaciones cerca del evento.',
+  'accommodation.areas.sants.name': 'Sants',
+  'accommodation.areas.sants.desc':
+    'Junto a la estación de Sants: ideal para trenes de largo recorrido y Rodalies hacia el aeropuerto.',
+  'accommodation.areas.poblenou22.name': 'Poble Nou / 22@',
+  'accommodation.areas.poblenou22.desc':
+    'Distrito 22@ y playa; bien conectado por metro en línea directa al centro y la UB.',
+  'accommodation.areas.elClot.name': 'El Clot',
+  'accommodation.areas.elClot.desc':
+    'Barrio consolidado con buen acceso en metro directo al centro donde está la sede.',
+  'accommodation.areas.lesCorts.name': 'Les Corts',
+  'accommodation.areas.lesCorts.desc':
+    'Cerca de la L9 Sud al aeropuerto; para la sede suele requerir transbordo en metro.',
+  'accommodation.areas.eixampleDreta.name': 'Eixample Dreta',
+  'accommodation.areas.eixampleDreta.desc':
+    'Eixample derecho: emblemático y bien comunicado, con enlaces que suelen implicar una correspondencia.',
+  'accommodation.areas.collblanc.name': 'Collblanc',
+  'accommodation.areas.collblanc.desc':
+    'L9 Sud al aeropuerto; para llegar a la UB normalmente harás transbordo.',
   'accommodation.apartments.title': 'Apartamentos Turísticos',
   'accommodation.apartments.text':
     'Si prefieres un apartamento, asegúrate de que cuente con licencia turística oficial (HUTB). Barcelona es muy estricta con la regulación de alojamientos.',
   'accommodation.apartments.link': 'Ver guía de alojamiento seguro en Barcelona',
+  'accommodation.apartments.linkUrl': 'https://meet.barcelona.cat/habitatgesturistics/es',
+  'accommodation.a11y.constructionIcon': 'En construcción',
+  'accommodation.a11y.linkOpensNewTab': 'se abre en una pestaña nueva',
 } as const
diff --git a/src/i18n/home.ts b/src/i18n/home.ts
index 3ad2135..ff5a2a0 100644
--- a/src/i18n/home.ts
+++ b/src/i18n/home.ts
@@ -14,6 +14,10 @@ export const texts = {
     'sponsors.bronze': 'Patrocinador Bronce',
     'sponsors.none': 'No hay patrocinadores en este nivel',
     'sponsors.altlogo': 'Logo de {name}',
+    'cfp.title': 'Llamada a Propuestas',
+    'cfp.description':
+      '¡Ya está abierta la llamada a propuestas! Mándanos tu charla o taller antes del 3 de mayo a las 23:59h (hora peninsular). Si te estás preguntando si puedes hacer esto, la respuesta es que sí. Si tienes un tema que te interesa, ¡nos interesa!',
+    'cfp.button': 'Envía tu propuesta',
   },
   en: {
     'index.initializing': 'Initialising system...',
@@ -30,6 +34,10 @@ export const texts = {
     'sponsors.bronze': 'Bronze Sponsor',
     'sponsors.none': 'No sponsors in this tier',
     'sponsors.altlogo': '{name} logo',
+    'cfp.title': 'Call for Proposals',
+    'cfp.description':
+      "The call for proposals is now open! Send us your talk or workshop before May 3rd at 23:59 (CET). If you're wondering whether you can do this, the answer is yes. If you have a topic that interests you, it interests us!",
+    'cfp.button': 'Submit your proposal',
   },
   ca: {
     'index.initializing': 'Inicialitzant sistema...',
@@ -46,5 +54,9 @@ export const texts = {
     'sponsors.bronze': 'Patrocinador Bronze',
     'sponsors.none': 'No hi ha patrocinadors en aquest nivell',
     'sponsors.altlogo': 'Logo de {name}',
+    'cfp.title': 'Crida a Propostes',
+    'cfp.description':
+      "Ja està oberta la crida a propostes! Envia'ns la teva xerrada o taller abans del 3 de maig a les 23:59h (hora peninsular). Si t'estàs preguntant si pots fer això, la resposta és que sí. Si tens un tema que t'interessa, ens interessa!",
+    'cfp.button': 'Envia la teva proposta',
   },
 } as const
diff --git a/src/i18n/menu/ca.ts b/src/i18n/menu/ca.ts
index 30318d9..d866503 100644
--- a/src/i18n/menu/ca.ts
+++ b/src/i18n/menu/ca.ts
@@ -60,4 +60,5 @@ export const ca = {
       ],
     },
   ],
+  new_tab: "(s'obre en una pestanya nova)",
 } as const
diff --git a/src/i18n/menu/en.ts b/src/i18n/menu/en.ts
index 20a9e40..42e6332 100644
--- a/src/i18n/menu/en.ts
+++ b/src/i18n/menu/en.ts
@@ -60,4 +60,5 @@ export const en = {
       ],
     },
   ],
+  new_tab: '(opens in new tab)',
 } as const
diff --git a/src/i18n/menu/es.ts b/src/i18n/menu/es.ts
index 6a13fa1..ecd0943 100644
--- a/src/i18n/menu/es.ts
+++ b/src/i18n/menu/es.ts
@@ -60,4 +60,5 @@ export const es = {
       ],
     },
   ],
+  new_tab: '(se abre en nueva pestaña)',
 } as const
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 6dcdb87..91aa175 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -109,26 +109,6 @@ const alternates = [
     </script>
 
     <ClientRouter />
-
-    <script is:inline>
-      const getThemePreference = () => {
-        if (typeof localStorage !== 'undefined' && localStorage.getItem('theme')) {
-          return localStorage.getItem('theme')
-        }
-        return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
-      }
-      const isDark = getThemePreference() === 'dark'
-      document.documentElement.classList[isDark ? 'add' : 'remove']('dark')
-      document.documentElement.classList[!isDark ? 'add' : 'remove']('light')
-
-      if (typeof localStorage !== 'undefined') {
-        const observer = new MutationObserver(() => {
-          const isDark = document.documentElement.classList.contains('dark')
-          localStorage.setItem('theme', isDark ? 'dark' : 'light')
-        })
-        observer.observe(document.documentElement, { attributes: true, attributeFilter: ['class'] })
-      }
-    </script>
   </head>
 
   <body
@@ -141,7 +121,7 @@ const alternates = [
     </div>
     <Header lang={lang as string} />
 
-    <main class="relative grow z-10 flex flex-col justify-center container mx-auto p-4 md:p-8 pt-20">
+    <main class="relative grow z-10 flex flex-col justify-center container mx-auto p-4 md:p-8">
       <slot />
     </main>
     <Footer lang={lang as string} />
diff --git a/src/layouts/components/Footer.astro b/src/layouts/components/Footer.astro
index 684c6cc..6100821 100644
--- a/src/layouts/components/Footer.astro
+++ b/src/layouts/components/Footer.astro
@@ -1,6 +1,7 @@
 ---
 import { getRelativeLocaleUrl } from 'astro:i18n'
 import { footerTexts } from '@/i18n/components/footer'
+import { menuTexts } from '@/i18n/menu'
 import SocialIcon from '@/components/icons/SocialIcon.astro'
 
 interface Props {
@@ -17,6 +18,7 @@ type Lang = (typeof validLangs)[number]
 const currentLang: Lang = validLangs.includes(rawLang as Lang) ? (rawLang as Lang) : 'es'
 
 const t = footerTexts[currentLang]
+const menuT = menuTexts[currentLang]
 
 // Updated social links with semantic icon names
 const socialLinks = [
@@ -102,7 +104,7 @@ const collaborators = [
                 target="_blank"
                 rel="noopener noreferrer"
                 class="group flex h-9 w-9 items-center justify-center rounded-lg bg-pycon-gray-100/10 bg-pycon-gray-100/20 border border-pycon-gray-100/10 text-pycon-black text-pycon-white transition-all hover:bg-pycon-yellow hover:text-pycon-black hover:scale-110 outline-none focus-visible:bg-pycon-yellow focus-visible:text-pycon-black"
-                aria-label={link.label}
+                aria-label={`${link.label} ${menuT.new_tab}`}
                 title={link.label}
               >
                 <SocialIcon platform={link.iconName} size="md" aria-hidden="true" />
@@ -128,6 +130,7 @@ const collaborators = [
               target="_blank"
               rel="noopener noreferrer"
               class="group transition-all hover:scale-105 outline-none focus-visible:ring-1 focus-visible:ring-pycon-orange rounded-md p-1"
+              aria-label={`${collab.name} ${menuT.new_tab}`}
               title={collab.name}
             >
               <img
diff --git a/src/layouts/components/Header/components/Navigation.astro b/src/layouts/components/Header/components/Navigation.astro
index eb324ce..85e6715 100644
--- a/src/layouts/components/Header/components/Navigation.astro
+++ b/src/layouts/components/Header/components/Navigation.astro
@@ -49,7 +49,7 @@ const { items } = menuTexts[currentLang]
 
 <div
   id="main-navigation"
-  class="fixed top-0 w-full z-50 bg-pycon-black/90 backdrop-blur-md border-b border-pycon-gray-100/30 transition-colors duration-300"
+  class="fixed top-0 w-screen z-50 bg-pycon-black/90 backdrop-blur-md border-b border-pycon-gray-100/30 transition-colors duration-300"
 >
   <div class="container mx-auto px-4 h-20 flex items-center justify-between">
     <!-- Logo -->
@@ -104,7 +104,11 @@ const { items } = menuTexts[currentLang]
                             class="submenu-item block px-4 py-3 rounded-md text-pycon-white font-medium transition-colors outline-none hover:text-pycon-yellow hover:bg-pycon-yellow-25/15 focus-visible:bg-pycon-orange focus-visible:text-white"
                             role="menuitem"
                             {...(isExternal(child.href)
-                              ? { target: '_blank', rel: 'noopener noreferrer' }
+                              ? {
+                                  target: '_blank',
+                                  rel: 'noopener noreferrer',
+                                  'aria-label': `${child.label} ${menuTexts[currentLang].new_tab}`,
+                                }
                               : {})}
                           >
                             {child.label}
@@ -172,7 +176,11 @@ const { items } = menuTexts[currentLang]
                           href={getLocalizedUrl(currentLang, child.href)}
                           class="block px-4 py-3 rounded-md text-pycon-white font-medium transition-colors outline-none hover:text-pycon-yellow hover:bg-pycon-yellow-25/15 focus-visible:bg-pycon-orange focus-visible:text-white"
                           {...(isExternal(child.href)
-                            ? { target: '_blank', rel: 'noopener noreferrer' }
+                            ? {
+                                target: '_blank',
+                                rel: 'noopener noreferrer',
+                                'aria-label': `${child.label} ${menuTexts[currentLang].new_tab}`,
+                              }
                             : {})}
                         >
                           {child.label}
@@ -222,6 +230,10 @@ const { items } = menuTexts[currentLang]
     const setActiveMenuItem = (): void => {
       const allMenus = mainNav.querySelectorAll('nav > ul')
       const currentPathname = window.location.pathname
+      const currentHash = window.location.hash
+
+      // Build the full current URL (without trailing slash in pathname)
+      const currentFullUrl = currentPathname.replace(/\/$/, '') + currentHash
 
       allMenus.forEach((menu) => {
         const menuItems = [...menu.querySelectorAll('a:not([rel*="external"])')] as HTMLAnchorElement[]
@@ -231,10 +243,17 @@ const { items } = menuTexts[currentLang]
           menuItem.classList.remove('is-active')
           menuItem.removeAttribute('aria-current')
 
-          const itemPathname = menuItem.pathname.replace(/\/$/, '') // Remove trailing slash
-          const currentPath = currentPathname.replace(/\/$/, '')
-
-          if (itemPathname === currentPath || (itemPathname === '' && currentPath === '')) {
+          // Build the full URL for the menu item
+          const itemPathname = menuItem.pathname.replace(/\/$/, '')
+          const itemHash = menuItem.hash || ''
+          const itemFullUrl = itemPathname + itemHash
+
+          // Compare full URLs
+          if (
+            itemFullUrl === currentFullUrl ||
+            (itemFullUrl === '' && currentFullUrl === '') ||
+            (itemPathname === '' && currentPathname.replace(/\/$/, '') === '')
+          ) {
             menuItem.classList.add('is-active')
             menuItem.setAttribute('aria-current', 'page')
           }
@@ -474,6 +493,27 @@ const { items } = menuTexts[currentLang]
 
     // Initialize active menu item
     setActiveMenuItem()
+
+    // Update active menu item when hash changes (for same-page navigation)
+    window.addEventListener('hashchange', setActiveMenuItem)
+
+    // Also listen for popstate (back/forward navigation)
+    window.addEventListener('popstate', setActiveMenuItem)
+
+    // Listen for clicks on menu items to update immediately
+    const allMenus = mainNav.querySelectorAll('nav > ul')
+    allMenus.forEach((menu) => {
+      menu.addEventListener('click', (event) => {
+        const target = event.target as HTMLElement
+        const link = target.closest('a') as HTMLAnchorElement
+        if (link && !link.hasAttribute('rel')) {
+          // Small delay to ensure URL has changed
+          setTimeout(() => {
+            setActiveMenuItem()
+          }, 10)
+        }
+      })
+    })
   })
 </script>
 
diff --git a/src/pages/[lang]/location.astro b/src/pages/[lang]/location.astro
index 5aeb3f9..2dc2809 100644
--- a/src/pages/[lang]/location.astro
+++ b/src/pages/[lang]/location.astro
@@ -18,7 +18,7 @@ const title = titles[(lang || 'es') as keyof typeof titles]
 ---
 
 <Layout title={title}>
-  <div class="grow w-full pt-24">
+  <div class="grow w-full md:mt-24 mt-12">
     <div class="container mx-auto px-4 md:px-8">
       <LocationPage lang={lang || 'es'} />
     </div>
diff --git a/src/pages/[lang]/sponsors.astro b/src/pages/[lang]/sponsors.astro
index 396bdb9..c0e68cf 100644
--- a/src/pages/[lang]/sponsors.astro
+++ b/src/pages/[lang]/sponsors.astro
@@ -38,129 +38,106 @@ const {
 ---
 
 <Layout title={title}>
-  <div class="grow w-full overflow-x-hidden">
-    <div class="container mx-auto px-4 py-8 text-white">
-      <!-- Hero -->
-      <div class="text-center mb-12">
-        <img src="/images/logo-vertical-alt-color-dark.svg" alt="PyconES 2026" class="h-50 mx-auto mb-4" />
-        <div class="flex flex-col items-center">
-          <span class="font-medium
+  <div class="grow w-full mt-24 px-4">
+    <!-- Hero -->
+    <div class="text-center mb-12">
+      <img src="/images/logo-vertical-alt-color-dark.svg" alt="PyconES 2026" class="h-50 mx-auto mb-4" />
+      <div class="flex flex-col items-center">
+        <span class="font-medium
          px-2 -mt-3 rounded text-sm"> {hero.date} </span>
-          <h1 class="mt-24 text-2xl md:text-3xl font-extrabold leading-tight">
-            {hero.subtitle}
-          </h1>
-        </div>
+        <h1 class="mt-24 text-2xl md:text-3xl font-extrabold leading-tight">
+          {hero.subtitle}
+        </h1>
       </div>
+    </div>
 
-      <!-- About -->
-      <section id="about" class="mb-20">
-        <div class="bg-white p-8 rounded-2xl text-center">
-          <h2 class="text-pycon-red text-2xl font-bold mb-4">{about.title}</h2>
-          <p class="text-lg text-pycon-black max-w-175 mx-auto">{about.body}</p>
-        </div>
-      </section>
+    <!-- About -->
+    <section id="about" class="mb-20">
+      <div class="bg-white p-8 rounded-2xl text-center">
+        <h2 class="text-pycon-red text-2xl font-bold mb-4">{about.title}</h2>
+        <p class="text-lg text-pycon-black max-w-175 mx-auto">{about.body}</p>
+      </div>
+    </section>
 
-      <!-- Stats -->
-      <section id="stats" class="mb-20">
-        <h2 class="text-center text-2xl font-bold mb-8">{stats.title}</h2>
-        <div class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-6 gap-4">
-          {
-            stats.items.map((stat: { iconName?: string; icon: string; value: string; label: string }) => (
-              <div class="bg-white text-pycon-black p-4 rounded-lg border border-white/10 text-center">
-                <div class="text-3xl mb-2 flex justify-center items-center" aria-hidden="true">
-                  {stat.iconName ? (
-                    <Icon name={stat.iconName} size="xl" className="text-pycon-orange" />
-                  ) : (
-                    stat.icon
-                  )}
-                </div>
-                <div class="text-2xl font-bold ">{stat.value}</div>
-                <div class="text-sm">{stat.label}</div>
+    <!-- Stats -->
+    <section id="stats" class="mb-20">
+      <h2 class="text-center text-2xl font-bold mb-8">{stats.title}</h2>
+      <div class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-6 gap-4">
+        {
+          stats.items.map((stat: { iconName?: string; icon: string; value: string; label: string }) => (
+            <div class="bg-white text-pycon-black p-4 rounded-lg border border-white/10 text-center">
+              <div class="text-3xl mb-2 flex justify-center items-center" aria-hidden="true">
+                {stat.iconName ? (
+                  <Icon name={stat.iconName} size="xl" className="text-pycon-orange" />
+                ) : (
+                  stat.icon
+                )}
               </div>
-            ))
-          }
-        </div>
-      </section>
+              <div class="text-2xl font-bold ">{stat.value}</div>
+              <div class="text-sm">{stat.label}</div>
+            </div>
+          ))
+        }
+      </div>
+    </section>
 
-      <!-- Alcanza tus objetivos -->
-      <section class="mb-20">
-        <h2 class="text-center text-2xl font-bold mb-8">{objectives.title}</h2>
-        <div class="grid md:grid-cols-3 gap-6">
-          {
-            objectives.items.map((obj: any) => (
-              <div class="bg-white text-pycon-black p-6 rounded-lg border border-white/10 text-center">
-                <div class="text-xl font-bold mb-2">{obj.title}</div>
-                <div>{obj.desc}</div>
-              </div>
-            ))
-          }
-        </div>
-      </section>
+    <!-- Alcanza tus objetivos -->
+    <section class="mb-20">
+      <h2 class="text-center text-2xl font-bold mb-8">{objectives.title}</h2>
+      <div class="grid md:grid-cols-3 gap-6">
+        {
+          objectives.items.map((obj: any) => (
+            <div class="bg-white text-pycon-black p-6 rounded-lg border border-white/10 text-center">
+              <div class="text-xl font-bold mb-2">{obj.title}</div>
+              <div>{obj.desc}</div>
+            </div>
+          ))
+        }
+      </div>
+    </section>
 
-      <!-- Location -->
-      <section id="location" class="mb-20">
-        <h2 class="text-center text-2xl font-bold mb-8">{location.title}</h2>
+    <!-- Location -->
+    <section id="location" class="mb-20">
+      <h2 class="text-center text-2xl font-bold mb-8">{location.title}</h2>
 
-        <div class="grid md:grid-cols-2 gap-6">
-          <div class="bg-white text-pycon-black p-6 rounded-lg border border-white/10">
-            <h3 class="text-xl font-bold mb-4 flex items-center gap-2">
-              <Icon name="location" size="md" className="text-pycon-red" aria-hidden={true} />
-              {location.where}
-            </h3>
-            <p class="mb-4">
-              {location.body}
-              <strong>{location.bodyStrong}</strong>
-              {location.bodyEnd}
+      <div class="grid md:grid-cols-2 gap-6">
+        <div class="bg-white text-pycon-black p-6 rounded-lg border border-white/10">
+          <h3 class="text-xl font-bold mb-4 flex items-center gap-2">
+            <Icon name="location" size="md" className="text-pycon-red" aria-hidden={true} />
+            {location.where}
+          </h3>
+          <p class="mb-4">
+            {location.body}
+            <strong>{location.bodyStrong}</strong>
+            {location.bodyEnd}
+          </p>
+          <p class="">
+            {location.body2}
+          </p>
+        </div>
+
+        <div class="bg-white text-pycon-black p-6 rounded-lg border border-white/10">
+          <h3 class="text-xl font-bold mb-4 flex items-center gap-2">
+            <Icon name="calendar" size="md" className="text-pycon-red" aria-hidden={true} />
+            {when.title}
+          </h3>
+          <div class="space-y-3">
+            <p>
+              <strong>{when.friday}: </strong>{when.fridayStrong}
+              <em>{when.fridayEm}</em>
             </p>
-            <p class="">
-              {location.body2}
+            <p>
+              <strong>{when.saturday}: </strong>
+              {when.saturdayBody}
+            </p>
+            <p>
+              <strong>{when.sunday}: </strong>
+              {when.sundayBody}
             </p>
-          </div>
-
-          <div class="bg-white text-pycon-black p-6 rounded-lg border border-white/10 mt-6">
-            <h3 class="text-xl font-bold mb-4 flex items-center gap-2">
-              <Icon name="calendar" size="md" className="text-pycon-red" aria-hidden={true} />
-              {when.title}
-            </h3>
-            <div class="space-y-3">
-              <p>
-                <strong>{when.friday}: </strong>{when.fridayStrong}
-                <em>{when.fridayEm}</em>
-              </p>
-              <p>
-                <strong>{when.saturday}: </strong>
-                {when.saturdayBody}
-              </p>
-              <p>
-                <strong>{when.sunday}: </strong>
-                {when.sundayBody}
-              </p>
-            </div>
-          </div>
-
-          <div class="bg-white text-pycon-black p-6 rounded-lg border border-white/10">
-            <h3 class="text-xl font-bold mb-4 flex items-center gap-2">
-              <Icon name="calendar" size="md" className="text-pycon-red" aria-hidden={true} />
-              {when.title}
-            </h3>
-            <div class="space-y-3">
-              <p>
-                <strong>{when.friday}: </strong>{when.fridayStrong}
-                <em>{when.fridayEm}</em>
-              </p>
-              <p>
-                <strong>{when.saturday}: </strong>
-                {when.saturdayBody}
-              </p>
-              <p>
-                <strong>{when.sunday}: </strong>
-                {when.sundayBody}
-              </p>
-            </div>
           </div>
         </div>
-      </section>
-    </div>
+      </div>
+    </section>
 
     <!-- Qué es PyConES -->
     <section class="mb-20">
@@ -395,12 +372,12 @@ const {
       <h2 class="text-center text-3xl font-bold mb-8">{tiers.title}</h2>
 
       <div class="table-scroll overflow-x-auto pb-4 mb-8 border border-white/10 rounded-lg bg-pycon-black">
-        <table class="pricing-table w-full border-separate border-spacing-0 min-w-225">
+        <table class="pricing-table w-full border-separate border-spacing-0">
           <thead>
             <tr class="bg-pycon-black">
               <th
                 scope="col"
-                class="w-50 p-4 text-center border-b border-r border-white/10 align-bottom pb-6 sticky left-0 z-10"
+                class="w-50 p-4 text-center border-b border-r border-white/10 align-bottom pb-6 sticky left-0 z-10 bg-pycon-black"
                 >{tiers.column1}</th
               >
               {
@@ -448,23 +425,24 @@ const {
               benefitCategories.items.map((category: any) => (
                 <>
                   <tr>
-                    <th
+                    <td
+                      colspan="5"
                       scope="row"
                       class="p-4 text-left font-bold text-pycon-orange-75 bg-pycon-black border-b border-white/10 sticky left-0 z-10"
                       aria-label={category.category}
                     >
                       <span aria-hidden="true">{category.category}</span>
-                    </th>
+                    </td>
                     <td colspan="5" class="bg-pycon-black border-b border-white/10" />
                   </tr>
                   {category.rows.map((row: any) => (
                     <tr>
-                      <th
+                      <td
                         scope="row"
                         class="p-4 text-left border-b border-r border-white/10 text-white sticky left-0 bg-pycon-black z-10 text-sm font-normal"
                       >
                         {row.label}
-                      </th>
+                      </td>
                       {row.data.map((val: string) => (
                         <td class="p-4 text-center border-b border-white/10 text-sm">
                           {val === '✅' ? (