diff --git a/Labaratory/Labaratory/Labaratory.csproj b/Labaratory/Labaratory/Labaratory.csproj
index 51cf7ba..afd20ea 100644
--- a/Labaratory/Labaratory/Labaratory.csproj
+++ b/Labaratory/Labaratory/Labaratory.csproj
@@ -95,76 +95,16 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="Models\Analyzer.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Analyzer_Logs.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\LoggnHistory.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
     <Compile Include="Services\AuthService.cs" />
     <Compile Include="Services\StringToImageConverter.cs" />
     <Compile Include="Services\Valid.cs" />
     <Compile Include="ViewModels\AddPatientViewModel.cs" />
     <Compile Include="ViewModels\BaseViewModel.cs" />
-    <Compile Include="Models\Insurance_Companies.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Invoice.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
     <Compile Include="ViewModels\ByhalterModel.cs" />
     <Compile Include="ViewModels\Laborant.cs" />
     <Compile Include="ViewModels\LaborantExplorer.cs" />
     <Compile Include="ViewModels\LoginViewModel.cs" />
-    <Compile Include="Models\Model1.Context.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Model1.Context.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Model1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Model1.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Model1.edmx</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Order.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Order_Items.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Order_Statuses.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Patient.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Policy_Types.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Rendered_Services.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Role.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Service.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Models\Service_Statuses.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
     <Compile Include="Services\SessionManager.cs" />
-    <Compile Include="Models\User.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
     <Page Include="Views\AddPatientWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -232,13 +172,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EntityDeploy Include="Models\Model1.edmx">
-      <Generator>EntityModelCodeGenerator</Generator>
-      <LastGenOutput>Model1.Designer.cs</LastGenOutput>
-    </EntityDeploy>
-    <None Include="Models\Model1.edmx.diagram">
-      <DependentUpon>Model1.edmx</DependentUpon>
-    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -253,20 +186,13 @@
     <Resource Include="Images\LaborantExplorer.png" />
     <Resource Include="Images\Admin.png" />
     <Resource Include="Images\Buhalter.jpeg" />
-    <Content Include="Models\Model1.Context.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>Model1.Context.cs</LastGenOutput>
-      <DependentUpon>Model1.edmx</DependentUpon>
-    </Content>
-    <Content Include="Models\Model1.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <DependentUpon>Model1.edmx</DependentUpon>
-      <LastGenOutput>Model1.cs</LastGenOutput>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Models\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/Labaratory/Labaratory/ViewModels/Laborant.cs b/Labaratory/Labaratory/ViewModels/Laborant.cs
index 8c30691..c3ec1a8 100644
--- a/Labaratory/Labaratory/ViewModels/Laborant.cs
+++ b/Labaratory/Labaratory/ViewModels/Laborant.cs
@@ -24,6 +24,7 @@ namespace Labaratory.ViewModels
         public Laborant(Models.User user)
         {
             CurrentUser = user;
+            RoleName = CurrentUser.Role1?.RoleName ?? "Роль не назначена";
             CalculateNextNumber();
             StartTimer();
             ProcessOrderCommand = new RelayCommand<object>(execute => ProcessOrder());
@@ -36,9 +37,45 @@ namespace Labaratory.ViewModels
         private decimal _totalCost;
         private string nameRole;
         private DispatcherTimer _timer;
-        private TimeSpan _timeSpan = TimeSpan.FromMinutes(2.5);
+        private TimeSpan _timeSpan = TimeSpan.FromHours(2.5);
 
         private string _time;
+        public string RoleName
+        {
+            get => nameRole;
+            set { nameRole = value; OnPropertyChanged(); }
+        }
+        public List<Models.Service> AllServices => db.Services.ToList();
+        public ICommand ProcessOrderCommand { get; }
+        public Patient SelectedPatient
+        {
+            get => _selectedPatient;
+            set { _selectedPatient = value; OnPropertyChanged(); }
+        }
+        public ObservableCollection<Models.Service> SelectedServices
+        {
+            get;
+            set;
+        } = new ObservableCollection<Models.Service>();
+
+
+        public decimal TotalCost
+        {
+            get => _totalCost;
+            set { _totalCost = value; OnPropertyChanged(); }
+        }
+
+        public string BarcodeInput
+        {
+            get => _barcodeInput;
+            set { _barcodeInput = value; OnPropertyChanged(); }
+        }
+
+        public string SuggestedNumber
+        {
+            get => _suggestedNumber;
+            set { _suggestedNumber = value; OnPropertyChanged(); }
+        }
         public string Time
         {
             get => _time;
@@ -83,42 +120,6 @@ namespace Labaratory.ViewModels
                 }
             }
         }
-        public string RoleName
-        {
-            get => nameRole;
-            set { nameRole = value; OnPropertyChanged(); }
-        }
-        public List<Models.Service> AllServices => db.Services.ToList();
-        public ICommand ProcessOrderCommand { get; }
-        public Patient SelectedPatient
-        {
-            get => _selectedPatient;
-            set { _selectedPatient = value; OnPropertyChanged(); }
-        }
-        public ObservableCollection<Models.Service> SelectedServices 
-        { 
-            get;
-            set;
-        } = new ObservableCollection<Models.Service>();
-
-
-        public decimal TotalCost
-        {
-            get => _totalCost;
-            set { _totalCost = value; OnPropertyChanged(); }
-        }
-
-        public string BarcodeInput
-        {
-            get => _barcodeInput;
-            set { _barcodeInput = value; OnPropertyChanged(); }
-        }
-
-        public string SuggestedNumber
-        {
-            get => _suggestedNumber;
-            set { _suggestedNumber = value; OnPropertyChanged(); }
-        }
         private void CalculateNextNumber()
         {
             var lastId = db.Orders.OrderByDescending(o => o.ID_Order).Select(o => o.ID_Order).FirstOrDefault();
diff --git a/Labaratory/Labaratory/Views/LaborantWindow.xaml b/Labaratory/Labaratory/Views/LaborantWindow.xaml
index 6ff2d43..06324ab 100644
--- a/Labaratory/Labaratory/Views/LaborantWindow.xaml
+++ b/Labaratory/Labaratory/Views/LaborantWindow.xaml
@@ -134,7 +134,7 @@
                         <StackPanel>
                             <Ellipse Width="150" Height="150" Stroke="{ui:ThemeResource SystemAccentColorPrimaryBrush}" StrokeThickness="2">
                                 <Ellipse.Fill>
-                                    <ImageBrush ImageSource="/Images/Admin.png" 
+                                    <ImageBrush ImageSource="/Images/Laborant.jpeg" 
                                     Stretch="UniformToFill"/>
                                 </Ellipse.Fill>
                             </Ellipse>