diff --git a/src/App.svelte b/src/App.svelte
index ad3c5f2..ef969a4 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -5,7 +5,7 @@
   import Footer from "./layout/Footer.svelte";
 </script>
 
-{#if $text.nav}
+{#if $text && Object.keys($text).length > 0}
   <Navbar />
   <Router {routes} />
   <Footer />
diff --git a/src/layout/Navbar.svelte b/src/layout/Navbar.svelte
index e6db472..8f9c88b 100644
--- a/src/layout/Navbar.svelte
+++ b/src/layout/Navbar.svelte
@@ -94,11 +94,12 @@
 </style>
 
 <Section className="text-white" background="off-black" padding="small">
+  {#if $text && Object.keys($text).length > 0}
   <div class="flex items-center justify-end">
     <!-- Desktop Navigation -->
     <nav class="z-10 hidden md:flex gap-4 justify-end text-xl">
         <Dropdown
-          name={$text.about}
+          name={$text.about || 'Meist'}
           buttonClass="rounded-[5px]"
           buttonHoverStyle="background-color:var(--orange); color:var(--black)"
           panelClassName="bg-[var(--off-black)]"
@@ -164,6 +165,7 @@
       <Menu size={32} />
     </Button>
   </div>
+  {/if}
 </Section>
 
 <!-- Full Screen Mobile Menu -->
@@ -295,4 +297,3 @@
     </Stack>
   </div>
 {/if}
-
diff --git a/src/lib/i18n.js b/src/lib/i18n.js
index 7e3bae7..5c757d1 100644
--- a/src/lib/i18n.js
+++ b/src/lib/i18n.js
@@ -31,10 +31,10 @@ async function loadTranslations(lang) {
         
         // Dynamically import all translation files for the specific language
         // Vite will code-split these and only bundle the ones actually used
-        const modules = import.meta.glob('/src/locales/*/*.json');
+        const modules = import.meta.glob('../locales/*/*.json');
         
         for (const path in modules) {
-            if (path.includes(`/locales/${lang}/`)) {
+            if (path.includes(`/locales/${lang}/`) || path.includes(`\\locales\\${lang}\\`)) {
                 const module = await modules[path]();
                 Object.assign(translations, module.default || module);
             }