diff --git a/components/blocks/HeroVideo.tsx b/components/blocks/HeroVideo.tsx
index a25cabe93..01d35c41b 100644
--- a/components/blocks/HeroVideo.tsx
+++ b/components/blocks/HeroVideo.tsx
@@ -37,19 +37,10 @@ export function HeroVideo(props: HeroVideoProps) {
   const ctaLabel = props.ctaLabel || props.linkText || data?.ctaLabel || 'Unternehmen entdecken';
   const ctaHref = props.ctaHref || props.linkHref || data?.ctaHref || '#unternehmen';
   
-  let currentLocale = 'de';
-  try {
-    // We can't unconditionally call hooks if they might fail outside context, but HeroVideo is usually in context.
-    // However, to be safe and avoid adding new imports, we can use window.location or default to 'de' if not available.
-    if (typeof window !== 'undefined') {
-      currentLocale = window.location.pathname.startsWith('/en') ? 'en' : 'de';
-    }
-  } catch (e) {
-    // Fallback to default locale if window/location access fails
-  }
+  const currentLocale = pathname?.startsWith('/en') ? 'en' : 'de';
 
   const secondaryCtaLabel = props.secondaryCtaLabel || data?.secondaryCtaLabel || (currentLocale === 'de' ? 'Projekt anfragen' : 'Inquire Project');
-  const secondaryCtaHref = props.secondaryCtaHref || data?.secondaryCtaHref || `/${currentLocale}/${currentLocale === 'de' ? 'contact' : 'contact'}`;
+  const secondaryCtaHref = props.secondaryCtaHref || data?.secondaryCtaHref || `/${currentLocale}/contact`;
 
   return (
     <div className="relative w-full h-[100svh] flex items-center justify-center overflow-hidden bg-neutral-dark">
@@ -98,7 +89,7 @@ export function HeroVideo(props: HeroVideoProps) {
         >
           <h1 
             className="font-heading font-bold text-4xl md:text-6xl lg:text-8xl text-white mb-6 uppercase tracking-tight drop-shadow-lg"
-            dangerouslySetInnerHTML={{ __html: title.replace('KABELTIEFBAU', '<span class="text-primary-light">KABELTIEFBAU</span>').replace(/\\n|\n/g, '<br />') }}
+            dangerouslySetInnerHTML={{ __html: title.replace(/KABELTIEFBAU|Kabeltiefbau/g, '<span class="text-primary-light">Kabeltiefbau</span>').replace(/KABELNETZBAU|Kabelnetzbau/g, '<span class="text-primary-light">Kabelnetzbau</span>').replace(/\\n|\n/g, '<br />') }}
           />
           
           <p className="text-lg md:text-xl lg:text-2xl text-white/90 max-w-3xl mx-auto mb-12 drop-shadow">
diff --git a/components/blocks/InteractiveGermanyMap.tsx b/components/blocks/InteractiveGermanyMap.tsx
index e8f772238..4b926b842 100644
--- a/components/blocks/InteractiveGermanyMap.tsx
+++ b/components/blocks/InteractiveGermanyMap.tsx
@@ -52,10 +52,16 @@ export function InteractiveGermanyMap({
   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 hq = locations.find((l) => l.type === 'hq');
-  const branch = locations.find((l) => l.type === 'branch');
-  const projects = locations.filter((l) => l.type === 'project');
-  const minorNodes = locations.filter((l) => l.type === 'minor_node');
+  const finalLocations = React.useMemo(() => {
+    // 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)) {
+        base.push(sl as Location);
+      }
+    });
+    return base;
+  }, [locations]);
 
   return (
     <div key={isHero ? `hero-map-${pathname}` : undefined} className={isHero ? "relative w-full" : "relative w-full max-w-7xl mx-auto py-16 md:py-24 px-4 sm:px-6 mt-16 md:mt-20"}>
@@ -138,7 +144,7 @@ export function InteractiveGermanyMap({
               </div>
 
               {/* Minor Location Markers (The 100+ generic projects) */}
-              {locations.filter(l => l.type === 'minor_node').map((loc, idx) => (
+              {finalLocations.filter(l => l.type === 'minor_node' || l.type === 'project').map((loc, idx) => (
                 <div
                   key={`minor-${idx}`}
                   className="absolute z-10 group/minor cursor-pointer w-10 h-10 flex items-center justify-center"
@@ -155,8 +161,8 @@ export function InteractiveGermanyMap({
                 </div>
               ))}
 
-              {/* Major & Reference Location Markers (HQ, Branch, Project) */}
-              {locations.filter(l => l.type !== 'minor_node').map((loc, idx) => {
+              {/* Major Location Markers (HQ, Branch) */}
+              {finalLocations.filter(l => l.type === 'hq' || l.type === 'branch').map((loc, idx) => {
                 const isHQ = loc.type === 'hq';
                 const isBranch = loc.type === 'branch';
                 const isActive = activeLocation?.id === loc.id;
@@ -273,7 +279,7 @@ export function InteractiveGermanyMap({
                           </ul>
                         )}
 
-                        {activeLocation.href && (
+                        {activeLocation.href && (activeLocation.type === 'hq' || activeLocation.type === 'branch') && (
                           <div className="inline-flex items-center text-xs font-bold text-primary">
                             {t('learnMore')}
                             <ArrowUpRight className="w-3.5 h-3.5 ml-1" />
diff --git a/components/blocks/ScaleOfImpact.tsx b/components/blocks/ScaleOfImpact.tsx
index d8a900eb2..ce3ceae6c 100644
--- a/components/blocks/ScaleOfImpact.tsx
+++ b/components/blocks/ScaleOfImpact.tsx
@@ -84,19 +84,19 @@ export function ScaleOfImpact() {
         {/* Static Data Grid (No jumping text) */}
         <div className="grid grid-cols-2 md:grid-cols-4 gap-8 md:gap-12 w-full max-w-5xl mt-12">
           <div className="flex flex-col items-center">
-            <div className="font-mono text-4xl md:text-5xl font-black text-white tracking-tighter mb-2">200<span className="text-primary">+</span></div>
+            <div className="font-mono text-4xl md:text-5xl font-black text-white tracking-tighter mb-2">200 <span className="text-primary">+</span></div>
             <div className="text-xs font-bold uppercase tracking-widest text-white/50">{locale === 'en' ? 'Projects' : 'Projekte'}</div>
           </div>
           <div className="flex flex-col items-center">
-            <div className="font-mono text-4xl md:text-5xl font-black text-white tracking-tighter mb-2">974<span className="text-primary text-2xl">km</span></div>
+            <div className="font-mono text-4xl md:text-5xl font-black text-white tracking-tighter mb-2">974 <span className="text-primary text-2xl">km</span></div>
             <div className="text-xs font-bold uppercase tracking-widest text-white/50">{locale === 'en' ? 'Cable Laying' : 'Kabelverlegung'}</div>
           </div>
           <div className="flex flex-col items-center">
-            <div className="font-mono text-4xl md:text-5xl font-black text-white tracking-tighter mb-2">300<span className="text-primary text-2xl">km</span></div>
+            <div className="font-mono text-4xl md:text-5xl font-black text-white tracking-tighter mb-2">300 <span className="text-primary text-2xl">km</span></div>
             <div className="text-xs font-bold uppercase tracking-widest text-white/50">{locale === 'en' ? 'Open Trenching' : 'Offener Tiefbau'}</div>
           </div>
           <div className="flex flex-col items-center">
-            <div className="font-mono text-4xl md:text-5xl font-black text-white tracking-tighter mb-2">160<span className="text-primary text-2xl">km</span></div>
+            <div className="font-mono text-4xl md:text-5xl font-black text-white tracking-tighter mb-2">160 <span className="text-primary text-2xl">km</span></div>
             <div className="text-xs font-bold uppercase tracking-widest text-white/50">{locale === 'en' ? 'HDD Drilling' : 'Spülbohrung'}</div>
           </div>
         </div>
diff --git a/content/de/home.mdx b/content/de/home.mdx
index c572a98f6..2f3f76aca 100644
--- a/content/de/home.mdx
+++ b/content/de/home.mdx
@@ -5,7 +5,7 @@ description: "Die E-TIB GmbH ist Ihr zuverlässiger Partner für komplexe Kabelt
 
 <HomeHero 
   
-  title={"Die Experten für\nKabeltiefbau"}
+  title={"Die Experten für\nKabelnetzbau"}
   description="Wir realisieren komplexe Versorgungsleitungen für eine moderne Gesellschaft. Verlässlich, innovativ und mit höchster Präzision im Kabeltiefbau und der Bohrtechnik."
   videoUrl="/assets/videos/web/hero-kabelpflug.mp4"
   linkText="Unsere Leistungen"