diff --git a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin
index 4962b51..64b763a 100644
Binary files a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin and b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin differ
diff --git a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin
index d2078e4..dc7756a 100644
Binary files a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin and b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin differ
diff --git a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin
index 1674a38..d80efdc 100644
Binary files a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin and b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin differ
diff --git a/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2 b/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2
index 28eaa69..102fa24 100644
Binary files a/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2 and b/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/2749711f-8b86-493c-a9c6-107ac2e2433a.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/2749711f-8b86-493c-a9c6-107ac2e2433a.vsidx
new file mode 100644
index 0000000..0a9d29c
Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/2749711f-8b86-493c-a9c6-107ac2e2433a.vsidx differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/3630d8dd-e9cb-4487-a37f-438a18f27253.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/3630d8dd-e9cb-4487-a37f-438a18f27253.vsidx
deleted file mode 100644
index 49eb620..0000000
Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/3630d8dd-e9cb-4487-a37f-438a18f27253.vsidx and /dev/null differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/44ea562a-57c0-441f-ab91-5bf72939ec04.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/44ea562a-57c0-441f-ab91-5bf72939ec04.vsidx
deleted file mode 100644
index 3325746..0000000
Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/44ea562a-57c0-441f-ab91-5bf72939ec04.vsidx and /dev/null differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/53ae9b3a-b2d3-498e-9833-cc7c83dd472c.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/53ae9b3a-b2d3-498e-9833-cc7c83dd472c.vsidx
deleted file mode 100644
index e23201f..0000000
Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/53ae9b3a-b2d3-498e-9833-cc7c83dd472c.vsidx and /dev/null differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/6392012d-8ccb-4c4b-800b-66aaefaa85b4.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/6392012d-8ccb-4c4b-800b-66aaefaa85b4.vsidx
new file mode 100644
index 0000000..68439dc
Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/6392012d-8ccb-4c4b-800b-66aaefaa85b4.vsidx differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/69d9c51c-01e5-47c1-b95b-7338aa161825.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/69d9c51c-01e5-47c1-b95b-7338aa161825.vsidx
new file mode 100644
index 0000000..4b12800
Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/69d9c51c-01e5-47c1-b95b-7338aa161825.vsidx differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e7a282a3-c154-46a6-8c5a-09215c2c4c60.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e7a282a3-c154-46a6-8c5a-09215c2c4c60.vsidx
deleted file mode 100644
index a627a61..0000000
Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e7a282a3-c154-46a6-8c5a-09215c2c4c60.vsidx and /dev/null differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e8a518db-57ef-49db-ade3-3a005116752b.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e8a518db-57ef-49db-ade3-3a005116752b.vsidx
new file mode 100644
index 0000000..96cd2fa
Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e8a518db-57ef-49db-ade3-3a005116752b.vsidx differ
diff --git a/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 b/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2
index a6bc3e9..3704f23 100644
Binary files a/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 and b/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 differ
diff --git a/demo_blagodat/.vs/demo_blagodat/v17/.suo b/demo_blagodat/.vs/demo_blagodat/v17/.suo
index a66b568..1912c65 100644
Binary files a/demo_blagodat/.vs/demo_blagodat/v17/.suo and b/demo_blagodat/.vs/demo_blagodat/v17/.suo differ
diff --git a/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json b/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json
index ca07ea2..38b022e 100644
--- a/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json
+++ b/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json
@@ -1,12 +1,7 @@
 {
   "Version": 1,
   "WorkspaceRootPath": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\",
-  "Documents": [
-    {
-      "AbsoluteMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|c:\\users\\vivobook 15x\\desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\demo_blagodat\\demo_blagodat\\demo_blagodat\\admin.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:admin.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    }
-  ],
+  "Documents": [],
   "DocumentGroupContainers": [
     {
       "Orientation": 0,
@@ -14,7 +9,7 @@
       "DocumentGroups": [
         {
           "DockedWidth": 200,
-          "SelectedChildIndex": 2,
+          "SelectedChildIndex": -1,
           "Children": [
             {
               "$type": "Bookmark",
@@ -23,19 +18,6 @@
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "Admin.axaml.cs",
-              "DocumentMoniker": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Admin.axaml.cs",
-              "RelativeDocumentMoniker": "Admin.axaml.cs",
-              "ToolTip": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Admin.axaml.cs",
-              "RelativeToolTip": "Admin.axaml.cs",
-              "ViewState": "AgIAAA8AAAAAAAAAAAAAACcAAAAvAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-02-25T14:35:58.682Z",
-              "EditorCaption": ""
             }
           ]
         }
diff --git a/demo_blagodat/Authorization.axaml.cs b/demo_blagodat/Authorization.axaml.cs
index 7da1b38..5f12462 100644
--- a/demo_blagodat/Authorization.axaml.cs
+++ b/demo_blagodat/Authorization.axaml.cs
@@ -10,68 +10,77 @@ using System.Linq;
 namespace demo_blagodat;
 
 public partial class Authorization : Window
-{
-    string? Login;
-    string? password;
-    
+{   
     public Authorization()
     {
         InitializeComponent();
     }
+
     private void RegisterClick_OnClick(object? sender, RoutedEventArgs e)
     {
         new Registration().Show();
-        Close();
+        Close(); // ��������� ������� ����
     }
 
     private void MainOneClikc(object? sender, RoutedEventArgs e)
     {
-        Login = LoginTextBox.Text;
-        password = PasswordTextBox.Text;
-
-        User11Context db = new User11Context();
-        var corrUser = db.Employees.Where(x => x.EmployeesLogin == Login && x.EmployeesPassword == password).FirstOrDefault();
-        if (corrUser == null)
+        try
         {
-            Mess.Text = "������������ �� ������ � �������";
-        }
-        else
-        {
-            try
+            using (User11Context db = new User11Context()) // ����������� � ��
             {
-                corrUser.EmployeesEntrance = true;
-                corrUser.EmployeesDateHour = TimeOnly.FromDateTime(DateTime.Now);
-                corrUser.EmployeesDateDay = DateOnly.FromDateTime(DateTime.Now);
-                db.SaveChanges();
+                string? Login = LoginTextBox.Text; // ���� ����� ������������ � ������
+                string? password = PasswordTextBox.Text; // ���� ������ ������������ � ������
 
-                switch (corrUser.EmployeesPosition)
-                {
-                    case "�������������": AdminOneClikc(corrUser); break;
-                    case "��������": SellerOneClikc(corrUser); break;
-                    case "������� �����": ShiftSupervisorOneClikc(corrUser); break;
+                if (Login != null && password != null) {
+
+                    var corrUser = db.Employees.Where(x => x.EmployeesLogin == Login && x.EmployeesPassword == password).FirstOrDefault(); // �������� ������ ������������ �� ������ � ������
+                    if (corrUser == null)
+                    {
+                        Mess.Text = "������������ �� ������ � �������. \n��������� ������"; // ��������� �� ������
+                    }
+                    else
+                    {
+                        corrUser.EmployeesEntrance = true; // ������ � ��������� "����������" False �� True
+                        corrUser.EmployeesDateHour = TimeOnly.FromDateTime(DateTime.Now); // ������� � ��������� "����� ����� � �������" ��������� �����
+                        corrUser.EmployeesDateDay = DateOnly.FromDateTime(DateTime.Now); // ������� � ��������� "���� ����� � �������" ����������� ����
+
+                        db.SaveChanges(); // ��������� ��������� � ��
+
+                        switch (corrUser.EmployeesPosition) // �������� ������������
+                        {
+                            case "�������������": AdminOneClikc(corrUser); break;
+                            case "��������": SellerOneClikc(corrUser); break;
+                            case "������� �����": ShiftSupervisorOneClikc(corrUser); break;
+                        }
+                    }
+                }
+                else
+                {
+                    // ��������� ������ �� NULL
+                    if (Login != null) { Mess.Text = "������� �����"; }
+                    else { Mess.Text = "������� ������"; }
                 }
-                Close();
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("{0} Exception caught", ex.Message);
             }
         }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex.Message);
+        }
     }
 
     private void SellerOneClikc(Employee corrUser)
     {
         new Seller(corrUser).Show();
-        Close();
+        Close(); // ��������� ������� ����
     }
     private void AdminOneClikc(Employee corrUser)
     {
         new Admin(corrUser).Show();
-        Close();
+        Close(); // ��������� ������� ����
     }
     private void ShiftSupervisorOneClikc(Employee corrUser)
     {
         new ShiftSupervisor(corrUser).Show();
-        Close();
+        Close(); // ��������� ������� ����
     }
 }
diff --git a/demo_blagodat/AddClient.axaml b/demo_blagodat/Functions/AddClient.axaml
similarity index 65%
rename from demo_blagodat/AddClient.axaml
rename to demo_blagodat/Functions/AddClient.axaml
index 6f0cbe2..05484ef 100644
--- a/demo_blagodat/AddClient.axaml
+++ b/demo_blagodat/Functions/AddClient.axaml
@@ -4,26 +4,26 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="700"
         x:Class="demo_blagodat.AddClient"
-        Title="AddClient">
+        Title="Добавление клиентов">
 	<StackPanel Spacing="15" HorizontalAlignment="Center" VerticalAlignment="Center">
 
-		<TextBlock Text="Введите ФИО"></TextBlock>
-		<TextBox Width="300" x:Name="TextName" ></TextBox>
+		<TextBlock Text="Введите ФИО"/>
+		<TextBox Width="300" x:Name="TextName"/>
 
-		<TextBlock Text="Введите Паспорт"></TextBlock>
-		<TextBox Width="300" x:Name="TextPassport" ></TextBox>
+		<TextBlock Text="Введите Паспорт"/>
+		<TextBox Width="300" x:Name="TextPassport"/>
 
-		<TextBlock Text="Введите дату рождения"></TextBlock>
-		<DatePicker x:Name="TextBirthday"/>
+		<TextBlock Text="Введите дату рождения"/>
+		<TextBox Width="300" x:Name="TextBirthday"/>
 
 		<TextBlock Text="Введите адрес"/>
-		<TextBox Width="300" Height="90" x:Name="TextAddress"></TextBox>
+		<TextBox Width="300" Height="90" x:Name="TextAddress"/>
 
 		<TextBlock Text="Введите Email"/>
-		<TextBox Width="300" x:Name="TextEmail"></TextBox>
+		<TextBox Width="300" x:Name="TextEmail"/>
 
 		<TextBlock Text="Введите пароль"/>
-		<TextBox Width="300" x:Name="TextPassword" ></TextBox>
+		<TextBox Width="300" x:Name="TextPassword"></TextBox>
 		<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
 			<Button Content="Добавить Клиента" Click="addclient"/>
 			<Button Content="Вернуться назад" Click="ExitClik"/>
diff --git a/demo_blagodat/AddClient.axaml.cs b/demo_blagodat/Functions/AddClient.axaml.cs
similarity index 63%
rename from demo_blagodat/AddClient.axaml.cs
rename to demo_blagodat/Functions/AddClient.axaml.cs
index afbe5f1..24f50e6 100644
--- a/demo_blagodat/AddClient.axaml.cs
+++ b/demo_blagodat/Functions/AddClient.axaml.cs
@@ -11,31 +11,33 @@ namespace demo_blagodat;
 
 public partial class AddClient : Window
 {
-    public Employee User;
+    public Employee User; // ������ ������������ (� ���� ���� ����������)
     public AddClient(Employee user)
     {
         InitializeComponent();
-        User = user;
+        User = user; // ������� ������ ������������ � ��������� ����������
     }
 
     private void addclient(object sender, RoutedEventArgs e)
     {
-        try
+        try // ����������� ��� ��������� ����������
         {
-            using (User11Context db = new User11Context())
+            using (User11Context db = new User11Context()) // ����������� � ��
             {
-                int id = db.Clients.Max(it => it.ClientCode) + 1;
+                // �������� ��� ������ � ������
+                int id = db.Clients.Max(it => it.ClientCode) + 1; // ���� ������������ ID ������������ � ���������� "1"
                 string name = TextName.Text;
                 string pas = TextPassport.Text;
-                DateOnly date = DateOnly.FromDateTime(DateTime.Now);
+                DateOnly date = DateOnly.TryParse(TextBirthday.Text, out var BirthDate) ? BirthDate : new DateOnly();
                 string address = TextAddress.Text;
                 string email = TextEmail.Text;
                 string password = TextPassword.Text;
 
-                if (name != null && pas != null && address != null && password != null)
+                if (name != null && pas != null && address != null && password != null) // ��������� ������� ������ ������
                 {
-                    Client client = new Client()
+                    Client client = new Client() // ������ ��������� ������ Client
                     {
+                        // ��������� ����������
                         ClientCode = id,
                         ClientName = name,
                         ClientPassport = pas,
@@ -44,13 +46,26 @@ public partial class AddClient : Window
                         ClientAddress = address,
                         ClientPassword = password
                     };
+
+                    // ��������� ������������ � ��
                     db.Clients.Add(client);
                     db.SaveChanges();
+
+                    // ������� ��� ������
+                    TextName.Text = "";
+                    TextPassport.Text = "";
+                    TextBirthday.Text = "";
+                    TextAddress.Text = "";
+                    TextEmail.Text = "";
+                    TextPassword.Text = "";
+
+                    // ������ ���������
                     MesAddError.Text = "";
                     MesAdd.Text = "������ �������";
                 }
                 else
                 {
+                    // ������ ���������
                     MesAdd.Text = "";
                     MesAddError.Text = "����� �������� ��� ������ �������!\n����� ������������ ������ �����.";
                 }
@@ -58,7 +73,10 @@ public partial class AddClient : Window
         }
         catch (Exception ex)
         {
-            ExceptionDispatchInfo.Capture(ex).Throw();
+            // ������� ��������� �� ������ � �������
+            Console.WriteLine(ex.Message);
+
+            // ������ ���������
             MesAdd.Text = "";
             MesAddError.Text = "��������� ������";
         }
@@ -67,15 +85,15 @@ public partial class AddClient : Window
 
     private void ExitClik(object sender, RoutedEventArgs e)
     {
-        switch (User.EmployeesPosition)
+        switch (User.EmployeesPosition) // �������� ������������
         {
             case "�������������": AdminOneClikc(User); break;
             case "��������": SellerOneClikc(User); break;
             case "������� �����": ShiftSupervisorOneClikc(User); break;
         }
-        Close();
     }
 
+    // ��������� ������ ��� ����������� � ������ ���� ������������
     private void SellerOneClikc(Employee User)
     {
         new Seller(User).Show();
diff --git a/demo_blagodat/CreateOrder.axaml b/demo_blagodat/Functions/CreateOrder.axaml
similarity index 90%
rename from demo_blagodat/CreateOrder.axaml
rename to demo_blagodat/Functions/CreateOrder.axaml
index da6671e..fb8041a 100644
--- a/demo_blagodat/CreateOrder.axaml
+++ b/demo_blagodat/Functions/CreateOrder.axaml
@@ -4,7 +4,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="demo_blagodat.CreateOrder"
-        Title="CreateOrder">
+        Title="Создание заказа">
 	<StackPanel>
 		<Button Content="Назад" Click="ExitClik"/>
 	</StackPanel>
diff --git a/demo_blagodat/CreateOrder.axaml.cs b/demo_blagodat/Functions/CreateOrder.axaml.cs
similarity index 100%
rename from demo_blagodat/CreateOrder.axaml.cs
rename to demo_blagodat/Functions/CreateOrder.axaml.cs
diff --git a/demo_blagodat/MainWindow.axaml b/demo_blagodat/MainWindow.axaml
deleted file mode 100644
index c15fbf0..0000000
--- a/demo_blagodat/MainWindow.axaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="demo_blagodat.MainWindow"
-        Title="Основное окно">
-	<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="10">
-		<TextBlock/>
-		<TextBlock x:Name="ClickCounts"/>
-		<Button Width="200" Content="Открыть счет"/>
-	</StackPanel>
-</Window>
diff --git a/demo_blagodat/MainWindow.axaml.cs b/demo_blagodat/MainWindow.axaml.cs
deleted file mode 100644
index d2e1b87..0000000
--- a/demo_blagodat/MainWindow.axaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Microsoft.EntityFrameworkCore;
-using static System.Formats.Asn1.AsnWriter;
-
-namespace demo_blagodat
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            
-            InitializeComponent();
-            
-        }
-    }
-}
\ No newline at end of file
diff --git a/demo_blagodat/Registration.axaml b/demo_blagodat/Registration.axaml
index 02d11f4..a3213da 100644
--- a/demo_blagodat/Registration.axaml
+++ b/demo_blagodat/Registration.axaml
@@ -15,7 +15,7 @@
 		
 		<TextBlock Text="Введите пароль"/>
 		<TextBox Width="300" x:Name="PasswordTextBox" ></TextBox>
-		<TextBlock x:Name="position" Text="Добрый день "/>
+		<TextBlock x:Name="position" Text="Выберите должность: "/>
 		<StackPanel Orientation="Horizontal">
 			<Button Content="Продавец" Click="sellerUser"/>
 			<Button Content="Старший смены" Click="shiftSupervisorUser"/>
diff --git a/demo_blagodat/Registration.axaml.cs b/demo_blagodat/Registration.axaml.cs
index e1e024b..cfe23cd 100644
--- a/demo_blagodat/Registration.axaml.cs
+++ b/demo_blagodat/Registration.axaml.cs
@@ -11,31 +11,32 @@ namespace demo_blagodat;
 
 public partial class Registration : Window
 {
-    public string UserLogin;
-    public string PositionUser;
+    public string PositionUser; // ��������� ���������� ��� �������� ��������� ������������
     public Registration()
     {
         InitializeComponent();
     }
+
     public void sellerUser(object? sender, RoutedEventArgs e)
     {
         PositionUser = "��������";
-        position.Text = PositionUser;
+        position.Text = position.Text + PositionUser;
     }
+
     public void shiftSupervisorUser(object? sender, RoutedEventArgs e)
     {
         PositionUser = "������� �����";
-        position.Text = PositionUser;
+        position.Text = position.Text + PositionUser;
     }
 
-
     private void RegisterClick_OnClick(object? sender, RoutedEventArgs e)
     {
-        try
+        try // ��������� ������
         {
-            using (User11Context db = new User11Context())
+            using (User11Context db = new User11Context()) // ����������� � ��
             {
-                int id = db.Employees.Max(it => it.EmployeesId) + 1;
+                // �������� ��� ������ � ������
+                int id = db.Employees.Max(it => it.EmployeesId) + 1; // ���� ������������ ID ������������ � ���������� "1"
                 string Name = NameTextBox.Text;
                 string Login = LoginTextBox.Text;
                 string position = PositionUser;
@@ -44,8 +45,9 @@ public partial class Registration : Window
                 TimeOnly Time = TimeOnly.FromDateTime(DateTime.Now);
                 bool Entrance = true;
 
-                var newUser = new Employee
+                var newUser = new Employee // ������ ��������� ������ Employee
                 {
+                    // ��������� ����������
                     EmployeesId = id,
                     EmployeesName = Name,
                     EmployeesLogin = Login,
@@ -55,32 +57,32 @@ public partial class Registration : Window
                     EmployeesDateHour = Time,
                     EmployeesEntrance = Entrance,
                 };
-                db.Employees.Add(newUser);
-                db.SaveChanges();
 
-                switch (PositionUser)
+                db.Employees.Add(newUser); // ��������� ������ � �������
+                db.SaveChanges(); // ��������� ��������� � ��
+
+                switch (PositionUser) // ��������� ������������
                 {
                     case "��������": SellerOneClikc(newUser); break;
                     case "������� �����": ShiftSupervisorOneClikc(newUser); break;
                 }
-                UserLogin = LoginTextBox.Text;
             }
         }
         catch (Exception ex)
         {
-            ExceptionDispatchInfo.Capture(ex).Throw();
+            Console.WriteLine(ex.Message); // ����� ������ � ��������
         }
     }
 
     private void SellerOneClikc(Employee newUser)
     {
         new Seller(newUser).Show();
-        Close();
+        Close(); // ��������� ������� ����
     }
 
     private void ShiftSupervisorOneClikc(Employee newUser)
     {
         new ShiftSupervisor(newUser).Show();
-        Close();
+        Close(); // ��������� ������� ����
     }
 }
diff --git a/demo_blagodat/Admin.axaml b/demo_blagodat/Users/Admin.axaml
similarity index 100%
rename from demo_blagodat/Admin.axaml
rename to demo_blagodat/Users/Admin.axaml
diff --git a/demo_blagodat/Admin.axaml.cs b/demo_blagodat/Users/Admin.axaml.cs
similarity index 54%
rename from demo_blagodat/Admin.axaml.cs
rename to demo_blagodat/Users/Admin.axaml.cs
index be94fab..53744cb 100644
--- a/demo_blagodat/Admin.axaml.cs
+++ b/demo_blagodat/Users/Admin.axaml.cs
@@ -12,45 +12,51 @@ namespace demo_blagodat;
 
 public partial class Admin : Window
 {
-    public Employee User;
+    public Employee User; // ������ ������������
     public Admin(Employee user)
     {
         InitializeComponent();
-        User = user;
-        HelloUser.Text = HelloUser.Text + User.EmployeesName;
+        User = user; // ������� ������ ������������ � ��������� ����������
+
+        HelloUser.Text = HelloUser.Text + User.EmployeesName; // ������������ ������������
     }
 
+    // ����� � ���� �����������
     private void ExitAuthorization(object sender, RoutedEventArgs e)
     {
         new Authorization().Show();
-        using (User11Context db = new User11Context())
-        {
-            var corrUser = db.Employees.Where(x => x.EmployeesLogin == User.EmployeesLogin).FirstOrDefault();
-            corrUser.EmployeesEntrance = false;
-            db.SaveChanges();
-        }
-        Close();
+        activityUpdate();
+        Close(); // ��������� ������� ����
     }
 
     private void Exit(object sender, RoutedEventArgs e)
     {
-        using (User11Context db = new User11Context())
-        {
-            var corrUser = db.Employees.Where(x => x.EmployeesLogin == User.EmployeesLogin).FirstOrDefault();
-            corrUser.EmployeesEntrance = false;
-            db.SaveChanges();
-        }
+        activityUpdate(); // ����� ��� ���������� ���������� �� false
         Close();
     }
 
+    // ������ �������� � ���� �������� �������
     private void createOrder(object sender, RoutedEventArgs e)
     {
         new CreateOrder(User).Show();
         Close();
     }
+
+    // ������ �������� � ���� ��������� ��������
     private void addClient(object sender, RoutedEventArgs e)
     {
         new AddClient(User).Show();
         Close();
     }
+
+    // ����� ��� ���������� ���������� �� false
+    private void activityUpdate()
+    {
+        using (User11Context db = new User11Context()) // ����������� � ��
+        {
+            var corrUser = db.Employees.Where(x => x.EmployeesLogin == User.EmployeesLogin).FirstOrDefault();
+            corrUser.EmployeesEntrance = false; // ������ � ��������� "����������" True �� False
+            db.SaveChanges(); // ��������� ��������� � ��
+        }
+    }
 }
diff --git a/demo_blagodat/Seller.axaml b/demo_blagodat/Users/Seller.axaml
similarity index 100%
rename from demo_blagodat/Seller.axaml
rename to demo_blagodat/Users/Seller.axaml
diff --git a/demo_blagodat/Seller.axaml.cs b/demo_blagodat/Users/Seller.axaml.cs
similarity index 50%
rename from demo_blagodat/Seller.axaml.cs
rename to demo_blagodat/Users/Seller.axaml.cs
index 22455b9..3398872 100644
--- a/demo_blagodat/Seller.axaml.cs
+++ b/demo_blagodat/Users/Seller.axaml.cs
@@ -12,44 +12,44 @@ namespace demo_blagodat;
 
 public partial class Seller : Window
 {
-    public Employee User;
-    public Seller(Employee user)
+    public Employee User; // ������ ������������ (��������� ����������)
+    public Seller(Employee user) // �������� ������ ������������
     {
         InitializeComponent();
-        User = user;
-        HelloUser.Text = HelloUser.Text + User.EmployeesName;
+        User = user; // ������� ������ ������������ � ��������� ����������
+        HelloUser.Text = HelloUser.Text + User.EmployeesName; // ������������ ������������
     }
     private void ExitAuthorization(object sender, RoutedEventArgs e)
     {
         new Authorization().Show();
-        using(User11Context db = new User11Context())
-        {
-            var corrUser = db.Employees.Where(x => x.EmployeesLogin == User.EmployeesLogin).FirstOrDefault();
-            corrUser.EmployeesEntrance = false;
-            db.SaveChanges();
-        }
-        Close();
+        activityUpdate();// ����� ��� ���������� ���������� �� false
+        Close(); // ��������� ������� ����
     }
 
     private void Exit(object sender, RoutedEventArgs e)
     {
-        using (User11Context db = new User11Context())
-        {
-            var corrUser = db.Employees.Where(x => x.EmployeesLogin == User.EmployeesLogin).FirstOrDefault();
-            corrUser.EmployeesEntrance = false;
-            db.SaveChanges();
-        }
-        Close();
+        activityUpdate(); // ����� ��� ���������� ���������� �� false
+        Close(); // ��������� ������� ����
     }
 
     private void createOrder(object sender, RoutedEventArgs e)
     {
         new CreateOrder(User).Show();
-        Close();
+        Close(); // ��������� ������� ����
     }
     private void addClient(object sender, RoutedEventArgs e)
     {
         new AddClient(User).Show();
-        Close();
+        Close(); // ��������� ������� ����
+    }
+
+    private void activityUpdate()
+    {
+        using (User11Context db = new User11Context()) // ����������� � ��
+        {
+            var corrUser = db.Employees.Where(x => x.EmployeesLogin == User.EmployeesLogin).FirstOrDefault();
+            corrUser.EmployeesEntrance = false; // ������ � ��������� "����������" True �� False
+            db.SaveChanges(); // ��������� ��������� � ��
+        }
     }
 }
diff --git a/demo_blagodat/ShiftSupervisor.axaml b/demo_blagodat/Users/ShiftSupervisor.axaml
similarity index 100%
rename from demo_blagodat/ShiftSupervisor.axaml
rename to demo_blagodat/Users/ShiftSupervisor.axaml
diff --git a/demo_blagodat/ShiftSupervisor.axaml.cs b/demo_blagodat/Users/ShiftSupervisor.axaml.cs
similarity index 62%
rename from demo_blagodat/ShiftSupervisor.axaml.cs
rename to demo_blagodat/Users/ShiftSupervisor.axaml.cs
index bbc10a6..0ec7179 100644
--- a/demo_blagodat/ShiftSupervisor.axaml.cs
+++ b/demo_blagodat/Users/ShiftSupervisor.axaml.cs
@@ -8,11 +8,11 @@ namespace demo_blagodat;
 
 public partial class ShiftSupervisor : Window
 {
-    public Employee User;
-    public ShiftSupervisor(Employee user)
+    public Employee User; // ������ ������������ (��������� ����������)
+    public ShiftSupervisor(Employee user) // �������� ������ ������������
     {
         InitializeComponent();
-        User = user;
+        User = user; // ������� ������ ������������ � ��������� ����������
     }
     public void Exit(object sender, RoutedEventArgs e)
     {
diff --git a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll
index b43bd3d..5941c46 100644
Binary files a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll and b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll differ
diff --git a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe
index a24c683..6f80274 100644
Binary files a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe and b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe differ
diff --git a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb
index b586ff2..1c329c4 100644
Binary files a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb and b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb differ
diff --git a/demo_blagodat/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/demo_blagodat/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache
index 52667f5..019c09c 100644
--- a/demo_blagodat/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache
+++ b/demo_blagodat/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache
@@ -1 +1 @@
-e2862a0fdd3376185dfabbae52c67d720bbba1cc665eb9f5619f16a30fff9261
+587c6bac365720a8d2bbdeb7a2ee455b6747d01e0902eac9a6bf9026eb160acf
diff --git a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll
index b43bd3d..5941c46 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll differ
diff --git a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb
index b586ff2..1c329c4 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb and b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb differ
diff --git a/demo_blagodat/obj/Debug/net8.0/Avalonia/resources b/demo_blagodat/obj/Debug/net8.0/Avalonia/resources
index 25f9745..2892609 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/Avalonia/resources and b/demo_blagodat/obj/Debug/net8.0/Avalonia/resources differ
diff --git a/demo_blagodat/obj/Debug/net8.0/apphost.exe b/demo_blagodat/obj/Debug/net8.0/apphost.exe
index a24c683..6f80274 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/apphost.exe and b/demo_blagodat/obj/Debug/net8.0/apphost.exe differ
diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs
index f766387..018013b 100644
--- a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs
+++ b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("demo_blagodat")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2e74cf1d5d3ba7d67ec5e1e7f82eb3dbc9049a33")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+110362f3fc4c907df6f7adeafb5f733533326568")]
 [assembly: System.Reflection.AssemblyProductAttribute("demo_blagodat")]
 [assembly: System.Reflection.AssemblyTitleAttribute("demo_blagodat")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache
index 8acf4dc..89258e9 100644
--- a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache
+++ b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache
@@ -1 +1 @@
-71985eb52f2155cee0fce6b8282760c334b0f233c9de818568a3939bfb7ab19c
+cbcb50529ef34f85de31420edc7cd8f286a0c01d84c740e2f2a4f10765d919d2
diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.GeneratedMSBuildEditorConfig.editorconfig b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.GeneratedMSBuildEditorConfig.editorconfig
index d4a4cd1..de23257 100644
--- a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.GeneratedMSBuildEditorConfig.editorconfig
+++ b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.GeneratedMSBuildEditorConfig.editorconfig
@@ -21,29 +21,26 @@ build_property.EnableGeneratedComInterfaceComImportInterop =
 build_property.EffectiveAnalysisLevelStyle = 8.0
 build_property.EnableCodeStyleSeverity = 
 
-[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/AddClient.axaml]
-build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
-
-[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Admin.axaml]
-build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
-
 [C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/App.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
 
 [C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Authorization.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
 
-[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/CreateOrder.axaml]
+[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Functions/AddClient.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
 
-[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/MainWindow.axaml]
+[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Functions/CreateOrder.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
 
 [C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Registration.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
 
-[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Seller.axaml]
+[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Users/Admin.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
 
-[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/ShiftSupervisor.axaml]
+[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Users/Seller.axaml]
+build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
+
+[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Users/ShiftSupervisor.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache
index 6f8ddcf..c591c30 100644
--- a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache
+++ b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-7500a726078a1eda15bb168e89d59da35763a3413925e5d527cd7862258a6074
+40e3485ea6ee456ff08f179efa3e7e7f539492c04c12875cdde14ecd742da0e2
diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll
index 1c6a281..e8a5087 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll differ
diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb
index 2826a06..3a819d7 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb and b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb differ
diff --git a/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll
index 79fccb1..94fe945 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll differ
diff --git a/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll
index 79fccb1..94fe945 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll differ
diff --git a/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll
index 369970c..e3c3959 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll differ