diff --git a/components/ContactMap.tsx b/components/ContactMap.tsx
index b66041a87..044cbcfaf 100644
--- a/components/ContactMap.tsx
+++ b/components/ContactMap.tsx
@@ -13,11 +13,13 @@ const LeafletMap = dynamic(() => import('@/components/LeafletMap'), {
 });
 
 interface ContactMapProps {
-  address: string;
-  lat: number;
-  lng: number;
+  address?: string;
+  lat?: number;
+  lng?: number;
+  locations?: Array<{name: string, address: string, lat: number, lng: number}>;
 }
 
-export default function ContactMap({ address, lat, lng }: ContactMapProps) {
-  return <LeafletMap locations={[{ name: 'E-TIB Gruppe', address, lat, lng }]} />;
+export default function ContactMap({ address, lat, lng, locations }: ContactMapProps) {
+  const mapLocations = locations || (address && lat && lng ? [{ name: 'E-TIB Gruppe', address, lat, lng }] : []);
+  return <LeafletMap locations={mapLocations} />;
 }
diff --git a/components/blocks/ContactSection.tsx b/components/blocks/ContactSection.tsx
index d35b13b31..ca28ba92d 100644
--- a/components/blocks/ContactSection.tsx
+++ b/components/blocks/ContactSection.tsx
@@ -129,9 +129,10 @@ export const ContactSection: React.FC<ContactSectionProps> = (props) => {
             fallback={<div className="h-full w-full bg-neutral-medium animate-pulse" />}
           >
             <ContactMap
-              address="Gewerbestraße 22\n03172 Guben"
-              lat={51.9547}
-              lng={14.7214}
+              locations={[
+                { name: 'E-TIB GmbH (Hauptsitz)', address: 'Gewerbestraße 22\n03172 Guben', lat: 51.9547, lng: 14.7214 },
+                { name: 'E-TIB Bohrtechnik GmbH', address: 'Bahnhofstraße 180a\n99947 Kirchheilingen', lat: 51.1852, lng: 10.6865 }
+              ]}
             />
           </Suspense>
         </motion.section>
diff --git a/components/blocks/TeamGrid.tsx b/components/blocks/TeamGrid.tsx
index 6de364288..98f45f4c2 100644
--- a/components/blocks/TeamGrid.tsx
+++ b/components/blocks/TeamGrid.tsx
@@ -38,77 +38,8 @@ export function TeamGrid({ members }: TeamGridProps) {
           </p>
         </div>
 
-        {members.length > 0 && (
-          <div className="mb-20">
-            <motion.div
-              initial={{ opacity: 0, y: 30 }}
-              whileInView={{ opacity: 1, y: 0 }}
-              viewport={{ once: true }}
-              className="relative rounded-[2.5rem] bg-neutral-dark overflow-hidden shadow-2xl border border-white/10"
-            >
-              {/* Premium Background Effects */}
-              <div className="absolute inset-0 bg-[radial-gradient(circle_at_top_right,rgba(238,114,3,0.15),transparent_50%)] pointer-events-none" />
-              <div className="absolute top-0 right-0 w-[500px] h-[500px] bg-primary/20 blur-[120px] mix-blend-screen rounded-full pointer-events-none" />
-              <div className="absolute inset-0 opacity-20 pointer-events-none" style={{ backgroundImage: "url('data:image/svg+xml,%3Csvg width=\\'40\\' height=\\'40\\' viewBox=\\'0 0 40 40\\' xmlns=\\'http://www.w3.org/2000/svg\\'%3E%3Cpath d=\\'M0 0h40v40H0V0zm20 20h20v20H20V20zM0 20h20v20H0V20z\\' fill=\\'%23ffffff\\' fill-opacity=\\'0.02\\' fill-rule=\\'evenodd\\'/%3E%3C/svg%3E')" }} />
-
-              <div className="relative z-10 flex flex-col lg:flex-row items-center justify-between p-8 md:p-12 lg:p-20 gap-12 lg:gap-16">
-                {/* Text Content */}
-                <div className="w-full lg:w-[55%] flex flex-col justify-center text-white">
-                  <div className="inline-flex items-center space-x-2 px-4 py-1.5 mb-8 rounded-full border border-primary/30 bg-primary/10 text-primary text-xs font-bold uppercase tracking-widest self-start backdrop-blur-md shadow-[0_0_20px_rgba(238,114,3,0.2)]">
-                    <span className="relative flex h-2 w-2 mr-1">
-                      <span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-primary opacity-75"></span>
-                      <span className="relative inline-flex rounded-full h-2 w-2 bg-primary"></span>
-                    </span>
-                    {t('management')}
-                  </div>
-                  <h3 className="font-heading font-black text-5xl md:text-6xl lg:text-7xl mb-4 leading-[1.1] tracking-tight">
-                    {members[0].name}
-                  </h3>
-                  <p className="text-xl md:text-2xl text-white/70 font-medium mb-10 leading-relaxed max-w-xl">
-                    {members[0].position}
-                  </p>
-                  
-                  <div className="flex flex-col sm:flex-row gap-4">
-                    {members[0].email && (
-                      <a href={`mailto:${members[0].email}`} className="group flex items-center justify-center sm:justify-start gap-4 bg-white/5 hover:bg-primary border border-white/10 hover:border-primary px-6 py-4 rounded-2xl transition-all duration-300 shadow-lg">
-                        <svg className="w-5 h-5 text-white/70 group-hover:text-white transition-colors" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><path d="M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z"></path><polyline points="22,6 12,13 2,6"></polyline></svg>
-                        <span className="font-semibold text-white/90 group-hover:text-white transition-colors">{members[0].email}</span>
-                      </a>
-                    )}
-                    {members[0].phone && (
-                      <a href={`tel:${members[0].phone}`} className="group flex items-center justify-center sm:justify-start gap-4 bg-white/5 hover:bg-white/10 border border-white/10 px-6 py-4 rounded-2xl transition-all duration-300 shadow-lg">
-                        <svg className="w-5 h-5 text-white/70 group-hover:text-white transition-colors" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><path d="M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z"></path></svg>
-                        <span className="font-semibold text-white/90 group-hover:text-white transition-colors">{members[0].phone}</span>
-                      </a>
-                    )}
-                  </div>
-                </div>
-
-                {/* Premium Image Block */}
-                <div className="w-full lg:w-[45%] flex justify-center lg:justify-end perspective-1000">
-                  <div className="relative w-64 h-64 md:w-80 md:h-80 lg:w-[400px] lg:h-[400px] rounded-[3rem] overflow-hidden border-4 border-white/10 shadow-[0_30px_60px_rgba(0,0,0,0.6)] transform md:rotate-3 hover:rotate-0 transition-all duration-700 bg-neutral-800 group">
-                    {members[0].image && (typeof members[0].image === 'string' ? members[0].image : members[0].image.url) ? (
-                      <Image
-                        src={typeof members[0].image === 'string' ? members[0].image : members[0].image.url}
-                        alt={members[0].name}
-                        fill
-                        sizes="400px"
-                        className="object-cover scale-110 group-hover:scale-100 transition-transform duration-1000 ease-out"
-                      />
-                    ) : (
-                      <div className="absolute inset-0 flex items-center justify-center text-white/20">
-                        <svg className="w-20 h-20" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1"><path d="M19 21v-2a4 4 0 0 0-4-4H9a4 4 0 0 0-4 4v2"></path><circle cx="12" cy="7" r="4"></circle></svg>
-                      </div>
-                    )}
-                  </div>
-                </div>
-              </div>
-            </motion.div>
-          </div>
-        )}
-
         <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 xl:gap-10">
-          {members.slice(1).map((member, i) => (
+          {members.map((member, i) => (
             <motion.div
               key={member.id}
               initial={{ opacity: 0, y: 30 }}
diff --git a/content/de/team.mdx b/content/de/team.mdx
index 2cdc54267..86daf684e 100644
--- a/content/de/team.mdx
+++ b/content/de/team.mdx
@@ -42,7 +42,7 @@ layout: "fullBleed"
     {
       id: "martin-polan",
       name: "Martin Polan",
-      position: "Bauleitung",
+      position: "Bauleiter",
       email: "m.polan@e-tib.com",
       phone: "+49 171 3868167",
       image: "/assets/photos/team/martin.jpg"
diff --git a/content/en/team.mdx b/content/en/team.mdx
index 16919c586..0e7b0705d 100644
--- a/content/en/team.mdx
+++ b/content/en/team.mdx
@@ -42,7 +42,7 @@ layout: "fullBleed"
     {
       id: "martin-polan",
       name: "Martin Polan",
-      position: "Site Management",
+      position: "Site Manager",
       email: "m.polan@e-tib.com",
       phone: "+49 171 3868167",
       image: "/assets/photos/team/martin.jpg"
diff --git a/lib/map-data.ts b/lib/map-data.ts
index 964817c5b..37700bd15 100644
--- a/lib/map-data.ts
+++ b/lib/map-data.ts
@@ -27,6 +27,7 @@ export const defaultLocations: Location[] = [
     x: 52,
     y: 55,
     description: 'E-TIB Bohrtechnik GmbH',
+    href: '/bohrtechnik',
     details: ['Horizontalspülbohrungen', 'Bahnhofstraße 180a', '99947 Kirchheilingen'],
   },
   {