diff --git a/components/blocks/InteractiveGermanyMap.tsx b/components/blocks/InteractiveGermanyMap.tsx
index c28856e8c..a73b42396 100644
--- a/components/blocks/InteractiveGermanyMap.tsx
+++ b/components/blocks/InteractiveGermanyMap.tsx
@@ -1,13 +1,13 @@
 'use client';
 
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useCallback, useMemo } from 'react';
 import { motion, AnimatePresence } from 'framer-motion';
-import { MapPin, Factory, Zap, CheckCircle2, ArrowUpRight } from 'lucide-react';
+import { MapPin, CheckCircle2, ArrowUpRight } from 'lucide-react';
 import Image from 'next/image';
-import { useRouter, usePathname } from 'next/navigation';
+import { usePathname } from 'next/navigation';
 import Link from 'next/link';
 import { AnimatedGlossyBorder } from '@/components/ui/AnimatedGlossyBorder';
-import { Location, defaultLocations, minorLocations, projectLocations } from '@/lib/map-data';
+import { Location, projectLocations } from '@/lib/map-data';
 import { standorteLocations } from '@/lib/standorte-data';
 import { useLocale, useTranslations } from 'next-intl';
 
@@ -28,6 +28,59 @@ interface InteractiveGermanyMapProps {
   hideStandorte?: boolean;
 }
 
+const MinorNode = React.memo(({ loc, isActive, onEnter, onLeave }: { loc: Location, isActive: boolean, onEnter: (loc: Location) => void, onLeave: () => void }) => (
+  <div
+    className={`absolute group/minor cursor-pointer w-8 h-8 md:w-5 md:h-5 flex items-center justify-center ${isActive ? 'z-[60]' : 'z-10 hover:z-30'}`}
+    style={{
+      left: `${loc.x}%`,
+      top: `${loc.y}%`,
+      transform: 'translate(-50%, -50%)',
+    }}
+    onMouseEnter={() => onEnter(loc)}
+    onMouseLeave={onLeave}
+    onTouchStart={() => onEnter(loc)}
+    onClick={() => onEnter(loc)}
+  >
+    <div className={`w-1.5 h-1.5 rounded-full transition-all duration-300 ${isActive ? 'bg-white scale-150 shadow-[0_0_10px_rgba(130,237,32,1)]' : 'bg-primary/80 group-hover/minor:bg-white group-hover/minor:scale-150'}`} />
+    <div className="absolute inset-0 m-auto w-2 h-2 bg-primary rounded-full opacity-0 group-hover/minor:animate-ping" />
+  </div>
+));
+MinorNode.displayName = 'MinorNode';
+
+const MajorNode = React.memo(({ loc, isActive, idx, onEnter, onLeave }: { loc: Location, isActive: boolean, idx: number, onEnter: (loc: Location) => void, onLeave: () => void }) => {
+  const isHQ = loc.type === 'hq';
+  const isBranch = loc.type === 'branch';
+  return (
+    <div
+      className={`absolute transform -translate-x-1/2 -translate-y-1/2 group/pin cursor-pointer w-16 h-16 flex items-center justify-center ${isActive ? 'z-[60]' : 'z-20 hover:z-40'}`}
+      style={{ left: `${loc.x}%`, top: `${loc.y}%` }}
+      onMouseEnter={() => onEnter(loc)}
+      onMouseLeave={onLeave}
+      onTouchStart={() => onEnter(loc)}
+      onClick={() => onEnter(loc)}
+    >
+      {(isHQ || isBranch) && (
+        <div className="absolute inset-0 m-auto w-6 h-6 rounded-full animate-ping bg-primary/50 scale-150" />
+      )}
+      <motion.div
+        initial={{ scale: 0 }}
+        animate={{ scale: 1 }}
+        transition={{ type: 'spring', delay: idx * 0.1 }}
+        className={`relative flex items-center justify-center rounded-full shadow-[0_0_20px_rgba(130,237,32,0.6)] transition-transform duration-300 ${
+          isActive ? 'scale-125 z-30 ring-4 ring-primary/40' : 'scale-100 group-hover/pin:scale-110'
+        } ${
+          isHQ || isBranch
+            ? 'w-7 h-7 bg-primary text-[#050B14]'
+            : 'w-4 h-4 bg-white ring-[3px] ring-primary'
+        }`}
+      >
+        {(isHQ || isBranch) && <MapPin className="w-4 h-4" />}
+      </motion.div>
+    </div>
+  );
+});
+MajorNode.displayName = 'MajorNode';
+
 export function InteractiveGermanyMap({
   badge,
   title,
@@ -40,22 +93,21 @@ export function InteractiveGermanyMap({
   const [activeLocation, setActiveLocation] = useState<Location | null>(null);
   const hoverTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
-  const handleMouseEnter = (loc: Location) => {
+  const handleMouseEnter = useCallback((loc: Location) => {
     if (hoverTimeoutRef.current) {
       clearTimeout(hoverTimeoutRef.current);
       hoverTimeoutRef.current = null;
     }
     setActiveLocation(loc);
-  };
+  }, []);
 
-  const handleMouseLeave = () => {
+  const handleMouseLeave = useCallback(() => {
     const timeout = setTimeout(() => {
       setActiveLocation(null);
     }, 200);
     hoverTimeoutRef.current = timeout;
-  };
+  }, []);
 
-  const router = useRouter();
   const pathname = usePathname();
   const locale = useLocale();
   const t = useTranslations('InteractiveGermanyMap');
@@ -67,14 +119,11 @@ export function InteractiveGermanyMap({
   ];
 
   const finalBadge = badge || tStandard('badge');
-  // the map is mostly used with specific props, so we leave title & description to fallbacks if not provided
   const finalTitle = title || (locale === 'en' ? <>Nationwide<br/>in operation for you.</> : <>Deutschlandweit<br/>für Sie im Einsatz.</>);
   const finalDescription = description || (locale === 'en' ? 'From our strategic locations in Guben, Kirchheilingen and Bülstedt, we control and implement complex infrastructure projects nationwide.' : 'Von unseren strategischen Standorten in Guben, Kirchheilingen und Bülstedt steuern und realisieren wir komplexe Infrastrukturprojekte im gesamten Bundesgebiet.');
 
-  const finalLocations = React.useMemo(() => {
+  const finalLocations = useMemo(() => {
     if (hideStandorte) return locations;
-    
-    // Ensure the 3 standorte are always included, without duplicating if already present by ID
     const base = [...locations];
     standorteLocations.forEach(sl => {
       if (!base.some(l => l.id === sl.id)) {
@@ -84,19 +133,28 @@ export function InteractiveGermanyMap({
     return base;
   }, [locations, hideStandorte]);
 
+  const mapBackground = useMemo(() => (
+    <div className="absolute inset-0 opacity-[0.25] mix-blend-screen drop-shadow-2xl brightness-200 pointer-events-none transform-gpu">
+      <Image
+        src="/germany-map.svg"
+        alt={locale === 'en' ? "Map of Germany" : "Deutschlandkarte"}
+        fill
+        className="object-cover"
+        priority
+      />
+    </div>
+  ), [locale]);
+
   return (
     <div key={isHero ? `hero-map-${pathname}` : undefined} className={isHero ? "relative w-full" : "relative w-full max-w-7xl mx-auto py-12 md:py-24 px-4 sm:px-6 mt-16 md:mt-20"}>
       <div className={`bg-[#050B14] ${isHero ? 'pt-32 pb-16 md:pt-40 md:pb-24' : 'rounded-[2.5rem] md:rounded-[3.5rem] shadow-2xl border border-white/5'} overflow-visible relative group/map`}>
-        {/* Animated Border Glow */}
         {!isHero && <AnimatedGlossyBorder opacity={0.7} className="z-30" />}
         
-        {/* Background Effects */}
         <div className={`absolute inset-0 bg-gradient-to-br from-[#050B14] via-[#0A1322] to-[#050B14] ${!isHero && 'rounded-[2.5rem] md:rounded-[3.5rem]'} overflow-hidden`} />
         <div className="absolute top-0 right-0 w-[800px] h-[800px] bg-primary/5 rounded-full blur-[120px] pointer-events-none translate-x-1/3 -translate-y-1/3 overflow-hidden" />
         
         <div className={`relative z-10 grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-12 gap-12 items-center min-h-[600px] ${isHero ? 'max-w-7xl mx-auto px-4 sm:px-6' : 'p-8 md:p-12 lg:p-16'}`}>
           
-          {/* Content Left */}
           <div className="xl:col-span-5 text-white z-20">
             <div className="inline-flex items-center gap-2 px-3 py-1.5 rounded-full bg-primary/10 border border-primary/20 text-primary text-xs font-bold uppercase tracking-wider mb-8">
               <MapPin className="w-4 h-4" />
@@ -117,7 +175,6 @@ export function InteractiveGermanyMap({
               {finalDescription}
             </p>
 
-            {/* Industrial Stats Grid */}
             <div className="grid grid-cols-2 gap-4">
               {finalStats.map((stat, i) => {
                 const StatCard = () => (
@@ -148,85 +205,32 @@ export function InteractiveGermanyMap({
             </div>
           </div>
 
-          {/* Map Right */}
           <div className="xl:col-span-7 relative flex items-center justify-center min-h-[500px] lg:min-h-[700px] z-10 pointer-events-none">
-            {/* Map Container - Enforce strict aspect ratio matching the SVG (1024x1024) */}
             <div className="relative w-full max-w-[600px] aspect-square group pointer-events-auto">
               
-              {/* Map SVG */}
-              <div className="absolute inset-0 opacity-[0.25] mix-blend-screen drop-shadow-2xl brightness-200 pointer-events-none">
-                <Image
-                  src="/germany-map.svg"
-                  alt={locale === 'en' ? "Map of Germany" : "Deutschlandkarte"}
-                  fill
-                  className="object-cover"
-                  priority
+              {mapBackground}
+
+              {finalLocations.filter(l => l.type === 'minor_node').map((loc, idx) => (
+                <MinorNode
+                  key={`minor-${loc.id || idx}`}
+                  loc={loc}
+                  isActive={activeLocation === loc}
+                  onEnter={handleMouseEnter}
+                  onLeave={handleMouseLeave}
                 />
-              </div>
+              ))}
 
-              {/* Minor Location Markers (The 100+ generic projects) */}
-              {finalLocations.filter(l => l.type === 'minor_node').map((loc, idx) => {
-                const isActive = activeLocation === loc;
-                return (
-                <div
-                  key={`minor-${idx}`}
-                  className={`absolute group/minor cursor-pointer w-8 h-8 md:w-5 md:h-5 flex items-center justify-center ${isActive ? 'z-[60]' : 'z-10 hover:z-30'}`}
-                  style={{
-                    left: `${loc.x}%`,
-                    top: `${loc.y}%`,
-                    transform: 'translate(-50%, -50%)',
-                  }}
-                  onMouseEnter={() => handleMouseEnter(loc)}
-                  onMouseLeave={handleMouseLeave}
-                  onTouchStart={() => handleMouseEnter(loc)}
-                  onClick={() => handleMouseEnter(loc)}
-                >
-                  <div className={`w-1.5 h-1.5 rounded-full transition-all duration-300 ${isActive ? 'bg-white scale-150 shadow-[0_0_10px_rgba(130,237,32,1)]' : 'bg-primary/80 group-hover/minor:bg-white group-hover/minor:scale-150'}`} />
-                  <div className="absolute inset-0 m-auto w-2 h-2 bg-primary rounded-full opacity-0 group-hover/minor:animate-ping" />
-                </div>
-              )})}
+              {finalLocations.filter(l => l.type !== 'minor_node').map((loc, idx) => (
+                <MajorNode
+                  key={loc.id}
+                  loc={loc}
+                  idx={idx}
+                  isActive={activeLocation?.id === loc.id}
+                  onEnter={handleMouseEnter}
+                  onLeave={handleMouseLeave}
+                />
+              ))}
 
-              {/* Major Location Markers (HQ, Branch, Project) */}
-              {finalLocations.filter(l => l.type !== 'minor_node').map((loc, idx) => {
-                const isHQ = loc.type === 'hq';
-                const isBranch = loc.type === 'branch';
-                const isActive = activeLocation?.id === loc.id;
-
-                return (
-                  <div
-                    key={loc.id}
-                    className={`absolute transform -translate-x-1/2 -translate-y-1/2 group/pin cursor-pointer w-16 h-16 flex items-center justify-center ${isActive ? 'z-[60]' : 'z-20 hover:z-40'}`}
-                    style={{ left: `${loc.x}%`, top: `${loc.y}%` }}
-                    onMouseEnter={() => handleMouseEnter(loc)}
-                    onMouseLeave={handleMouseLeave}
-                    onTouchStart={() => handleMouseEnter(loc)}
-                    onClick={() => handleMouseEnter(loc)}
-                  >
-                    {/* Ping Animation for HQ / Branch */}
-                    {(isHQ || isBranch) && (
-                      <div className="absolute inset-0 m-auto w-6 h-6 rounded-full animate-ping bg-primary/50 scale-150" />
-                    )}
-
-                    {/* Elegant Marker Dot */}
-                    <motion.div
-                      initial={{ scale: 0 }}
-                      animate={{ scale: 1 }}
-                      transition={{ type: 'spring', delay: idx * 0.1 }}
-                      className={`relative flex items-center justify-center rounded-full shadow-[0_0_20px_rgba(130,237,32,0.6)] transition-transform duration-300 ${
-                        isActive ? 'scale-125 z-30 ring-4 ring-primary/40' : 'scale-100 group-hover/pin:scale-110'
-                      } ${
-                        isHQ || isBranch
-                          ? 'w-7 h-7 bg-primary text-[#050B14]'
-                          : 'w-4 h-4 bg-white ring-[3px] ring-primary'
-                      }`}
-                    >
-                      {(isHQ || isBranch) && <MapPin className="w-4 h-4" />}
-                    </motion.div>
-                  </div>
-                );
-              })}
-
-              {/* Global Tooltip */}
               <AnimatePresence>
                 {activeLocation && (
                   <motion.div
@@ -245,7 +249,6 @@ export function InteractiveGermanyMap({
                     onMouseLeave={handleMouseLeave}
                   >
                     <div className="bg-[#050B14]/95 backdrop-blur-xl border border-white/10 rounded-2xl shadow-2xl min-w-[200px] w-max max-w-[300px] text-white overflow-hidden">
-                      
                       {activeLocation.featuredImage && (
                         <div className="relative w-full h-32 bg-neutral-900">
                           <Image