diff --git a/Project.View/MainWindow.axaml.cs b/Project.View/MainWindow.axaml.cs
index 90fb8f6..0cbefaa 100644
--- a/Project.View/MainWindow.axaml.cs
+++ b/Project.View/MainWindow.axaml.cs
@@ -11,6 +11,6 @@ public partial class MainWindow : Window
     {
         InitializeComponent();
         _controller = new();
-        MainGrid.Children.Add(new LoginPage());
+        MainGrid.Children.Add(new MenuView());
     }
 }
\ No newline at end of file
diff --git a/Project.View/MenuView/MenuView.axaml b/Project.View/MenuView/MenuView.axaml
index 0ebbf03..a690ffc 100644
--- a/Project.View/MenuView/MenuView.axaml
+++ b/Project.View/MenuView/MenuView.axaml
@@ -1,45 +1,108 @@
-<UserControl 
-        xmlns="https://github.com/avaloniaui"
-        x:Class="Project.View.MenuView"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<UserControl
+    x:Class="Project.View.MenuView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="200" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
-        <ScrollViewer Margin="0, 0, 0, 40" Grid.Column="0" VerticalScrollBarVisibility="Auto">
-            
+        <ScrollViewer
+            Grid.Column="0"
+            Margin="0,0,0,40"
+            VerticalScrollBarVisibility="Auto">
+
             <StackPanel>
-                <Button Name="btn1" Width="200" Background="Pink" BorderBrush="Black" BorderThickness="1">BeispielButton</Button>
-                <Button Name="btn2" Width="200" Background="Pink" BorderBrush="Black" BorderThickness="1">BeispielButton2</Button>
+                <Button
+                    Background="Pink"
+                    BorderBrush="Black"
+                    BorderThickness="1"
+                    Name="btn1"
+                    Width="200">
+                    BeispielButton
+                </Button>
+                <Button
+                    Background="Pink"
+                    BorderBrush="Black"
+                    BorderThickness="1"
+                    Name="btn2"
+                    Width="200">
+                    BeispielButton2
+                </Button>
             </StackPanel>
         </ScrollViewer>
-        <Button Name="NewEntry" VerticalAlignment="Bottom" HorizontalAlignment="Left" Content="+"/>
+        <Button
+            Click="NewEntryButton_OnClick"
+            Content="+"
+            HorizontalAlignment="Left"
+            Name="NewEntryButton"
+            VerticalAlignment="Bottom" />
 
-<Border Grid.Column="1" Background="RosyBrown">
-        <StackPanel Orientation="Horizontal">
-            
-                <StackPanel Orientation="Vertical" Margin="20,20,100,20">
-                    <TextBlock Margin="23" Text="Name:" HorizontalAlignment="Left" FontSize="20"/>
-                    <TextBlock Margin="23" Text="URL:" HorizontalAlignment="Left" FontSize="20"/>
-                    <TextBlock Margin="23" Text="Password:" HorizontalAlignment="Left" FontSize="20"/>
-                    <TextBlock Margin="23" Text="Note:" HorizontalAlignment="Left" FontSize="20"/>
+        <Border Background="RosyBrown" Grid.Column="1">
+            <StackPanel Orientation="Horizontal">
+
+                <StackPanel Margin="20,20,100,20" Orientation="Vertical">
+                    <TextBlock
+                        FontSize="20"
+                        HorizontalAlignment="Left"
+                        Margin="23"
+                        Text="Name:" />
+                    <TextBlock
+                        FontSize="20"
+                        HorizontalAlignment="Left"
+                        Margin="23"
+                        Text="URL:" />
+                    <TextBlock
+                        FontSize="20"
+                        HorizontalAlignment="Left"
+                        Margin="23"
+                        Text="Password:" />
+                    <TextBlock
+                        FontSize="20"
+                        HorizontalAlignment="Left"
+                        Margin="23"
+                        Text="Note:" />
                 </StackPanel>
 
-                <StackPanel Orientation="Vertical" Margin="20,20,20,20">
-                    <TextBox Margin="20" Text="THE NAME OF YOUR SAVED LOGIN" Height="30" TextWrapping="Wrap"/>
-                    <TextBox Margin="20" Text="THE URL TO YOUR PAGE" Height="30" TextWrapping="Wrap"/>
+                <StackPanel Margin="20,20,20,20" Orientation="Vertical">
+                    <TextBox
+                        Height="30"
+                        Margin="20"
+                        Text="THE NAME OF YOUR SAVED LOGIN"
+                        TextWrapping="Wrap" />
+                    <TextBox
+                        Height="30"
+                        Margin="20"
+                        Text="THE URL TO YOUR PAGE"
+                        TextWrapping="Wrap" />
                     <StackPanel Orientation="Horizontal">
-                        <TextBox Margin="20" Text="PASSWORT" Height="30" TextWrapping="Wrap" PasswordChar="*"/>
-                        <Button Name="copyPassword" BorderBrush="Black" BorderThickness="1" Content="X"/>
-                        <Button Name="showPassword" BorderBrush="Black" BorderThickness="1" Content="X"/>
+                        <TextBox
+                            Height="30"
+                            Margin="20"
+                            PasswordChar="*"
+                            Text="PASSWORT"
+                            TextWrapping="Wrap" />
+                        <Button
+                            BorderBrush="Black"
+                            BorderThickness="1"
+                            Content="X"
+                            Name="copyPassword" />
+                        <Button
+                            BorderBrush="Black"
+                            BorderThickness="1"
+                            Content="X"
+                            Name="showPassword" />
                     </StackPanel>
-                    <TextBox Margin="20" Height="150" Text="YOUR NOTES" TextWrapping="Wrap"/>
+                    <TextBox
+                        Height="150"
+                        Margin="20"
+                        Text="YOUR NOTES"
+                        TextWrapping="Wrap" />
                 </StackPanel>
-        </StackPanel>
-</Border>
-        
+            </StackPanel>
+        </Border>
+
     </Grid>
 
 
diff --git a/Project.View/MenuView/MenuView.axaml.cs b/Project.View/MenuView/MenuView.axaml.cs
index 8c2890b..d0966a0 100644
--- a/Project.View/MenuView/MenuView.axaml.cs
+++ b/Project.View/MenuView/MenuView.axaml.cs
@@ -18,9 +18,11 @@ public partial class MenuView : UserControl
         InitializeComponent();
         _controller = controller;
     }
+    
 
-    private void Button_Click(object? sender, RoutedEventArgs e)
+    private void NewEntryButton_OnClick(object? sender, RoutedEventArgs e)
     {
-        ((Button)sender).Background = Brushes.Blue;
+        var newEntry = new NewEntry(_controller);
+        NewEntry.Show(newEntry);
     }
 }
\ No newline at end of file
diff --git a/Project.View/NewEntry/NewEntry.axaml b/Project.View/NewEntry/NewEntry.axaml
index 26fa3f5..042005f 100644
--- a/Project.View/NewEntry/NewEntry.axaml
+++ b/Project.View/NewEntry/NewEntry.axaml
@@ -3,101 +3,55 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="200" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
 
-        <ScrollViewer
-            Grid.Column="0"
-            Margin="0,0,0,40"
-            VerticalScrollBarVisibility="Auto">
+        <Border Background="SaddleBrown">
 
-            <StackPanel>
-                <Button
-                    Background="Pink"
-                    BorderBrush="Black"
-                    BorderThickness="1"
-                    Name="btn1"
-                    Width="200">
-                    BeispielButton
-                </Button>
-                <Button
-                    Background="Pink"
-                    BorderBrush="Black"
-                    BorderThickness="1"
-                    Name="btn2"
-                    Width="200">
-                    BeispielButton2
-                </Button>
-            </StackPanel>
-        </ScrollViewer>
-        <Button
-            Content="+"
-            HorizontalAlignment="Left"
-            Name="NewEntry"
-            VerticalAlignment="Bottom" />
+            <StackPanel Orientation="Vertical">
+                <TextBlock
+                    FontSize="20"
+                    HorizontalAlignment="Left"
+                    Text="Name:" />
+                <TextBox TextWrapping="Wrap" Watermark="Name:" />
+                <TextBlock
+                    FontSize="20"
+                    HorizontalAlignment="Left"
+                    Text="Username:" />
+                <TextBox TextWrapping="Wrap" Watermark="Username" />
+                <TextBlock
+                    FontSize="20"
+                    HorizontalAlignment="Left"
+                    Margin="23"
+                    Text="Password:" />
+                <StackPanel Orientation="Horizontal">
 
-        <Border Background="RosyBrown" Grid.Column="1">
-            <StackPanel Orientation="Horizontal">
-
-                <StackPanel Margin="20,20,100,20" Orientation="Vertical">
-                    <TextBlock
-                        FontSize="20"
-                        HorizontalAlignment="Left"
-                        Margin="23"
-                        Text="Name:" />
-                    <TextBlock
-                        FontSize="20"
-                        HorizontalAlignment="Left"
-                        Margin="23"
-                        Text="URL:" />
-                    <TextBlock
-                        FontSize="20"
-                        HorizontalAlignment="Left"
-                        Margin="23"
-                        Text="Password:" />
-                    <TextBlock
-                        FontSize="20"
-                        HorizontalAlignment="Left"
-                        Margin="23"
-                        Text="Note:" />
+                    <TextBox TextWrapping="Wrap" Watermark="Password" />
+                    <Button
+                        BorderBrush="Black"
+                        BorderThickness="1"
+                        Content="X"
+                        Name="newentry_generate_password" />
+                    <Button
+                        BorderBrush="Black"
+                        BorderThickness="1"
+                        Content="X"
+                        Name="newentry_show_password" />
                 </StackPanel>
-
-                <StackPanel Margin="20,20,20,20" Orientation="Vertical">
-                    <TextBox
-                        Height="30"
-                        Margin="20"
-                        Text="THE NAME OF YOUR SAVED LOGIN"
-                        TextWrapping="Wrap" />
-                    <TextBox
-                        Height="30"
-                        Margin="20"
-                        Text="THE URL TO YOUR PAGE"
-                        TextWrapping="Wrap" />
-                    <StackPanel Orientation="Horizontal">
-                        <TextBox
-                            Height="30"
-                            Margin="20"
-                            PasswordChar="*"
-                            Text="PASSWORT"
-                            TextWrapping="Wrap" />
-                        <Button
-                            BorderBrush="Black"
-                            BorderThickness="1"
-                            Content="X"
-                            Name="copyPassword" />
-                        <Button
-                            BorderBrush="Black"
-                            BorderThickness="1"
-                            Content="X"
-                            Name="showPassword" />
-                    </StackPanel>
-                    <TextBox
-                        Height="150"
-                        Margin="20"
-                        Text="YOUR NOTES"
-                        TextWrapping="Wrap" />
+                <TextBlock
+                    FontSize="20"
+                    HorizontalAlignment="Left"
+                    Text="Note:" />
+                <TextBox TextWrapping="Wrap" Watermark="Note" />
+                <StackPanel Orientation="Horizontal">
+                    <Button
+                        BorderBrush="Black"
+                        BorderThickness="1"
+                        Content="X"
+                        Name="newentry_save_button" />
+                    <Button
+                        BorderBrush="Black"
+                        BorderThickness="1"
+                        Content="X"
+                        Name="newentry_cancel_button" />
                 </StackPanel>
             </StackPanel>
         </Border>