diff --git a/RBLNews.Maui/IaC/build-android.ps1 b/RBLNews.Maui/IaC/build-android.ps1
index 2ecc21b..55d74be 100644
--- a/RBLNews.Maui/IaC/build-android.ps1
+++ b/RBLNews.Maui/IaC/build-android.ps1
@@ -1 +1,2 @@
+cd..
 dotnet publish -c Release -r android-arm64 -p:PackageFormat=Apk -f net8.0-android34.0 --sc true
\ No newline at end of file
diff --git a/RBLNews.Maui/RBLNews.Maui.csproj b/RBLNews.Maui/RBLNews.Maui.csproj
index 6fcdeeb..ca24907 100644
--- a/RBLNews.Maui/RBLNews.Maui.csproj
+++ b/RBLNews.Maui/RBLNews.Maui.csproj
@@ -42,10 +42,6 @@
       <AndroidPackageFormat>apk</AndroidPackageFormat>
     </PropertyGroup>
 
-    <PropertyGroup>
-      <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.26100.0</TargetFrameworks>
-    </PropertyGroup>
-
     <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android34.0|AnyCPU'">
       <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
     </PropertyGroup>
diff --git a/RBLNews.Shared/Components/Layout/MainLayout.razor.css b/RBLNews.Shared/Components/Layout/MainLayout.razor.css
index 8521145..ddc5b6e 100644
--- a/RBLNews.Shared/Components/Layout/MainLayout.razor.css
+++ b/RBLNews.Shared/Components/Layout/MainLayout.razor.css
@@ -16,7 +16,7 @@ main {
     background-color: #f7f7f7;
     border-bottom: 1px solid #d6d5d5;
     justify-content: flex-end;
-    height: 3.5rem;
+    height: 2rem;
     display: flex;
     align-items: center;
 }
diff --git a/RBLNews.Shared/Components/Layout/NavMenu.razor b/RBLNews.Shared/Components/Layout/NavMenu.razor
index ac9beb0..89ffe3d 100644
--- a/RBLNews.Shared/Components/Layout/NavMenu.razor
+++ b/RBLNews.Shared/Components/Layout/NavMenu.razor
@@ -1,25 +1,23 @@
 @using RBLNews.Shared.Services
 
 @inject IFeedDataService feedDataService
-<div class="container-fluid">
-    <div class="top-row ps-3 navbar navbar-dark">
-        <div class="row">
-            <div class="col-12">
-                <h3>RBL News auf einen Blick!</h3>
+<nav class="nav">
+    <div class="container-fluid">
+        <div class="top-row ps-3 navbar navbar-dark">
+            <h4>RBL News auf einen Blick!</h4>
             </div>
+        <div class="top-row ps-3">
+            @if (FeedDataService.Feeds?.LastUpdate == null)
+            {
+                <text>...</text>
+            }
+            else
+            {
+                <text>Letztes Update @FeedDataService.Feeds?.LastUpdate.ToString("dd.MM.yyyy HH:mm")</text>
+            }
         </div>
     </div>
-</div>
-<div class="container-fluid">
-    <div class="top-row ps-3 navbar navbar-dark">
-        <div class="row">
-            <div class="col-12">
-                <Icon Name="IconName.InfoCircle" class="me-2"></Icon>Letztes Update @FeedDataService.Feeds?.LastUpdate.ToString("dd.MM.yyyy HH:mm")
-            </div>
-        </div>
-    </div>
-</div>
-
+</nav>
 @*
 <input type="checkbox" title="Navigation menu" class="navbar-toggler" />
 
@@ -49,10 +47,10 @@
 @code {
     [Inject]
     private IFeedDataService FeedDataService { get; set; }
-	
+
     protected override void OnInitialized()
     {
-        FeedDataService.DataChanged= () => StateHasChanged();
+        FeedDataService.DataChanged = () => StateHasChanged();
     }
 
 }
\ No newline at end of file
diff --git a/RBLNews.Shared/Components/Layout/NavMenu.razor.css b/RBLNews.Shared/Components/Layout/NavMenu.razor.css
index 6ebeb76..fea19ca 100644
--- a/RBLNews.Shared/Components/Layout/NavMenu.razor.css
+++ b/RBLNews.Shared/Components/Layout/NavMenu.razor.css
@@ -11,15 +11,21 @@
     background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
 }
 
-    .navbar-toggler:checked {
-        background-color: rgba(255, 255, 255, 0.5);
-    }
+.navbar-toggler:checked {
+    background-color: rgba(255, 255, 255, 0.5);
+}
 
 .top-row {
-    height: 2.5rem;
-    background-color: rgba(0,0,0,0.4);
+    height: 1.8rem;
+    background-color: rgb(221, 7, 65);
+    color: #eee !important;
 }
 
+.top-row h1, h2, h3, h4, h5 {
+    color: #eee !important;
+}
+
+
 .navbar-brand {
     font-size: 1.1rem;
 }
@@ -47,8 +53,8 @@
 }
 
 .nav-item {
-    font-size: 0.9rem;
-    padding-bottom: 0.5rem;
+    font-size: 0.8rem;
+    padding-bottom: 0.6rem;
 }
 
     .nav-item:first-of-type {
diff --git a/RBLNews.Shared/Components/Pages/Feeds.razor.css b/RBLNews.Shared/Components/Pages/Feeds.razor.css
new file mode 100644
index 0000000..5f28270
--- /dev/null
+++ b/RBLNews.Shared/Components/Pages/Feeds.razor.css
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/RBLNews.Shared/wwwroot/css/app.css b/RBLNews.Shared/wwwroot/css/app.css
index 8e6eb9b..e561b6e 100644
--- a/RBLNews.Shared/wwwroot/css/app.css
+++ b/RBLNews.Shared/wwwroot/css/app.css
@@ -1,16 +1,16 @@
 
+nav .container-fluid {
+    padding-right: 0px !important;
+    padding-left: 0px !important;
+}
+
 h1, h2, h3, h4, h5, h6, h7 {
     color: rgb(221, 7, 65) !important;
     text-transform: uppercase;
 }
 
-.top-row {   
-    background-color: rgb(221, 7, 65) !important;
-    color: #eee !important;
-}
-
-.top-row h3 {        
-    color: #eee !important;
+.list-group-item {
+    font-size: 0.8rem !important;
 }
 
 .loading {