diff --git a/site/snippets/hero.php b/site/snippets/hero.php
index aaff055..87de34a 100644
--- a/site/snippets/hero.php
+++ b/site/snippets/hero.php
@@ -15,7 +15,7 @@
             <!-- Linke Spalte - Text -->
             <div class="w-full lg:w-1/2">
                 <div class="prose prose-invert">
-                    <h2 class="text-4xl font-bold text-sf_blau-500 mb-6">Ihr Titel</h2>
+                    <h2 class="text-4xl font-bold text-sf_blau-500 mb-6"><?= $page->title() ?></h2>
                     <p class="text-lg text-white">
                         Ihr Text kommt hier. Lorem ipsum dolor sit amet, consectetur
                         adipiscing elit.
diff --git a/site/snippets/navbar.php b/site/snippets/navbar.php
index ce0366a..49f3cdf 100644
--- a/site/snippets/navbar.php
+++ b/site/snippets/navbar.php
@@ -39,8 +39,8 @@
       <!-- Desktop Menu (Mitte) -->
       <div class="hidden md:block">
         <div class="flex items-baseline space-x-4">
-          <!-- Einfacher Menüpunkt --><a href="index.html" class="font-bold px-3 py-2 rounded-md text-base text-gray-700 transition-colors hover:text-blue-600">Home</a>
-          <!-- Einfacher Menüpunkt --><a href="news.html" class="font-bold px-3 py-2 rounded-md text-base text-gray-700 transition-colors hover:text-blue-600">News</a>
+          <!-- Einfacher Menüpunkt --><a href="/" class="font-bold px-3 py-2 rounded-md text-base text-gray-700 transition-colors hover:text-blue-600">Home</a>
+          <!-- Einfacher Menüpunkt --><a href="/news" class="font-bold px-3 py-2 rounded-md text-base text-gray-700 transition-colors hover:text-blue-600">News</a>
           <!-- Dropdown Menü 1 -->
           <div class="group relative">
             <button class="flex font-bold items-center px-3 py-2 rounded-md text-base text-gray-700 transition-colors hover:text-blue-600">
@@ -66,16 +66,16 @@
             </button>
             <div class="invisible absolute left-0 z-10 mt-2 w-48 rounded-md bg-white opacity-0 shadow-lg transition-all duration-200 group-hover:visible group-hover:opacity-100">
               <div class="py-1">
-                <a href="verein/mitgliedschaft.html" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">Mitgliedschaft</a>
-                <a href="verein/vorstand.html" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">Vorstand</a>
-                <a href="verein/dwz.html" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">DWZ-Liste</a>
-                <a href="verein/chronik.html" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">Chronik</a>
-                <a href="verein/gedenken.html" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">In Memoriam</a>
+                <a href="/verein/mitgliedschaft" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">Mitgliedschaft</a>
+                <a href="/verein/vorstand" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">Vorstand</a>
+                <a href="/verein/dwz" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">DWZ-Liste</a>
+                <a href="/verein/chronik" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">Chronik</a>
+                <a href="/verein/memoriam" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">In Memoriam</a>
               </div>
             </div>
           </div>
-          <!-- Einfacher Menüpunkt --><a href="termine.html" class="font-bold px-3 py-2 rounded-md text-base text-gray-700 transition-colors hover:text-blue-600">Termine</a>
-          <!-- Einfacher Menüpunkt --><a href="kontakt.html" class="font-bold px-3 py-2 rounded-md text-base text-gray-700 transition-colors hover:text-blue-600">Kontakt</a>
+          <!-- Einfacher Menüpunkt --><a href="/termine" class="font-bold px-3 py-2 rounded-md text-base text-gray-700 transition-colors hover:text-blue-600">Termine</a>
+          <!-- Einfacher Menüpunkt --><a href="/kontakt" class="font-bold px-3 py-2 rounded-md text-base text-gray-700 transition-colors hover:text-blue-600">Kontakt</a>
         </div>
       </div>
       <!-- Social Media Icons (Rechts) - Nur Desktop -->
@@ -106,10 +106,10 @@
   <!-- Mobile Menu -->
   <div id="mobile-menu" class="hidden md:hidden">
     <div class="space-y-1 border-t bg-white px-2 pt-2 pb-3 sm:px-3">
+      <!-- Einfacher Menüpunkt  -->
+      <a href="/" class="block rounded-md px-3 py-2 text-base font-medium text-gray-700 hover:text-blue-600">Home</a>
       <!-- Einfacher Menüpunkt -->
-      <a href="index.html" class="block rounded-md px-3 py-2 text-base font-medium text-gray-700 hover:text-blue-600">Home</a>
-      <!-- Einfacher Menüpunkt -->
-      <a href="news.html" class="block rounded-md px-3 py-2 text-base font-medium text-gray-700 hover:text-blue-600">News</a>
+      <a href="/news" class="block rounded-md px-3 py-2 text-base font-medium text-gray-700 hover:text-blue-600">News</a>
       <!-- Mobile Dropdown 1 -->
       <div class="relative">
         <button class="mobile-dropdown-btn flex w-full items-center justify-between rounded-md px-3 py-2 text-left text-base font-medium text-gray-700 hover:text-blue-600">
@@ -132,16 +132,16 @@
           </svg>
         </button>
         <div class="mobile-dropdown-content hidden space-y-1 pl-6">
-          <a href="verein/mitgliedschaft.html" class="block px-3 py-2 text-sm text-gray-600 hover:text-blue-600">Mitgliedschaft</a>
-          <a href="verein/vorstand.html" class="block px-3 py-2 text-sm text-gray-600 hover:text-blue-600">Vorstand</a>
-          <a href="verein/dwz.html" class="block px-3 py-2 text-sm text-gray-600 hover:text-blue-600">DWZ-Liste</a>
-          <a href="verein/chronik.html" class="block px-3 py-2 text-sm text-gray-600 hover:text-blue-600">Chronik</a>
-          <a href="verein/gedenken.html" class="block px-3 py-2 text-sm text-gray-600 hover:text-blue-600">In Memoriam</a>
+          <a href="/verein/mitgliedschaft" class="block px-3 py-2 text-sm text-gray-600 hover:text-blue-600">Mitgliedschaft</a>
+          <a href="/verein/vorstand" class="block px-3 py-2 text-sm text-gray-600 hover:text-blue-600">Vorstand</a>
+          <a href="/verein/dwz" class="block px-3 py-2 text-sm text-gray-600 hover:text-blue-600">DWZ-Liste</a>
+          <a href="/verein/chronik" class="block px-3 py-2 text-sm text-gray-600 hover:text-blue-600">Chronik</a>
+          <a href="/verein/memoriam" class="block px-3 py-2 text-sm text-gray-600 hover:text-blue-600">In Memoriam</a>
         </div>
       </div>
       <!-- Einfache Menüpunkte -->
-      <a href="termine.html" class="block rounded-md px-3 py-2 text-base font-medium text-gray-700 hover:text-blue-600">Termine</a>
-      <a href="kontakt.html" class="block rounded-md px-3 py-2 text-base font-medium text-gray-700 hover:text-blue-600">Kontakt</a>
+      <a href="/termine" class="block rounded-md px-3 py-2 text-base font-medium text-gray-700 hover:text-blue-600">Termine</a>
+      <a href="/kontakt" class="block rounded-md px-3 py-2 text-base font-medium text-gray-700 hover:text-blue-600">Kontakt</a>
       <!-- Social Media Icons im Mobile Menu -->
       <div class="mt-4 border-t pt-4">
         <div class="px-3 py-2">