diff --git a/Project.View/NewEntry/NewEntry.axaml b/Project.View/NewEntry/NewEntry.axaml
index 655193f..1d63c61 100644
--- a/Project.View/NewEntry/NewEntry.axaml
+++ b/Project.View/NewEntry/NewEntry.axaml
@@ -26,16 +26,20 @@
                     Text="Password:" />
                 <StackPanel Orientation="Horizontal">
 
-                    <TextBox TextWrapping="Wrap" Watermark="Password" />
+                    <TextBox
+                        Name="NewentryPW"
+                        PasswordChar="*"
+                        Watermark="Password" />
                     <Button
                         BorderBrush="Black"
                         BorderThickness="1"
-                        Content="X"
+                        Content="Generate Secure Password (WIP)"
                         Name="newentry_generate_password" />
                     <Button
                         BorderBrush="Black"
                         BorderThickness="1"
-                        Content="X"
+                        Click="NewEntry_ShowPW_Click"
+                        Content="👁"
                         Name="newentry_show_password" />
                 </StackPanel>
                 <TextBlock
@@ -47,13 +51,15 @@
                     <Button
                         BorderBrush="Black"
                         BorderThickness="1"
+                        Click="NewEntry_Cancel_Click"
                         Content="X"
-                        Name="newentry_save_button" />
+                        Name="newentry_cancel_button" />
                     <Button
                         BorderBrush="Black"
                         BorderThickness="1"
-                        Content="X"
-                        Name="newentry_cancel_button" />
+                        Click="NewEntry_Save_Click"
+                        Content="✓"
+                        Name="newentry_save_button" />
                 </StackPanel>
             </StackPanel>
         </Border>
diff --git a/Project.View/NewEntry/NewEntry.axaml.cs b/Project.View/NewEntry/NewEntry.axaml.cs
index b0a5a9c..404e5be 100644
--- a/Project.View/NewEntry/NewEntry.axaml.cs
+++ b/Project.View/NewEntry/NewEntry.axaml.cs
@@ -18,5 +18,25 @@ public partial class NewEntry : Window
         InitializeComponent();
         _controller = controller;
     }
+    private void NewEntry_Cancel_Click(object? sender, RoutedEventArgs e)
+    {
+        Close();
+    }
 
+    private void NewEntry_Save_Click(object? sender, RoutedEventArgs e)
+    {
+        
+    }
+
+    private void NewEntry_ShowPW_Click(object? sender, RoutedEventArgs e)
+    {
+        if (NewentryPW.PasswordChar == '*')
+        {
+            NewentryPW.PasswordChar = '\0';
+        }
+        else
+        {
+            NewentryPW.PasswordChar = '*';
+        }
+    }
 }
\ No newline at end of file