diff --git a/config.toml b/config.toml
index 9730b06..101620e 100644
--- a/config.toml
+++ b/config.toml
@@ -26,6 +26,7 @@ all_rights_reserved = "All rights reserved"
 conference = "Conference"
 archive = "Archive"
 community = "Community"
+ecosystem = "Ecosystem"
 
 [translations]
 linkedin_tooltip = "Unserer LinkedIn Seite folgen"
@@ -40,6 +41,7 @@ all_rights_reserved = "Alle Rechte vorbehalten"
 conference = "Konferenz"
 archive = "Archiv"
 community = "Community"
+ecosystem = "Ökosystem"
 
 [markdown.highlighting]
 light_theme = "github-light-default"
diff --git a/content/ecosystem/_index.en.md b/content/ecosystem/_index.en.md
new file mode 100644
index 0000000..984f153
--- /dev/null
+++ b/content/ecosystem/_index.en.md
@@ -0,0 +1,48 @@
++++
+title = "Ecosystem"
+template = "ecosystem.html"
+
+[[extra.groups]]
+title = "Large Business"
+entities = [
+    { name = "Analog Devices", url = "https://www.analog.com", description = "Global semiconductor leader bridging the physical and digital worlds to enable breakthroughs at the Intelligent Edge.", address = "Otl-Aicher-Straße 60-64, 80807 München", lat = 48.1868, lon = 11.5985 },
+    { name = "Google", url = "https://about.google/", description = "Organizing the world's information and making it universally accessible and useful.", address = "Erika-Mann-Straße 33, 80636 München", lat = 48.1430, lon = 11.5412 },
+    { name = "Apple", url = "https://www.apple.com", description = "Designing and manufacturing consumer electronics, computer software, and online services.", address = "Katharina-von-Bora-Straße 3, 80333 München", lat = 48.1431, lon = 11.5649 },
+    { name = "Intel", url = "https://www.intel.com", description = "Creating world-changing technology that improves the life of every person on the planet.", address = "Am Campeon 10-12, 85579 Neubiberg", lat = 48.0785, lon = 11.6155 },
+    { name = "Red Hat", url = "https://www.redhat.com", description = "The world's leading provider of enterprise open source solutions.", address = "Werner-von-Siemens-Ring 12, 85630 Grasbrunn", lat = 48.1015, lon = 11.7455 }
+]
+
+[[extra.groups]]
+title = "Medium/Small Business"
+entities = [
+    { name = "Tenstorrent", url = "https://tenstorrent.com/", description = "Building computers for AI.", address = "Feringastrasse 6, 85774 Unterföhring", lat = 48.1778, lon = 11.6333 },
+    { name = "Alpitronic", url = "https://www.alpitronic.it/", description = "High power charging for e-mobility.", address = "Alte Landstraße 29, 85521 Ottobrunn", lat = 48.0788, lon = 11.6538 },
+    { name = "Isar Aerospace", url = "https://www.isaraerospace.com/", description = "Offering flexible and sustainable access to space for small and medium satellites.", address = "Caroline-Herschel-Straße 2, 85521 Ottobrunn", lat = 48.0525, lon = 11.6602 },
+    { name = "Codasip", url = "https://codasip.com/", description = "Leading provider of RISC-V processor IP.", address = "Paul-Gerhardt-Allee 50, 81245 München", lat = 48.1485, lon = 11.4782 },
+    { name = "Helsing", url = "https://helsing.ai/", description = "AI company for defense and national security.", address = "Mühldorfstraße 8, 81671 München", lat = 48.1282, lon = 11.6108 },
+    { name = "Zerophase", url = "https://zerophase.de/", description = "Specialized in embedded systems and software engineering.", address = "Max-Planck-Straße 5, 85716 Unterschleißheim", lat = 48.2841, lon = 11.5672 }
+]
+
+[[extra.groups]]
+title = "Consulting"
+entities = [
+    { name = "Nabla Delta", url = "https://nabladelta.de/", description = "Engineering services for embedded systems.", address = "Steinerstr. 15, 81369 München", lat = 48.1018, lon = 11.5400 },
+    { name = "DENX", url = "https://www.denx.de/", description = "Embedded Linux and U-Boot experts.", address = "Kirchenstr. 5, 82194 Gröbenzell", lat = 48.1945, lon = 11.3735 },
+    { name = "Ilbers", url = "https://ilbers.de/", description = "Consulting and development for embedded Linux systems.", address = "Maria-Merian-Str. 8, 85521 Ottobrunn", lat = 48.0620, lon = 11.6690 },
+    { name = "Embedded Ocean (Xentara)", url = "https://embedded-ocean.com/", description = "Industrial IoT solutions and Xentara platform.", address = "Steinerstr. 15, 81369 München", lat = 48.1018, lon = 11.5400 }
+]
+
+[[extra.groups]]
+title = "Non-profit"
+entities = [
+    { name = "FabLab München", url = "https://www.fablab-muenchen.de/", description = "Open workshop with digital fabrication tools.", address = "Gollierstraße 70, 80339 München", lat = 48.1348, lon = 11.5345 },
+    { name = "Freifunk München (ffmuc)", url = "https://ffmuc.net/", description = "Community network for free wireless internet.", address = "Parkstraße 28, 82131 Gauting", lat = 48.0689, lon = 11.3721 },
+    { name = "Erfindergarden", url = "https://erfindergarden.de/", description = "Open workshop and community space.", address = "Rosenheimer Str. 5, 81667 München", lat = 48.1315, lon = 11.5915 }
+]
+
+[[extra.groups]]
+title = "Meet-ups"
+entities = [
+    { name = "Zephyr Project Meetup", url = "https://www.meetup.com/zephyr-project-munich/", description = "Local community for the Zephyr RTOS project.", address = "Friedrich-Ludwig-Bauer-Straße 3, 85748 Garching bei München", lat = 48.2645, lon = 11.6715 }
+]
++++
diff --git a/content/ecosystem/_index.md b/content/ecosystem/_index.md
new file mode 100644
index 0000000..caca7b9
--- /dev/null
+++ b/content/ecosystem/_index.md
@@ -0,0 +1,48 @@
++++
+title = "Ökosystem"
+template = "ecosystem.html"
+
+[[extra.groups]]
+title = "Großunternehmen"
+entities = [
+    { name = "Analog Devices", url = "https://www.analog.com", description = "Global semiconductor leader bridging the physical and digital worlds to enable breakthroughs at the Intelligent Edge.", address = "Otl-Aicher-Straße 60-64, 80807 München", lat = 48.1868, lon = 11.5985 },
+    { name = "Google", url = "https://about.google/", description = "Organizing the world's information and making it universally accessible and useful.", address = "Erika-Mann-Straße 33, 80636 München", lat = 48.1430, lon = 11.5412 },
+    { name = "Apple", url = "https://www.apple.com", description = "Designing and manufacturing consumer electronics, computer software, and online services.", address = "Katharina-von-Bora-Straße 3, 80333 München", lat = 48.1431, lon = 11.5649 },
+    { name = "Intel", url = "https://www.intel.com", description = "Creating world-changing technology that improves the life of every person on the planet.", address = "Am Campeon 10-12, 85579 Neubiberg", lat = 48.0785, lon = 11.6155 },
+    { name = "Red Hat", url = "https://www.redhat.com", description = "The world's leading provider of enterprise open source solutions.", address = "Werner-von-Siemens-Ring 12, 85630 Grasbrunn", lat = 48.1015, lon = 11.7455 }
+]
+
+[[extra.groups]]
+title = "Mittelstand / KMU"
+entities = [
+    { name = "Tenstorrent", url = "https://tenstorrent.com/", description = "Building computers for AI.", address = "Feringastrasse 6, 85774 Unterföhring", lat = 48.1778, lon = 11.6333 },
+    { name = "Alpitronic", url = "https://www.alpitronic.it/", description = "High power charging for e-mobility.", address = "Alte Landstraße 29, 85521 Ottobrunn", lat = 48.0788, lon = 11.6538 },
+    { name = "Isar Aerospace", url = "https://www.isaraerospace.com/", description = "Offering flexible and sustainable access to space for small and medium satellites.", address = "Caroline-Herschel-Straße 2, 85521 Ottobrunn", lat = 48.0525, lon = 11.6602 },
+    { name = "Codasip", url = "https://codasip.com/", description = "Leading provider of RISC-V processor IP.", address = "Paul-Gerhardt-Allee 50, 81245 München", lat = 48.1485, lon = 11.4782 },
+    { name = "Helsing", url = "https://helsing.ai/", description = "AI company for defense and national security.", address = "Mühldorfstraße 8, 81671 München", lat = 48.1282, lon = 11.6108 },
+    { name = "Zerophase", url = "https://zerophase.de/", description = "Specialized in embedded systems and software engineering.", address = "Max-Planck-Straße 5, 85716 Unterschleißheim", lat = 48.2841, lon = 11.5672 }
+]
+
+[[extra.groups]]
+title = "Beratung / Dienstleistung"
+entities = [
+    { name = "Nabla Delta", url = "https://nabladelta.de/", description = "Engineering services for embedded systems.", address = "Steinerstr. 15, 81369 München", lat = 48.1018, lon = 11.5400 },
+    { name = "DENX", url = "https://www.denx.de/", description = "Embedded Linux and U-Boot experts.", address = "Kirchenstr. 5, 82194 Gröbenzell", lat = 48.1945, lon = 11.3735 },
+    { name = "Ilbers", url = "https://ilbers.de/", description = "Consulting and development for embedded Linux systems.", address = "Maria-Merian-Str. 8, 85521 Ottobrunn", lat = 48.0620, lon = 11.6690 },
+    { name = "Embedded Ocean (Xentara)", url = "https://embedded-ocean.com/", description = "Industrial IoT solutions and Xentara platform.", address = "Steinerstr. 15, 81369 München", lat = 48.1018, lon = 11.5400 }
+]
+
+[[extra.groups]]
+title = "Gemeinnützige Organisationen"
+entities = [
+    { name = "FabLab München", url = "https://www.fablab-muenchen.de/", description = "Open workshop with digital fabrication tools.", address = "Gollierstraße 70, 80339 München", lat = 48.1348, lon = 11.5345 },
+    { name = "Freifunk München (ffmuc)", url = "https://ffmuc.net/", description = "Community network for free wireless internet.", address = "Parkstraße 28, 82131 Gauting", lat = 48.0689, lon = 11.3721 },
+    { name = "Erfindergarden", url = "https://erfindergarden.de/", description = "Open workshop and community space.", address = "Rosenheimer Str. 5, 81667 München", lat = 48.1315, lon = 11.5915 }
+]
+
+[[extra.groups]]
+title = "Meetups"
+entities = [
+    { name = "Zephyr Project Meetup", url = "https://www.meetup.com/zephyr-project-munich/", description = "Local community for the Zephyr RTOS project.", address = "Friedrich-Ludwig-Bauer-Straße 3, 85748 Garching bei München", lat = 48.2645, lon = 11.6715 }
+]
++++
diff --git a/static/css/style.css b/static/css/style.css
index 57d3f71..4672650 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -36,6 +36,8 @@
     --container-3xl: 48rem;
     --container-5xl: 64rem;
     --container-6xl: 72rem;
+    --text-xs: 0.75rem;
+    --text-xs--line-height: calc(1 / 0.75);
     --text-sm: 0.875rem;
     --text-sm--line-height: calc(1.25 / 0.875);
     --text-lg: 1.125rem;
@@ -224,6 +226,9 @@
   .static {
     position: static;
   }
+  .z-0 {
+    z-index: 0;
+  }
   .container {
     width: 100%;
     @media (width >= 40rem) {
@@ -251,6 +256,12 @@
   .ms-4 {
     margin-inline-start: calc(var(--spacing) * 4);
   }
+  .mt-0 {
+    margin-top: calc(var(--spacing) * 0);
+  }
+  .mt-0\.5 {
+    margin-top: calc(var(--spacing) * 0.5);
+  }
   .mt-1 {
     margin-top: calc(var(--spacing) * 1);
   }
@@ -293,6 +304,9 @@
   .mb-12 {
     margin-bottom: calc(var(--spacing) * 12);
   }
+  .mb-16 {
+    margin-bottom: calc(var(--spacing) * 16);
+  }
   .button {
     display: inline-block;
     border-radius: var(--radius-lg);
@@ -334,6 +348,9 @@
   .inline-block {
     display: inline-block;
   }
+  .table {
+    display: table;
+  }
   .aspect-square {
     aspect-ratio: 1 / 1;
   }
@@ -355,6 +372,9 @@
   .h-80 {
     height: calc(var(--spacing) * 80);
   }
+  .h-96 {
+    height: calc(var(--spacing) * 96);
+  }
   .h-auto {
     height: auto;
   }
@@ -400,15 +420,27 @@
   .flex-1 {
     flex: 1;
   }
+  .flex-shrink {
+    flex-shrink: 1;
+  }
   .shrink-0 {
     flex-shrink: 0;
   }
+  .flex-grow {
+    flex-grow: 1;
+  }
   .grow {
     flex-grow: 1;
   }
+  .border-collapse {
+    border-collapse: collapse;
+  }
   .transform {
     transform: var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,);
   }
+  .resize {
+    resize: both;
+  }
   .grid-cols-1 {
     grid-template-columns: repeat(1, minmax(0, 1fr));
   }
@@ -427,6 +459,12 @@
   .justify-center {
     justify-content: center;
   }
+  .gap-1 {
+    gap: calc(var(--spacing) * 1);
+  }
+  .gap-2 {
+    gap: calc(var(--spacing) * 2);
+  }
   .gap-3 {
     gap: calc(var(--spacing) * 3);
   }
@@ -455,6 +493,13 @@
       margin-block-end: calc(calc(var(--spacing) * 2) * calc(1 - var(--tw-space-y-reverse)));
     }
   }
+  .space-y-16 {
+    :where(& > :not(:last-child)) {
+      --tw-space-y-reverse: 0;
+      margin-block-start: calc(calc(var(--spacing) * 16) * var(--tw-space-y-reverse));
+      margin-block-end: calc(calc(var(--spacing) * 16) * calc(1 - var(--tw-space-y-reverse)));
+    }
+  }
   .divide-y {
     :where(& > :not(:last-child)) {
       --tw-divide-y-reverse: 0;
@@ -519,6 +564,9 @@
   .border-gray-200 {
     border-color: var(--color-gray-200);
   }
+  .border-gray-300 {
+    border-color: var(--color-gray-300);
+  }
   .bg-blue-50 {
     background-color: var(--color-blue-50);
   }
@@ -616,6 +664,10 @@
     font-size: var(--text-2xl);
     line-height: var(--tw-leading, var(--text-2xl--line-height));
   }
+  .text-3xl {
+    font-size: var(--text-3xl);
+    line-height: var(--tw-leading, var(--text-3xl--line-height));
+  }
   .text-lg {
     font-size: var(--text-lg);
     line-height: var(--tw-leading, var(--text-lg--line-height));
@@ -628,6 +680,10 @@
     font-size: var(--text-xl);
     line-height: var(--tw-leading, var(--text-xl--line-height));
   }
+  .text-xs {
+    font-size: var(--text-xs);
+    line-height: var(--tw-leading, var(--text-xs--line-height));
+  }
   .leading-0 {
     --tw-leading: calc(var(--spacing) * 0);
     line-height: calc(var(--spacing) * 0);
@@ -679,6 +735,9 @@
   .text-gray-800 {
     color: var(--color-gray-800);
   }
+  .text-gray-900 {
+    color: var(--color-gray-900);
+  }
   .text-green-800 {
     color: var(--color-green-800);
   }
@@ -694,6 +753,9 @@
   .underline-offset-4 {
     text-underline-offset: 4px;
   }
+  .opacity-0 {
+    opacity: 0%;
+  }
   .shadow-lg {
     --tw-shadow: 0 10px 15px -3px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 4px 6px -4px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
     box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
@@ -706,6 +768,10 @@
     --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 1px 2px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
     box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
   }
+  .outline {
+    outline-style: var(--tw-outline-style);
+    outline-width: 1px;
+  }
   .transition-all {
     transition-property: all;
     transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
@@ -716,6 +782,11 @@
     transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
     transition-duration: var(--tw-duration, var(--default-transition-duration));
   }
+  .transition-opacity {
+    transition-property: opacity;
+    transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
+    transition-duration: var(--tw-duration, var(--default-transition-duration));
+  }
   .transition-shadow {
     transition-property: box-shadow;
     transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
@@ -754,6 +825,13 @@
       }
     }
   }
+  .group-hover\:opacity-100 {
+    &:is(:where(.group):hover *) {
+      @media (hover: hover) {
+        opacity: 100%;
+      }
+    }
+  }
   .hover\:-translate-y-1 {
     &:hover {
       @media (hover: hover) {
@@ -793,6 +871,14 @@
       }
     }
   }
+  .hover\:shadow-md {
+    &:hover {
+      @media (hover: hover) {
+        --tw-shadow: 0 4px 6px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 2px 4px -2px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
+        box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+      }
+    }
+  }
   .hover\:shadow-xl {
     &:hover {
       @media (hover: hover) {
@@ -863,6 +949,12 @@
       line-height: var(--tw-leading, var(--text-3xl--line-height));
     }
   }
+  .md\:text-4xl {
+    @media (width >= 48rem) {
+      font-size: var(--text-4xl);
+      line-height: var(--tw-leading, var(--text-4xl--line-height));
+    }
+  }
   .lg\:block {
     @media (width >= 64rem) {
       display: block;
@@ -1255,6 +1347,11 @@
   inherits: false;
   initial-value: 0 0 #0000;
 }
+@property --tw-outline-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
 @property --tw-translate-x {
   syntax: "*";
   inherits: false;
@@ -1302,6 +1399,7 @@
       --tw-ring-offset-width: 0px;
       --tw-ring-offset-color: #fff;
       --tw-ring-offset-shadow: 0 0 #0000;
+      --tw-outline-style: solid;
       --tw-translate-x: 0;
       --tw-translate-y: 0;
       --tw-translate-z: 0;
diff --git a/templates/_macros.html b/templates/_macros.html
index 12ee54e..0f38d4b 100644
--- a/templates/_macros.html
+++ b/templates/_macros.html
@@ -26,6 +26,7 @@ <h1 class="mb-1 mt-1 mr-2 leading-0"><a href="{{ prefix }}/" class="text-white t
                     <a href="{{ prefix }}/" class="text-white hover:text-blue-200 font-medium{% if page_url == '/' or page_url == '/en/' %} underline underline-offset-4{% endif %}">{{ trans(key="conference", lang=lang) }}</a>
                     <a href="{{ prefix }}/archive/" class="text-white hover:text-blue-200 font-medium{% if page_url is starting_with('/archive') or page_url is starting_with('/en/archive') %} underline underline-offset-4{% endif %}">{{ trans(key="archive", lang=lang) }}</a>
                     <a href="{{ prefix }}/community/" class="text-white hover:text-blue-200 font-medium{% if page_url is starting_with('/community') or page_url is starting_with('/en/community') %} underline underline-offset-4{% endif %}">{{ trans(key="community", lang=lang) }}</a>
+                    <a href="{{ prefix }}/ecosystem/" class="text-white hover:text-blue-200 font-medium{% if page_url is starting_with('/ecosystem') or page_url is starting_with('/en/ecosystem') %} underline underline-offset-4{% endif %}">{{ trans(key="ecosystem", lang=lang) }}</a>
                 </div>
             </div>
             <div class="flex items-center gap-3">
@@ -98,6 +99,7 @@ <h1 class="mb-1 mt-1 mr-2 leading-0"><a href="{{ prefix }}/" class="text-white t
                 <a href="{{ prefix }}/" class="text-white hover:text-blue-200 font-medium{% if page_url == '/' or page_url == '/en/' %} underline underline-offset-4{% endif %}">{{ trans(key="conference", lang=lang) }}</a>
                 <a href="{{ prefix }}/archive/" class="text-white hover:text-blue-200 font-medium{% if page_url is starting_with('/archive') or page_url is starting_with('/en/archive') %} underline underline-offset-4{% endif %}">{{ trans(key="archive", lang=lang) }}</a>
                 <a href="{{ prefix }}/community/" class="text-white hover:text-blue-200 font-medium{% if page_url is starting_with('/community') or page_url is starting_with('/en/community') %} underline underline-offset-4{% endif %}">{{ trans(key="community", lang=lang) }}</a>
+                <a href="{{ prefix }}/ecosystem/" class="text-white hover:text-blue-200 font-medium{% if page_url is starting_with('/ecosystem') or page_url is starting_with('/en/ecosystem') %} underline underline-offset-4{% endif %}">{{ trans(key="ecosystem", lang=lang) }}</a>
                 <div class="flex items-center gap-3 pt-2 border-t border-blue-800">
                     <a href="{{ prefix }}/newsletter" title="{{ trans(key="newsletter_tooltip", lang=lang) }}"
                        class="px-1 text-white hover:text-blue-200">
diff --git a/templates/ecosystem.html b/templates/ecosystem.html
new file mode 100644
index 0000000..9092de0
--- /dev/null
+++ b/templates/ecosystem.html
@@ -0,0 +1,83 @@
+{% extends "_base.html" %}
+
+{% block page_title %}{{ section.title }} - Munich Embedded{% endblock %}
+
+{% block content %}
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin=""/>
+<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
+
+<main class="grow bg-gray-100 py-16">
+    <div class="container mx-auto px-4">
+        <h1 class="text-3xl md:text-4xl font-bold text-center mb-12">{{ section.title }}</h1>
+        
+        <div class="max-w-5xl mx-auto mb-16 h-96 rounded-lg shadow-md z-0" id="map"></div>
+
+        <div class="max-w-5xl mx-auto space-y-16">
+            {% for group in section.extra.groups %}
+                <section>
+                    <h2 class="text-2xl font-bold mb-6 text-gray-800 border-b border-gray-300 pb-2">{{ group.title }}</h2>
+                    <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+                        {% for entity in group.entities %}
+                            <a href="{{ entity.url }}" target="_blank" class="block group h-full">
+                                <div class="bg-white p-6 rounded-lg shadow-sm hover:shadow-md transition-shadow duration-300 h-full flex flex-col border border-gray-200">
+                                    <h3 class="text-xl font-semibold mb-2 text-gray-900 group-hover:text-blue-600 transition-colors">{{ entity.name }}</h3>
+                                    <p class="text-gray-600 text-sm flex-grow">{{ entity.description }}</p>
+                                    {% if entity.address %}
+                                        <div class="mt-4 flex items-start gap-2 text-gray-500 text-xs">
+                                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="shrink-0 mt-0.5">
+                                                <path d="M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z"></path>
+                                                <circle cx="12" cy="10" r="3"></circle>
+                                            </svg>
+                                            <span>{{ entity.address }}</span>
+                                        </div>
+                                    {% endif %}
+                                    <div class="mt-4 text-blue-600 text-sm font-medium opacity-0 group-hover:opacity-100 transition-opacity flex items-center gap-1">
+                                        <span>
+                                            {% if current_path is starting_with('/en') %}
+                                                Visit Website
+                                            {% else %}
+                                                Webseite besuchen
+                                            {% endif %}
+                                        </span>
+                                        <span>&rarr;</span>
+                                    </div>
+                                </div>
+                            </a>
+                        {% endfor %}
+                    </div>
+                </section>
+            {% endfor %}
+        </div>
+    </div>
+</main>
+
+<script>
+    var map = L.map('map').setView([48.1351, 11.5820], 11); // Default to Munich center
+
+    L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
+        subdomains: 'abcd',
+        maxZoom: 20
+    }).addTo(map);
+
+    var markers = [];
+    {% for group in section.extra.groups %}
+        {% for entity in group.entities %}
+            {% if entity.lat and entity.lon %}
+                var marker = L.marker([{{ entity.lat }}, {{ entity.lon }}]).addTo(map);
+                var popupContent = "<b>{{ entity.name }}</b>";
+                {% if entity.address %}
+                    popupContent += "<br>{{ entity.address }}";
+                {% endif %}
+                marker.bindPopup(popupContent);
+                markers.push(marker);
+            {% endif %}
+        {% endfor %}
+    {% endfor %}
+
+    if (markers.length > 0) {
+        var group = new L.featureGroup(markers);
+        map.fitBounds(group.getBounds().pad(0.1));
+    }
+</script>
+{% endblock %}