diff --git a/app/[locale]/referenzen/page.tsx b/app/[locale]/referenzen/page.tsx
index a3960b215..8bcc0ee6f 100644
--- a/app/[locale]/referenzen/page.tsx
+++ b/app/[locale]/referenzen/page.tsx
@@ -158,8 +158,8 @@ export default async function ReferenzenOverview(props: { params: Promise<{ loca
         <div className="mt-24 p-8 md:p-12 bg-primary-dark rounded-3xl text-white shadow-2xl relative overflow-hidden group">
           <div className="absolute top-0 right-0 w-64 h-full bg-accent/5 -skew-x-12 translate-x-1/2 transition-transform group-hover:translate-x-1/3" />
           <div className="relative z-10 max-w-2xl">
-            <h3 className="text-2xl md:text-3xl font-bold mb-4">Ihr nächstes Projekt?</h3>
-            <p className="text-lg text-white/70 mb-8">Lassen Sie uns gemeinsam herausragende Infrastruktur bauen.</p>
+            <h3 className="text-2xl md:text-3xl font-bold mb-4">{t('nextProjectTitle')}</h3>
+            <p className="text-lg text-white/70 mb-8">{t('nextProjectDesc')}</p>
             <TrackedLink
               href={`/${locale}/${locale === 'de' ? 'kontakt' : 'contact'}`}
               className={getButtonClasses('accent', 'lg')}
diff --git a/components/blocks/CertificatesBlock.tsx b/components/blocks/CertificatesBlock.tsx
index 0616677de..8e83d023b 100644
--- a/components/blocks/CertificatesBlock.tsx
+++ b/components/blocks/CertificatesBlock.tsx
@@ -147,7 +147,7 @@ export function CertificatesBlock({ badge, title, description, certificates = de
             return (
               <motion.a
                 key={index}
-                href={cert.pdfUrl}
+                href={encodeURI(cert.pdfUrl)}
                 target="_blank"
                 rel="noopener noreferrer"
                 variants={itemVariants}
diff --git a/components/layout/Footer.tsx b/components/layout/Footer.tsx
index 9565f26c7..c504987b1 100644
--- a/components/layout/Footer.tsx
+++ b/components/layout/Footer.tsx
@@ -104,12 +104,12 @@ export function Footer({ companyInfo }: FooterProps) {
             </h4>
             <ul className="space-y-2 md:space-y-4 relative z-10 flex-grow">
               {[
-                { label: locale === 'de' ? 'Kompetenzen' : 'Competencies', href: `/${locale}/kompetenzen` },
-                { label: locale === 'de' ? 'Über uns' : 'About us', href: `/${locale}/ueber-uns` },
+                { label: locale === 'de' ? 'Kompetenzen' : 'Competencies', href: `/${locale}/${locale === 'de' ? 'kompetenzen' : 'competencies'}` },
+                { label: locale === 'de' ? 'Über uns' : 'About us', href: `/${locale}/${locale === 'de' ? 'ueber-uns' : 'about-us'}` },
                 { label: locale === 'de' ? 'Unser Team' : 'Our Team', href: `/${locale}/team` },
                 { label: locale === 'de' ? 'Zertifikate' : 'Certificates', href: `/${locale}/zertifikate` },
-                { label: locale === 'de' ? 'Karriere' : 'Career', href: `/${locale}/karriere` },
-                { label: locale === 'de' ? 'Messen & Events' : 'Fairs & Events', href: `/${locale}/messen` },
+                { label: locale === 'de' ? 'Karriere' : 'Career', href: `/${locale}/${locale === 'de' ? 'karriere' : 'career'}` },
+                { label: locale === 'de' ? 'Messen & Events' : 'Fairs & Events', href: `/${locale}/${locale === 'de' ? 'messen' : 'trade-fairs'}` },
                 { label: locale === 'de' ? 'Kontakt' : 'Contact', href: `/${locale}/${locale === 'de' ? 'kontakt' : 'contact'}` },
               ].map((link) => (
                 <li key={link.href}>
@@ -131,8 +131,8 @@ export function Footer({ companyInfo }: FooterProps) {
             </h4>
             <ul className="space-y-2 md:space-y-4 relative z-10 flex-grow">
               {[
-                { label: locale === 'de' ? 'Impressum' : 'Imprint', href: `/${locale}/impressum` },
-                { label: locale === 'de' ? 'Datenschutz' : 'Privacy Policy', href: `/${locale}/datenschutz` },
+                { label: locale === 'de' ? 'Impressum' : 'Imprint', href: `/${locale}/${locale === 'de' ? 'impressum' : 'imprint'}` },
+                { label: locale === 'de' ? 'Datenschutz' : 'Privacy Policy', href: `/${locale}/${locale === 'de' ? 'datenschutz' : 'privacy-policy'}` },
                 { label: locale === 'de' ? 'AGB' : 'Terms', href: `/${locale}/${locale === 'de' ? 'agb' : 'terms'}` },
               ].map((link) => (
                 <li key={link.href}>
diff --git a/content/de/messen.mdx b/content/de/messen.mdx
index 96f888f29..59e3d1160 100644
--- a/content/de/messen.mdx
+++ b/content/de/messen.mdx
@@ -19,8 +19,8 @@ layout: "fullBleed"
     showFairs={true} 
     showJobs={false} 
     fairs={[
-      { name: 'Intersolar München', date: '2024 / 2025', type: 'Messe', location: 'München' },
-      { name: 'Windenergietage Linstow', date: '2024 / 2025', type: 'Fachkongress', location: 'Linstow' },
+      { name: 'Intersolar München', date: '2024 / 2025', type: 'Messe', location: 'München', url: 'https://www.intersolar.de/' },
+      { name: 'Windenergietage Linstow', date: '2024 / 2025', type: 'Fachkongress', location: 'Linstow', url: 'https://www.windenergietage.de/' },
       { name: 'Kabel-Workshop Wiesbaden', date: '2024 / 2025', type: 'Fachmesse', location: 'Wiesbaden' }
     ]}
   />
diff --git a/content/en/messen.mdx b/content/en/messen.mdx
index cc1ec7396..eaf889ff0 100644
--- a/content/en/messen.mdx
+++ b/content/en/messen.mdx
@@ -19,8 +19,8 @@ layout: "fullBleed"
     showFairs={true} 
     showJobs={false} 
     fairs={[
-      { name: 'Intersolar Munich', date: '2024 / 2025', type: 'Fair', location: 'Munich' },
-      { name: 'Wind Energy Days Linstow', date: '2024 / 2025', type: 'Specialist Congress', location: 'Linstow' },
+      { name: 'Intersolar Munich', date: '2024 / 2025', type: 'Fair', location: 'Munich', url: 'https://www.intersolar.de/' },
+      { name: 'Wind Energy Days Linstow', date: '2024 / 2025', type: 'Specialist Congress', location: 'Linstow', url: 'https://www.windenergietage.de/' },
       { name: 'Cable Workshop Wiesbaden', date: '2024 / 2025', type: 'Trade Fair', location: 'Wiesbaden' }
     ]}
   />
diff --git a/messages/de.json b/messages/de.json
index 251bccd5c..d30e47ec9 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -157,7 +157,9 @@
     "overview": "Übersicht",
     "needHelp": "Brauchen Sie Unterstützung?",
     "supportTeamAvailable": "Unser Expertenteam steht Ihnen für alle Fragen rund um Ihr Infrastrukturprojekt zur Verfügung.",
-    "contactUs": "Kontaktieren Sie uns"
+    "contactUs": "Kontaktieren Sie uns",
+    "nextProjectTitle": "Ihr nächstes Projekt?",
+    "nextProjectDesc": "Lassen Sie uns gemeinsam herausragende Infrastruktur bauen."
   },
   "Error": {
     "title": "Hoppla!",
diff --git a/messages/en.json b/messages/en.json
index edb1cbb8e..55d746d43 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -157,7 +157,9 @@
     "overview": "Overview",
     "needHelp": "Need support?",
     "supportTeamAvailable": "Our team of experts is available to answer all your questions regarding your infrastructure project.",
-    "contactUs": "Contact Us"
+    "contactUs": "Contact Us",
+    "nextProjectTitle": "Your next project?",
+    "nextProjectDesc": "Let's build outstanding infrastructure together."
   },
   "Error": {
     "title": "Oops!",
diff --git a/scratch/test-slugs.ts b/scratch/test-slugs.ts
new file mode 100644
index 000000000..ecd430b3b
--- /dev/null
+++ b/scratch/test-slugs.ts
@@ -0,0 +1,6 @@
+import { mapSlugToFileSlug } from '../lib/slugs';
+async function test() {
+  const result = await mapSlugToFileSlug('imprint', 'en');
+  console.log("imprint maps to:", result);
+}
+test();