diff --git a/components/blocks/InteractiveGermanyMap.tsx b/components/blocks/InteractiveGermanyMap.tsx
index 9083c3dfd..eba223ae8 100644
--- a/components/blocks/InteractiveGermanyMap.tsx
+++ b/components/blocks/InteractiveGermanyMap.tsx
@@ -4,7 +4,7 @@ import React, { useState } from 'react';
 import { motion, AnimatePresence } from 'framer-motion';
 import { MapPin, Factory, Zap, CheckCircle2, ArrowUpRight } from 'lucide-react';
 import Image from 'next/image';
-
+import { useRouter, usePathname } from 'next/navigation';
 import Link from 'next/link';
 import { AnimatedGlossyBorder } from '@/components/ui/AnimatedGlossyBorder';
 import { Location, defaultLocations, minorLocations, projectLocations } from '@/lib/map-data';
@@ -52,7 +52,8 @@ export function InteractiveGermanyMap({
     setHoverTimeout(timeout);
   };
 
-
+  const router = useRouter();
+  const pathname = usePathname();
   const locale = useLocale();
   const t = useTranslations('InteractiveGermanyMap');
   const tStandard = useTranslations('StandardPage');
@@ -81,10 +82,10 @@ export function InteractiveGermanyMap({
   }, [locations, hideStandorte]);
 
   return (
-    <div 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 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 (disabled in hero due to performance lag on 100vw) */}
-        {!isHero && <AnimatedGlossyBorder opacity={0.7} className="z-30" />}
+        {/* Animated Border Glow */}
+        <AnimatedGlossyBorder opacity={0.7} className="z-30" disableAnimation={isHero} />
         
         {/* 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`}>
diff --git a/components/layout/Footer.tsx b/components/layout/Footer.tsx
index 61b0578dc..b1e4d3ece 100644
--- a/components/layout/Footer.tsx
+++ b/components/layout/Footer.tsx
@@ -19,7 +19,7 @@ export function Footer({ companyInfo }: FooterProps) {
   const locale = useLocale();
 
   return (
-    <footer className="bg-[#050B14] text-neutral-light pt-40 pb-10 md:pt-16 md:pb-16 relative overflow-hidden border-t border-white/5">
+    <footer className="bg-[#050B14] text-neutral-light pt-40 pb-10 md:pt-40 md:pb-16 relative overflow-hidden border-t border-white/5">
       {/* Subtle background tech grid */}
       <div className="absolute inset-0 bg-[linear-gradient(to_right,#8080800a_1px,transparent_1px),linear-gradient(to_bottom,#8080800a_1px,transparent_1px)] bg-[size:32px_32px] [mask-image:radial-gradient(ellipse_80%_50%_at_50%_0%,#000_70%,transparent_100%)] pointer-events-none" />
 
diff --git a/components/ui/AnimatedGlossyBorder.tsx b/components/ui/AnimatedGlossyBorder.tsx
index f9be55dca..4532519ce 100644
--- a/components/ui/AnimatedGlossyBorder.tsx
+++ b/components/ui/AnimatedGlossyBorder.tsx
@@ -6,12 +6,14 @@ interface AnimatedGlossyBorderProps {
   borderWidth?: 1 | 2;
   opacity?: number;
   color?: 'white' | 'primary';
+  disableAnimation?: boolean;
 }
 
 export function AnimatedGlossyBorder({ 
   className, 
   borderWidth = 1,
-  color = 'white'
+  color = 'white',
+  disableAnimation = false
 }: AnimatedGlossyBorderProps) {
   const isWhite = color === 'white';
   const glowColor = isWhite ? 'rgba(255,255,255,0.6)' : 'rgba(17,124,97,0.6)';
@@ -35,7 +37,10 @@ export function AnimatedGlossyBorder({
         }}
       >
         <div 
-          className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-[250%] aspect-square animate-[spin_8s_linear_infinite]"
+          className={cn(
+            "absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-[250%] aspect-square",
+            !disableAnimation && "animate-[spin_8s_linear_infinite]"
+          )}
           style={{
             background: `conic-gradient(from 0deg, ${gradientColors})`
           }}