diff --git a/composer.lock b/composer.lock
index f7cfba8..1b634ad 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4503,16 +4503,16 @@
         },
         {
             "name": "phiki/phiki",
-            "version": "v2.0.2",
+            "version": "v2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phikiphp/phiki.git",
-                "reference": "6d735108238c03daaaef571448d8dee8187cab5e"
+                "reference": "fe51fe6dc31856cd776fd1b04ee74053a4271644"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phikiphp/phiki/zipball/6d735108238c03daaaef571448d8dee8187cab5e",
-                "reference": "6d735108238c03daaaef571448d8dee8187cab5e",
+                "url": "https://api.github.com/repos/phikiphp/phiki/zipball/fe51fe6dc31856cd776fd1b04ee74053a4271644",
+                "reference": "fe51fe6dc31856cd776fd1b04ee74053a4271644",
                 "shasum": ""
             },
             "require": {
@@ -4558,7 +4558,7 @@
             "description": "Syntax highlighting using TextMate grammars in PHP.",
             "support": {
                 "issues": "https://github.com/phikiphp/phiki/issues",
-                "source": "https://github.com/phikiphp/phiki/tree/v2.0.2"
+                "source": "https://github.com/phikiphp/phiki/tree/v2.0.3"
             },
             "funding": [
                 {
@@ -4570,7 +4570,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2025-09-17T18:32:40+00:00"
+            "time": "2025-09-19T11:50:41+00:00"
         },
         {
             "name": "phpoption/phpoption",
@@ -9577,16 +9577,16 @@
         },
         {
             "name": "laravel/pint",
-            "version": "v1.25.0",
+            "version": "v1.25.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/pint.git",
-                "reference": "595de38458c6b0ab4cae4bcc769c2e5c5d5b8e96"
+                "reference": "5016e263f95d97670d71b9a987bd8996ade6d8d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/595de38458c6b0ab4cae4bcc769c2e5c5d5b8e96",
-                "reference": "595de38458c6b0ab4cae4bcc769c2e5c5d5b8e96",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/5016e263f95d97670d71b9a987bd8996ade6d8d9",
+                "reference": "5016e263f95d97670d71b9a987bd8996ade6d8d9",
                 "shasum": ""
             },
             "require": {
@@ -9639,7 +9639,7 @@
                 "issues": "https://github.com/laravel/pint/issues",
                 "source": "https://github.com/laravel/pint"
             },
-            "time": "2025-09-17T01:36:44+00:00"
+            "time": "2025-09-19T02:57:12+00:00"
         },
         {
             "name": "laravel/sail",
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index ed548ab..70039c7 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -27,17 +27,19 @@
     </script>
 </head>
 
-<body class="fi-body fi-panel-admin bg-cover" style="background-image: url('images/backgrounds/bg1.jpg')">
+<body class="bg-cover" style="background-image: url('images/backgrounds/bg1.jpg')">
     <div>
         @livewire('notifications')
     </div>
 
+    @include('layouts.nav')
+
+    <br>
+    <br>
     <div class="fi-simple-layout">
         <main class="fi-simple-main fi-width-5xl shadow-2xl bg-white/80 dark:bg-gray-900/90">
             <div class="bg-cover bg-position-[center_top_3.8rem]">
 
-                @include('layouts.nav')
-
                 @yield('content')
 
             </div>
diff --git a/resources/views/layouts/logo.blade.php b/resources/views/layouts/logo.blade.php
index c3564ec..a78445e 100644
--- a/resources/views/layouts/logo.blade.php
+++ b/resources/views/layouts/logo.blade.php
@@ -10,7 +10,7 @@
                 <circle cx="12" cy="5" r="2" />
             </svg>
         </div>
-        <div class="text-4xl leading-none font-black  text-shadow-md dark:text-shadow-none">
+        <div class="text-2xl leading-none font-black tracking-tighter text-shadow-md dark:text-shadow-none">
             nutzwerte.at
             <div class="text-xs font-light tracking-tight">Software für Architekten</div>
         </div>
diff --git a/resources/views/layouts/nav-simple.blade.php b/resources/views/layouts/nav-simple.blade.php
deleted file mode 100644
index 564c524..0000000
--- a/resources/views/layouts/nav-simple.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<nav>
-    <div class="flex text-xs justify-center bg-gray-900 dark:bg-300-900 rounded mb-10">
-        <a class="px-5 py-1.5 text-gray-200 hover:bg-primary-500 dark:hover:text-gray-300 rounded" href="/">Home</a>
-        <a class="px-5 py-1.5 text-gray-200 hover:bg-primary-500 dark:hover:text-gray-300 rounded" href="/nutzwerte">Über
-            Nutzwerte</a>
-        <a class="px-5 py-1.5 text-gray-200 hover:bg-primary-500 dark:hover:text-gray-300 rounded"
-            href="/dieses-programm">Über dieses
-            Programm</a>
-        <a class="px-5 py-1.5 text-gray-200 hover:bg-primary-500 dark:hover:text-gray-300 rounded"
-            href="/impressum">Impressum</a>
-    </div>
-</nav>
diff --git a/resources/views/layouts/nav.blade.php b/resources/views/layouts/nav.blade.php
index de345c1..1fbc280 100644
--- a/resources/views/layouts/nav.blade.php
+++ b/resources/views/layouts/nav.blade.php
@@ -1,35 +1,31 @@
-<nav class="fi-topbar mb-10">
-    <div class="fi-topbar-start">
-
-        <a href="http://nutzwerte_fi4.test/app">
-        </a>
-        <div style="height: 2.6rem;" class="fi-logo"><a href="http://nutzwerte_fi4.test/app">
-            </a><a class="flex gap-1 justify-center" href="/">
-                <div class="w-9 pt-1">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor"
-                        stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                        <path d="m12.99 6.74 1.93 3.44"></path>
-                        <path d="M19.136 12a10 10 0 0 1-14.271 0"></path>
-                        <path d="m21 21-2.16-3.84"></path>
-                        <path d="m3 21 8.02-14.26"></path>
-                        <circle cx="12" cy="5" r="2"></circle>
-                    </svg>
-                </div>
-                <div class="text-2xl leading-none font-black tracking-tighter text-shadow-md dark:text-shadow-none">
-                    nutzwerte.at
-                    <div class="text-xs font-light">Software für Architekten</div>
-                </div>
-            </a>
+<nav class="fi-topbar fixed top-0 grid grid-cols-2 w-full">
+    <div class="fi-logo flex gap-1">
+        <div class="w-9 pt-1">
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
+                stroke-linecap="round" stroke-linejoin="round">
+                <path d="m12.99 6.74 1.93 3.44"></path>
+                <path d="M19.136 12a10 10 0 0 1-14.271 0"></path>
+                <path d="m21 21-2.16-3.84"></path>
+                <path d="m3 21 8.02-14.26"></path>
+                <circle cx="12" cy="5" r="2"></circle>
+            </svg>
+        </div>
+        <div class="text-2xl leading-none font-black tracking-tighter text-shadow-md dark:text-shadow-none">
+            nutzwerte.at
+            <div class="text-xs font-light">Software für Architekten</div>
         </div>
     </div>
 
 
-    <div x-persist="topbar.end.panel-admin" class="fi-topbar-end">
+    <div class="grid grid-flow-col gap-3">
+        <x-filament::button href="/" tag="a" color="gray">
+            Home
+        </x-filament::button>
         <x-filament::button href="/nutzwerte" tag="a" color="gray">
-            Über Nutzwerte
+            Nutzwerte
         </x-filament::button>
         <x-filament::button href="/dieses-programm" tag="a" color="gray">
-            Dieses Programm
+            Programm
         </x-filament::button>
         <x-filament::button href="/impressum" tag="a" color="gray">
             Impressum
diff --git a/resources/views/pages/dieses-programm.blade.php b/resources/views/pages/dieses-programm.blade.php
index 0dfec14..3f40de9 100644
--- a/resources/views/pages/dieses-programm.blade.php
+++ b/resources/views/pages/dieses-programm.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-    <x-top-title>Über dieses Programm</x-top-title>
+    <x-title>Über dieses Programm</x-title>
 
     <div class=" text-gray-700 dark:text-gray-200">
         <x-text>
diff --git a/resources/views/pages/impressum.blade.php b/resources/views/pages/impressum.blade.php
index 354043b..bc73882 100644
--- a/resources/views/pages/impressum.blade.php
+++ b/resources/views/pages/impressum.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="text-gray-700 dark:text-gray-200">
 
-        <x-top-title>Impressum</x-top-title>
+        <x-title>Impressum</x-title>
 
         <h2 class="mt-10 scroll-m-20 border-b pb-2 text-3xl font-semibold tracking-tight transition-colors first:mt-0">
             Was muss in ein Impressum?
diff --git a/resources/views/pages/welcome.blade.php b/resources/views/pages/welcome.blade.php
index 679d5c7..d92adbc 100644
--- a/resources/views/pages/welcome.blade.php
+++ b/resources/views/pages/welcome.blade.php
@@ -4,33 +4,63 @@
     <div class="text-gray-700 dark:text-gray-200">
 
         <div class="flex gap-7">
-
             <x-filament::section>
                 <x-slot name="heading">
-                    Die Nutzwertberechnung
+                    <x-title>
+                        Die Nutzwertberechnung
+                    </x-title>
                 </x-slot>
-
+                <svg xmlns="http://www.w3.org/2000/svg" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+                    stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+                    class="lucide lucide-building-icon lucide-building">
+                    <path d="M12 10h.01" />
+                    <path d="M12 14h.01" />
+                    <path d="M12 6h.01" />
+                    <path d="M16 10h.01" />
+                    <path d="M16 14h.01" />
+                    <path d="M16 6h.01" />
+                    <path d="M8 10h.01" />
+                    <path d="M8 14h.01" />
+                    <path d="M8 6h.01" />
+                    <path d="M9 22v-3a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v3" />
+                    <rect x="4" y="2" width="16" height="20" rx="2" />
+                </svg>
                 Die Nutzwertberechnung ist ein Gutachten im österreichischen Wohnungseigentumsrecht, das das Verhältnis der
                 einzelnen
-                Eigentumsanteile innerhalb eines Gebäudes bestimmt. <x-filament::link href="/nutzwerte" icon-position="after"
-                    icon="lucide-external-link">
+                Eigentumsanteile innerhalb eines Gebäudes bestimmt. <x-filament::link href="/nutzwerte"
+                    icon-position="after" icon="lucide-external-link">
                     Über die Nutzwertberechnung
                 </x-filament::link>
                 <br>
                 <br>
+                <svg xmlns="http://www.w3.org/2000/svg" width="32" viewBox="0 0 24 24" fill="none"
+                    stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+                    class="lucide lucide-school-icon lucide-school">
+                    <path d="M14 21v-3a2 2 0 0 0-4 0v3" />
+                    <path d="M18 5v16" />
+                    <path d="m4 6 7.106-3.79a2 2 0 0 1 1.788 0L20 6" />
+                    <path
+                        d="m6 11-3.52 2.147a1 1 0 0 0-.48.854V19a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2v-5a1 1 0 0 0-.48-.853L18 11" />
+                    <path d="M6 5v16" />
+                    <circle cx="12" cy="9" r="2" />
+                </svg>
                 Wie Ihnen dieses Programm bei der Nutzwertberechnung zur Hand gehen kann, und Ihnen wertvolle Zeit bei der
-                Berechnung und Formatierung sparen hilft, <x-filament::link href="/dieses-programm" icon-position="after"
-                    icon="lucide-external-link">
-                    erfahren sie hier.
+                Berechnung und Formatierung sparen hilft, erfahren sie hier.
+                <br><x-filament::link href="/dieses-programm" icon-position="after" icon="lucide-external-link">
+                    Über dieses Programm
                 </x-filament::link>
+                <br>
+                <br>
+                <br>
+                <br>
+                <br>
+                @include('components.login')
             </x-filament::section>
-            <img src="images/house.jpg" class="w-96 rounded-2xl" />
+            <img src="images/house.jpg" class="w-82 rounded-2xl border border-gray-300" />
 
         </div>
 
-        <br>
-        <br>
-        @include('components.login')
+
         <br>
     </div>
 @endsection