diff --git a/Jugenddienst Stunden/AppShell.xaml.cs b/Jugenddienst Stunden/AppShell.xaml.cs
index f50557b..90a52f4 100644
--- a/Jugenddienst Stunden/AppShell.xaml.cs	
+++ b/Jugenddienst Stunden/AppShell.xaml.cs	
@@ -12,5 +12,9 @@ public partial class AppShell : Shell {
 		//Seiten, die nicht in der Appshell sichtbar sind, aber trotzdem aufgerufen werden können
 		Routing.RegisterRoute(nameof(Views.NotePage), typeof(Views.NotePage));
 		Routing.RegisterRoute(nameof(Views.StundePage), typeof(Views.StundePage));
+
+		
 	}
+
+	
 }
diff --git a/Jugenddienst Stunden/MauiProgram.cs b/Jugenddienst Stunden/MauiProgram.cs
index 3e5a750..9881125 100644
--- a/Jugenddienst Stunden/MauiProgram.cs	
+++ b/Jugenddienst Stunden/MauiProgram.cs	
@@ -1,4 +1,5 @@
-using ZXing.Net.Maui.Controls;
+using Microsoft.Extensions.Logging;
+using ZXing.Net.Maui.Controls;
 
 namespace Jugenddienst_Stunden;
 
diff --git a/Jugenddienst Stunden/Views/AllNotesPage.xaml b/Jugenddienst Stunden/Views/AllNotesPage.xaml
index 9667f52..bca5dee 100644
--- a/Jugenddienst Stunden/Views/AllNotesPage.xaml	
+++ b/Jugenddienst Stunden/Views/AllNotesPage.xaml	
@@ -12,7 +12,7 @@
 
     <!-- Add an item to the toolbar -->
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="Add" Command="{Binding NewCommand}" IconImageSource="{FontImage Glyph='+', Color=Black, Size=22}" />
+        <ToolbarItem Text="Neue Notiz" Command="{Binding NewCommand}" IconImageSource="{FontImage Glyph='+', Color=Black, Size=22}" />
     </ContentPage.ToolbarItems>
 
     <VerticalStackLayout Margin="20,0,0,0">
diff --git a/Jugenddienst Stunden/Views/LoginPage.xaml.cs b/Jugenddienst Stunden/Views/LoginPage.xaml.cs
index 17c64f5..4f8827c 100644
--- a/Jugenddienst Stunden/Views/LoginPage.xaml.cs	
+++ b/Jugenddienst Stunden/Views/LoginPage.xaml.cs	
@@ -60,7 +60,8 @@ public partial class LoginPage : ContentPage {
 							Preferences.Default.Set("EmployeeId", int.Parse(op.id));
 
 							await DisplayAlert("Login erfolgreich", op.name + " " + op.surname, "OK");
-							await Navigation.PopAsync();
+							if (Navigation.NavigationStack.Count > 1)
+								await Navigation.PopAsync();
 						} catch (Exception e) {
 							await DisplayAlert("Fehler", e.Message, "OK");
 						}
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml b/Jugenddienst Stunden/Views/StundenPage.xaml
index 40dd133..d041ba0 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml	
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml	
@@ -18,14 +18,14 @@
 
     <ContentPage.ToolbarItems>
         <!--<ToolbarItem Text="Lade Liste" Command="{Binding RefreshListCommand}"/>-->
-        <ToolbarItem Text="Add" IconImageSource="{StaticResource ToolbarIcon}" Command="{Binding NewEntryCommand}" />
+        <ToolbarItem Text="Neuer Eintrag" IconImageSource="{StaticResource ToolbarIcon}" Command="{Binding NewEntryCommand}" />
         
     </ContentPage.ToolbarItems>
 
 
     <VerticalStackLayout Spacing="10" Margin="10">
 
-        <Grid RowDefinitions="Auto" ColumnDefinitions="Auto,*">
+        <Grid RowDefinitions="Auto" ColumnDefinitions="Auto,*" HeightRequest="50">
             <DatePicker Grid.Column="0" MinimumDate="{Binding MinimumDate}"
             MaximumDate="{Binding MaximumDate}"
             Date="{Binding DateToday}" Format="dddd, d. MMMM yyyy" />
@@ -37,7 +37,7 @@
         <CollectionView 
                 ItemsSource="{Binding DayTimes}" 
                 x:Name="stundeItems" Margin="0"
-                HeightRequest="350"
+                HeightRequest="300"
                 SelectionMode="Single"
                 SelectionChangedCommand="{Binding SelectEntryCommand}"
                 SelectionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=SelectedItem}">
@@ -92,7 +92,7 @@
         <BoxView HeightRequest="1" />
 
         <Button Text="{Binding LoadOverview}" Command="{Binding LoadDataCommand}" />
-        <Frame Padding="2">
+        <Frame Padding="2" HeightRequest="125">
             <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,*" ColumnDefinitions="Auto,*" Margin="10,2">
                 <Label Grid.Row="0" Text="Soll:" />
                 <Label Grid.Row="1" Text="Summe:" />
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml.cs b/Jugenddienst Stunden/Views/StundenPage.xaml.cs
index bbbd1d8..248c60d 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml.cs	
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml.cs	
@@ -25,6 +25,8 @@ public partial class StundenPage : ContentPage {
 		//// Berechnen der gewünschten Höhe
 		//var desiredHeight = screenHeight - 450; // Abzüglich der Stundenübersicht
 		//stundeItems.HeightRequest = desiredHeight;
+
+		SizeChanged += OnPageSizeChanged;
 	}
 
 	private void Vm_AlertEvent(object? sender, string e) {
@@ -50,5 +52,13 @@ public partial class StundenPage : ContentPage {
 		await Navigation.PushAsync(new LoginPage());
 	}
 
+	private void OnPageSizeChanged(object sender, EventArgs e) {
+		double windowHeight = this.Height;
+		AdjustLayout(windowHeight);
+	}
 
+	private void AdjustLayout(double height) {
+		// Passen Sie Ihre UI-Elemente basierend auf der Fensterhöhe an
+		stundeItems.HeightRequest = height - 300; //Datepicker Height 50, Monatssummen Height 125, Titel + Navigation Height xyz
+	}
 }
\ No newline at end of file