diff --git a/src/KeyKeeper/AboutWindow.cs b/src/KeyKeeper/AboutWindow.cs
index ef3c58a..c181188 100644
--- a/src/KeyKeeper/AboutWindow.cs
+++ b/src/KeyKeeper/AboutWindow.cs
@@ -28,16 +28,23 @@ public class AboutWindow : Window
 
         var AboutText = new TextBlock
         {
-            Text = "KeyKeeper is a personal password and key manager\n" +
-                   "where you can save passwords and other login\n" +
-                   "information, configure one-time code generation,\n" +
-                   "and create encryption keys for personal use.\n",
+            Text = "KeyKeeper is a personal local password manager\n" +
+                   "and a TOTP (Time-based One-Time Password) generator.\n",
             HorizontalAlignment = HorizontalAlignment.Left,
             FontSize = 16,
             TextAlignment = TextAlignment.Left,
             Margin = new Thickness(0, 20, 0, 0)
         };
 
+        var AboutSmallText = new TextBlock
+        {
+            Text = "Authors: The KeyKeeper Team\nVersion: 2.0 (08.05.2026)",
+            HorizontalAlignment = HorizontalAlignment.Left,
+            FontSize = 12,
+            TextAlignment = TextAlignment.Left,
+            Margin = new Thickness(0, 30, 0, 0)
+        };
+
         var mainGrid = new Grid
         {
             VerticalAlignment = VerticalAlignment.Center,
@@ -46,11 +53,12 @@ public class AboutWindow : Window
 
         var innerStack = new StackPanel
         {
-            Width = 400
+            Width = 550
         };
 
         innerStack.Children.Add(AboutKeyKeeper);
         innerStack.Children.Add(AboutText);
+        innerStack.Children.Add(AboutSmallText);
 
         mainGrid.Children.Add(innerStack);
 
diff --git a/src/KeyKeeper/Views/EntryEditWindow.axaml b/src/KeyKeeper/Views/EntryEditWindow.axaml
index c550a6e..bbf64ee 100644
--- a/src/KeyKeeper/Views/EntryEditWindow.axaml
+++ b/src/KeyKeeper/Views/EntryEditWindow.axaml
@@ -4,7 +4,7 @@
         xmlns:ps="using:KeyKeeper.PasswordStore"
         x:Class="KeyKeeper.Views.EntryEditWindow"
         x:DataType="vm:EntryEditViewModel"
-        Title="Add Entry"
+        Title="Add Password"
         CanResize="True"
         MinWidth="540"
         MinHeight="400"
diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml b/src/KeyKeeper/Views/RepositoryWindow.axaml
index c1b4359..0524298 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml
@@ -85,7 +85,7 @@
                         </TreeView>
 
                         <!-- Save Passwords -->
-                        <Button Content="Save Passwords"
+                        <Button Content="Save"
                                 Classes="accentSidebarButton"
                                 Click="SaveButton_Click"
                                 Height="30"
@@ -93,7 +93,7 @@
                                 Margin="0,20,0,0"/>
 
                         <!-- New Entry -->
-                        <Button Content="New Entry"
+                        <Button Content="New Password"
                                         Classes="accentSidebarButton"
                                         Click="AddEntryButton_Click"
                                         Height="30"
@@ -101,7 +101,7 @@
                                         Margin="0,20,0,0"/>
 
                         <!-- Edit Selected Entry -->
-                        <Button Content="Edit Selected Entry"
+                        <Button Content="Edit Selected Password"
                                         Classes="accentSidebarButton"
                                         Click="EditEntryButton_Click"
                                         Height="30"