diff --git a/apps/website/layouts/partials/navbar.html b/apps/website/layouts/partials/navbar.html
index 569c044..d574ee3 100644
--- a/apps/website/layouts/partials/navbar.html
+++ b/apps/website/layouts/partials/navbar.html
@@ -1,6 +1,6 @@
 <nav class="fixed top-0 left-0 z-50 w-full border-b border-neutral-200 backdrop-blur-sm dark:border-neutral-800 bg-white/50 dark:bg-black/50">
   <div class="mx-auto flex h-20 max-w-7xl items-center justify-between px-6 lg:px-12">
-    <a href="{{ "/" | absURL }}" class="flex items-center gap-3">
+    <a href="{{ .Site.Home.RelPermalink }}" class="flex items-center gap-3">
       <div class="h-2 w-2 rounded-full bg-black dark:bg-white"></div>
       <span class="font-mono text-lg font-bold tracking-tight dark:text-white">VISOMI.DEV</span>
     </a>
@@ -8,28 +8,28 @@
     <!-- Desktop Navigation Links -->
     <div class="hidden items-center gap-8 font-mono tracking-widest text-gray-500 md:flex dark:text-gray-400">
       <a
-        href="{{ "/" | absURL }}"
-        class="transition-colors hover:text-black dark:hover:text-white {{ if eq .Page.RelPermalink "/" }}text-black dark:text-white{{ end }}"
+        href="{{ .Site.Home.RelPermalink }}"
+        class="transition-colors hover:text-black dark:hover:text-white {{ if .IsHome }}text-black dark:text-white{{ end }}"
         >{{ i18n "navHome" }}</a
       >
       <a
-        href="{{ "journey" | absURL }}"
-        class="transition-colors hover:text-black dark:hover:text-white {{ if in .Page.RelPermalink "/journey" }}text-black dark:text-white{{ end }}"
+        href="{{ "journey" | relLangURL }}"
+        class="transition-colors hover:text-black dark:hover:text-white {{ if eq .Section "journey" }}text-black dark:text-white{{ end }}"
         >{{ i18n "navJourney" }}</a
       >
       <a
-        href="{{ "projects" | absURL }}"
-        class="transition-colors hover:text-black dark:hover:text-white {{ if in .Page.RelPermalink "/projects" }}text-black dark:text-white{{ end }}"
+        href="{{ "projects" | relLangURL }}"
+        class="transition-colors hover:text-black dark:hover:text-white {{ if eq .Section "projects" }}text-black dark:text-white{{ end }}"
         >{{ i18n "navProjects" }}</a
       >
       <a
-        href="{{ "resume" | absURL }}"
-        class="transition-colors hover:text-black dark:hover:text-white {{ if in .Page.RelPermalink "/resume" }}text-black dark:text-white{{ end }}"
+        href="{{ "resume" | relLangURL }}"
+        class="transition-colors hover:text-black dark:hover:text-white {{ if eq .Section "resume" }}text-black dark:text-white{{ end }}"
         >{{ i18n "navResume" }}</a
       >
       <a
-        href="{{ "contact" | absURL }}"
-        class="transition-colors hover:text-black dark:hover:text-white {{ if in .Page.RelPermalink "/contact" }}text-black dark:text-white{{ end }}"
+        href="{{ "contact" | relLangURL }}"
+        class="transition-colors hover:text-black dark:hover:text-white {{ if eq .Section "contact" }}text-black dark:text-white{{ end }}"
         >{{ i18n "navContact" }}</a
       >
     </div>
@@ -59,11 +59,11 @@
   <!-- Mobile Menu -->
   <div id="mobile-menu" class="hidden md:hidden bg-white/95 dark:bg-black/95 backdrop-blur-md border-t border-neutral-200 dark:border-neutral-800">
     <div class="px-6 py-6 space-y-4 font-mono tracking-widest flex flex-col">
-      <a href="{{ "/" | absURL }}" class="text-neutral-600 dark:text-neutral-400 hover:text-black dark:hover:text-white py-2 {{ if eq .Page.RelPermalink "/" }}text-black font-bold dark:text-white{{ end }}">{{ i18n "navHome" }}</a>
-      <a href="{{ "journey" | absURL }}" class="text-neutral-600 dark:text-neutral-400 hover:text-black dark:hover:text-white py-2 {{ if in .Page.RelPermalink "/journey" }}text-black font-bold dark:text-white{{ end }}">{{ i18n "navJourney" }}</a>
-      <a href="{{ "projects" | absURL }}" class="text-neutral-600 dark:text-neutral-400 hover:text-black dark:hover:text-white py-2 {{ if in .Page.RelPermalink "/projects" }}text-black font-bold dark:text-white{{ end }}">{{ i18n "navProjects" }}</a>
-      <a href="{{ "resume" | absURL }}" class="text-neutral-600 dark:text-neutral-400 hover:text-black dark:hover:text-white py-2 {{ if in .Page.RelPermalink "/resume" }}text-black font-bold dark:text-white{{ end }}">{{ i18n "navResume" }}</a>
-      <a href="{{ "contact" | absURL }}" class="text-neutral-600 dark:text-neutral-400 hover:text-black dark:hover:text-white py-2 {{ if in .Page.RelPermalink "/contact" }}text-black font-bold dark:text-white{{ end }}">{{ i18n "navContact" }}</a>
+      <a href="{{ .Site.Home.RelPermalink }}" class="text-neutral-600 dark:text-neutral-400 hover:text-black dark:hover:text-white py-2 {{ if .IsHome }}text-black font-bold dark:text-white{{ end }}">{{ i18n "navHome" }}</a>
+      <a href="{{ "journey" | relLangURL }}" class="text-neutral-600 dark:text-neutral-400 hover:text-black dark:hover:text-white py-2 {{ if eq .Section "journey" }}text-black font-bold dark:text-white{{ end }}">{{ i18n "navJourney" }}</a>
+      <a href="{{ "projects" | relLangURL }}" class="text-neutral-600 dark:text-neutral-400 hover:text-black dark:hover:text-white py-2 {{ if eq .Section "projects" }}text-black font-bold dark:text-white{{ end }}">{{ i18n "navProjects" }}</a>
+      <a href="{{ "resume" | relLangURL }}" class="text-neutral-600 dark:text-neutral-400 hover:text-black dark:hover:text-white py-2 {{ if eq .Section "resume" }}text-black font-bold dark:text-white{{ end }}">{{ i18n "navResume" }}</a>
+      <a href="{{ "contact" | relLangURL }}" class="text-neutral-600 dark:text-neutral-400 hover:text-black dark:hover:text-white py-2 {{ if eq .Section "contact" }}text-black font-bold dark:text-white{{ end }}">{{ i18n "navContact" }}</a>
     </div>
   </div>
   
diff --git a/apps/website/layouts/shortcodes/hero.html b/apps/website/layouts/shortcodes/hero.html
index 02e8567..9071a34 100644
--- a/apps/website/layouts/shortcodes/hero.html
+++ b/apps/website/layouts/shortcodes/hero.html
@@ -15,12 +15,11 @@
     </div>
 
     <h1
-      class="text-5xl leading-[1.1] font-bold tracking-tight text-neutral-900 md:text-7xl lg:text-8xl dark:text-white"
+      class="text-4xl leading-tight font-bold tracking-tight text-neutral-900 sm:text-5xl md:text-7xl md:leading-[1.1] lg:text-8xl dark:text-white"
     >
-      <span>{{ i18n "homeHeroTitleLine1" }}</span>
-      <br class="hidden md:block" />
+      <span class="block">{{ i18n "homeHeroTitleLine1" }}</span>
       <span
-        class="bg-linear-to-r from-neutral-900 to-neutral-500 bg-clip-text text-transparent dark:from-white dark:to-neutral-500"
+        class="block bg-linear-to-r from-neutral-900 to-neutral-500 bg-clip-text text-transparent dark:from-white dark:to-neutral-500"
       >
         {{ i18n "homeHeroTitleLine2" }}
       </span>
@@ -42,7 +41,7 @@
       </a>
       <a
         class="border-border-light dark:border-border-dark rounded-full border bg-white px-8 py-3 font-medium text-neutral-900 shadow-sm transition-all hover:border-neutral-400/30 hover:bg-neutral-100 dark:bg-neutral-900 dark:text-white dark:hover:border-neutral-600 dark:hover:bg-neutral-800"
-        href="{{ "resume" | relURL }}"
+        href="{{ "resume" | relLangURL }}"
       >
         {{ i18n "homeHeroCtaCv" }}
       </a>