diff --git a/.gitignore b/.gitignore
index 95b3136..90a3256 100644
--- a/.gitignore
+++ b/.gitignore
@@ -342,3 +342,4 @@ healthchecksdb
 /src/WorkFlowCheck.API/Images
 *.pdf
 /src/WorkFlowCheck.API/Pdf/c86f3a6a-c646-4627-823c-7e24134b7725.docx
+/src/WorkFlowCheck.API/Downloads/APK/com.nuvolar.wfcapp-Signed.apk
diff --git a/src/WorkFlowCheck.API/Downloads/APK/com.nuvolar.wfcapp-Signed.apk b/src/WorkFlowCheck.API/Downloads/APK/com.nuvolar.wfcapp-Signed.apk
deleted file mode 100644
index c4ae6ff..0000000
Binary files a/src/WorkFlowCheck.API/Downloads/APK/com.nuvolar.wfcapp-Signed.apk and /dev/null differ
diff --git a/src/WorkFlowCheck.BL/Services/CheckListService.cs b/src/WorkFlowCheck.BL/Services/CheckListService.cs
index d6ed01b..3e810c0 100644
--- a/src/WorkFlowCheck.BL/Services/CheckListService.cs
+++ b/src/WorkFlowCheck.BL/Services/CheckListService.cs
@@ -170,7 +170,7 @@ namespace WorkFlowCheck.BL.Services
                     IsEditable = true,
                     UserId = checkListHeaderNewDTO.UserId,
                     ShortName = "",
-                    Description = "",
+                    Description = checkListTemplateHeader.Description ?? "",
                     DocumentNumber = documentNumber,
                     GuidNumber = Guid.NewGuid(),
                     IsDeleted = false,
@@ -227,7 +227,10 @@ namespace WorkFlowCheck.BL.Services
                     checkListHeader.CheckStatus = CheckStatus.Signed;
                     checkListHeader.IsEditable = false;
                     checkListHeader.AcceptUserId = userid;
-                    Log.ForContext("TAG", "BusinessFlow").Warning($"Ellenőrzési lap státuszváltozása, jóváhasyás: Ellenőrzés:{id}, Felhasználó:{userid}");
+
+                    checkListHeader.DateExecution = DateTime.Now;
+
+                    Log.ForContext("TAG", "BusinessFlow").Warning($"Ellenőrzési lap státuszváltozása, jóváhagyás: Ellenőrzés:{checkListHeader.DocumentNumber}, Felhasználó: {checkListHeader.AcceptUser.LastName} {checkListHeader.AcceptUser.FirstName}");
                     await _dbContext.SaveChangesAsync();
 
                     var pdf = await CreateCheckListHeaderPDFAsync(id);
diff --git a/src/WorkFlowCheck.BL/Services/SyncService.cs b/src/WorkFlowCheck.BL/Services/SyncService.cs
index 85c8744..0bd085d 100644
--- a/src/WorkFlowCheck.BL/Services/SyncService.cs
+++ b/src/WorkFlowCheck.BL/Services/SyncService.cs
@@ -212,8 +212,7 @@ namespace WorkFlowCheck.BL.Services
                     var res = await _dbContext.Locations.Where(w => w.Id == LocationDTO.Id).FirstOrDefaultAsync();
                     if (res != null)
                     {
-                        res = _mapper.Map<DL.Entities.Location>(LocationDTO);
-
+                        res.FullName = LocationDTO.FullName;
                         await _dbContext.SaveChangesAsync();
 
                         retVal = _mapper.Map<LocationDTO>(res);
@@ -349,9 +348,10 @@ namespace WorkFlowCheck.BL.Services
             try
             {
                 var res = await _dbContext.CheckListHeaders
-                                          .Where(w => (w.IsEditable &&
-                                                      w.IsDeleted != true) || (w.CheckStatus == CheckStatus.Blocked)
-                                                      )
+                                          .Where(w => w.CheckStatus == CheckStatus.Open ||
+                                                      w.CheckStatus == CheckStatus.InProgress ||
+                                                      w.CheckStatus == CheckStatus.Blocked ||
+                                                      w.CheckStatus == CheckStatus.Sent)
                                           .Include(i => i.CheckListRows)
                                           //.ThenInclude(i => i.CheckListTemplateRow)
                                           .AsNoTracking()
@@ -385,43 +385,6 @@ namespace WorkFlowCheck.BL.Services
                     if (res != null && (res.CheckStatus == CheckStatus.Open ||
                                         res.CheckStatus == CheckStatus.InProgress))
                     {
-                        if (NeedBlocking(checkListHeaderDTO))
-                        {
-                            /// TODO: blokkolás miatt
-                            res.CheckStatus = CheckStatus.Blocked;
-                            await _dbContext.SaveChangesAsync();
-
-                            Log.ForContext("TAG", "BusinessFlow").Warning($"Ellenőrzési lap blokkolva: Ellenőrzés:{checkListHeaderDTO.Id}, Felhasználó:{_requestContext.CurrentUsername}");
-
-                            var user = await _userService.GetUserAsync(_requestContext.CurrentUserId ?? 1);
-
-                            foreach (var item in user.RoleDTO)
-                            {
-                                var deviceMessageDTO = new DeviceMessageDTO()
-                                {
-                                    IsReaded = false,
-                                    Message = $"Ellenőrző lap blokkolva! [{checkListHeaderDTO.DocumentNumber}]",
-                                    SendDate = DateTime.UtcNow,
-                                    ExtraDataJSON = "",
-                                    RoleId = item.ParentId,
-                                    DeviceIdFrom = "",
-                                    DeviceIdTo = "",
-                                };
-
-                                await this.DeviceMessageSend(deviceMessageDTO);
-                                
-                                var fCMMessageDTO = new FCMMessageDTO
-                                {
-                                    Body = deviceMessageDTO.Message,
-                                    Title = "Blokkolási értesítés",
-                                    UserId = user.Id,
-                                };
-                                await _messageService.SendFCMMessageToLastToken(fCMMessageDTO);
-                            }
-                            return retVal;
-                        }
-
-                        res.CheckStatus = CheckStatus.InProgress;
                         var ids = checkListHeaderDTO.CheckListRowDTO?.Select(r => r.Id).ToList();
                         if (ids != null && ids.Count > 0)
                         {
@@ -448,6 +411,47 @@ namespace WorkFlowCheck.BL.Services
                                 }
                             }
                         }
+                        await _dbContext.SaveChangesAsync();
+                        retVal = _mapper.Map<CheckListHeaderDTO>(res);
+                        
+                        if (NeedBlocking(checkListHeaderDTO))
+                        {
+                            /// TODO: blokkolás miatt
+                            res.CheckStatus = CheckStatus.Blocked;
+                            await _dbContext.SaveChangesAsync();
+
+                            Log.ForContext("TAG", "BusinessFlow").Warning($"Ellenőrzési lap blokkolva: Ellenőrzés:{checkListHeaderDTO.Id}, Felhasználó:{_requestContext.CurrentUsername}");
+
+                            var user = await _userService.GetUserAsync(_requestContext.CurrentUserId ?? 1);
+
+                            foreach (var item in user.RoleDTO)
+                            {
+                                var deviceMessageDTO = new DeviceMessageDTO()
+                                {
+                                    IsReaded = false,
+                                    Message = $"Ellenőrző lap blokkolva! [{checkListHeaderDTO.DocumentNumber}]",
+                                    SendDate = DateTime.UtcNow,
+                                    ExtraDataJSON = "",
+                                    RoleId = item.ParentId,
+                                    DeviceIdFrom = "",
+                                    DeviceIdTo = "",
+                                };
+
+                                await this.DeviceMessageSend(deviceMessageDTO);
+
+                                var fCMMessageDTO = new FCMMessageDTO
+                                {
+                                    Body = deviceMessageDTO.Message,
+                                    Title = "Blokkolási értesítés",
+                                    UserId = user.Id,
+                                };
+                                await _messageService.SendFCMMessageToLastToken(fCMMessageDTO);
+                            }
+                            return retVal;
+                        }
+
+                        res.CheckStatus = CheckStatus.InProgress;
+                        
                         if (CheckIfLastReached(checkListHeaderDTO))
                         {
                             /// TODO: most kell a CheckStatust állítani és menjen üzenet !
diff --git a/src/WorkFlowCheck.Common/DTO/EquipmentDTO.cs b/src/WorkFlowCheck.Common/DTO/EquipmentDTO.cs
index c738bc6..d9d737f 100644
--- a/src/WorkFlowCheck.Common/DTO/EquipmentDTO.cs
+++ b/src/WorkFlowCheck.Common/DTO/EquipmentDTO.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,7 +11,13 @@ namespace WorkFlowCheck.Common.DTO
     public class EquipmentDTO
     {
         public int Id { get; set; }
+        
+        [Required(ErrorMessage = "A megnevezést megadása kötelező.")]
+        [DisplayName("Megnevezés")]
         public string ShortName { get; set; } = null!;
+
+        [Required(ErrorMessage = "Az azonosító megadása kötelező.")]
+        [DisplayName("Azonosító")]
         public string EquipmentNumber { get; set; } = null!;
     }
 }
diff --git a/src/WorkFlowCheck.Common/DTO/LocationDTO.cs b/src/WorkFlowCheck.Common/DTO/LocationDTO.cs
index 6f4e74b..7237f7a 100644
--- a/src/WorkFlowCheck.Common/DTO/LocationDTO.cs
+++ b/src/WorkFlowCheck.Common/DTO/LocationDTO.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,6 +11,9 @@ namespace WorkFlowCheck.Common.DTO
     public class LocationDTO
     {
         public int Id { get; set; }
+        
+        [Required(ErrorMessage = "A megnevezést megadása kötelező.")]
+        [DisplayName("Megnevezés")]
         public string FullName { get; set; } = null!;
     }
 }
diff --git a/src/WorkFlowCheck.Common/DTO/RoleCheckListTemplateHeaderDTO.cs b/src/WorkFlowCheck.Common/DTO/RoleCheckListTemplateHeaderDTO.cs
index a7f8f43..e8eafe5 100644
--- a/src/WorkFlowCheck.Common/DTO/RoleCheckListTemplateHeaderDTO.cs
+++ b/src/WorkFlowCheck.Common/DTO/RoleCheckListTemplateHeaderDTO.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Data;
 using System.Linq;
 using System.Text;
@@ -10,10 +12,19 @@ namespace WorkFlowCheck.Common.DTO
     public class RoleCheckListTemplateHeaderDTO
     {
         public int Id { get; set; }
+        
+        [Required(ErrorMessage = "A szabály megnevezésének megadása kötelező.")]
+        [DisplayName("Szabály")]
         public int RoleId { get; set; }
         public RoleDTO? RoleDTO { get; set; } = null!;
+        
+        [Required(ErrorMessage = "Az ellenőrzési sablon megadása kötelező.")]
+        [DisplayName("Ellenőrzési sablon")]
         public int CheckListTemplateHeaderId { get; set; }
         public CheckListTemplateHeaderDTO? CheckListTemplateHeaderDTO { get; set; } = null!;
+
+        
+        [DisplayName("Engedélyezve?")]
         public bool Enabled { get; set; } = false;
     }
 }
diff --git a/src/WorkFlowCheck.Common/DTO/RoleCheckPointDTO.cs b/src/WorkFlowCheck.Common/DTO/RoleCheckPointDTO.cs
index f12040b..d07b23b 100644
--- a/src/WorkFlowCheck.Common/DTO/RoleCheckPointDTO.cs
+++ b/src/WorkFlowCheck.Common/DTO/RoleCheckPointDTO.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Data;
 using System.Linq;
 using System.Text;
@@ -10,10 +12,18 @@ namespace WorkFlowCheck.Common.DTO
     public class RoleCheckPointDTO
     {
         public int Id { get; set; }
+
+        [Required(ErrorMessage = "A szabály megadása kötelező.")]
+        [DisplayName("Szabály")]
         public int RoleId { get; set; }
         public RoleDTO? RoleDTO { get; set; } = null!;
+
+        [Required(ErrorMessage = "Az ellenőrzési pont megadása kötelező.")]
+        [DisplayName("Ellenőrzési pont")]
         public int CheckPointId { get; set; }
         public CheckPointDTO? CheckPointDTO { get; set; } = null!;
+        
+        [DisplayName("Engedélyezve?")]
         public bool Enabled { get; set; } = false;
     }
 }
diff --git a/src/WorkFlowCheck.Common/DTO/UserChangePassword2FADTO.cs b/src/WorkFlowCheck.Common/DTO/UserChangePassword2FADTO.cs
index d4f7cd9..f6522fe 100644
--- a/src/WorkFlowCheck.Common/DTO/UserChangePassword2FADTO.cs
+++ b/src/WorkFlowCheck.Common/DTO/UserChangePassword2FADTO.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -16,9 +17,13 @@ namespace WorkFlowCheck.Common.DTO
         [DisplayName("Régi jelszó")]
         public string OldPassword { get; set; } = null!;
 
+        [Required(ErrorMessage = "A jelszó kötelező.")]
+        [RegularExpression(@"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).{6,}$", ErrorMessage = "Az új jelszónak legalább 6 karakter hosszúnak kell lennie, és tartalmaznia kell kis- és nagybetűt, számot és speciális karaktert.")]
         [DisplayName("Új jelszó")]
         public string NewPassword1 { get; set; } = null!;
 
+        [Required(ErrorMessage = "A jelszó kötelező.")]
+        [RegularExpression(@"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).{6,}$", ErrorMessage = "Az új jelszónak legalább 6 karakter hosszúnak kell lennie, és tartalmaznia kell kis- és nagybetűt, számot és speciális karaktert.")]
         [DisplayName("Jelszó megerősítése")]
         public string NewPassword2 { get; set; } = null!;
 
diff --git a/src/WorkFlowCheck.Common/DTO/UserDTO.cs b/src/WorkFlowCheck.Common/DTO/UserDTO.cs
index 705245b..3230ddf 100644
--- a/src/WorkFlowCheck.Common/DTO/UserDTO.cs
+++ b/src/WorkFlowCheck.Common/DTO/UserDTO.cs
@@ -25,9 +25,12 @@ namespace WorkFlowCheck.Common.DTO
         [DisplayName("Felhasználó neve")]
         public string UserName { get;set; } = null!;
 
+        [Required(ErrorMessage = "A jelszó kötelező.")]
+        [RegularExpression(@"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).{6,}$", ErrorMessage = "A jelszónak legalább 6 karakter hosszúnak kell lennie, és tartalmaznia kell kis- és nagybetűt, számot és speciális karaktert.")]
         [DisplayName("Jelszó")]
-        public string Password { get; set; }   
-        
+        public string Password { get; set; } = null!;
+
+
         public string JwtToken { get; set; } = null!;
 
         [DisplayName("Aktív")]
diff --git a/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs b/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs
index a07517b..b1d1405 100644
--- a/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs
+++ b/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs
@@ -19,7 +19,7 @@ namespace WorkFlowCheck.MAUI.Helper
         public static string DatabaseName = "";
         public static bool Syncronised = false;
         public static UserDTO SystemUserDTO;
-        public static string ProgramVersion = "v1.1.027";
+        public static string ProgramVersion = "v1.1.030";
 
 #if DEBUG
         public static string ApiBaseUrl = $"https://dev.wfcapi.nuvolar.hu/";
diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml
index 1ceea00..9d8b944 100644
--- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml
+++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml
@@ -38,7 +38,7 @@
             </HorizontalStackLayout>
         </Grid>
     </Shell.TitleView>
-    
+
     <Grid RowDefinitions="*,4*,2*" Padding="30,30">
         <VerticalStackLayout Grid.Row="0" Margin="0,0,0,0">
             <Label x:Name="progressLabel" Text="Folyamatjelző" FontSize="Medium" HorizontalOptions="Center" />
@@ -63,7 +63,7 @@
                         CornerRadius="25"
                         VerticalOptions="Center" />
             </HorizontalStackLayout>
-           
+
         </VerticalStackLayout>
         <Frame Grid.Row="1"
                BorderColor="Gray" 
@@ -198,20 +198,23 @@
                    Margin="1" 
                    CornerRadius="10"
                    HasShadow="True">
-            <ScrollView>
-                <VerticalStackLayout>
-                    <Label Text="Új ellenőrzés" FontAttributes="Bold" FontSize="Medium" HorizontalOptions="Center" />
-                    <CollectionView x:Name="CheckListTemplate">
-                        <CollectionView.ItemTemplate>
-                            <DataTemplate>
-                                <Frame BorderColor="Gray" Padding="10" Margin="5" HasShadow="True" BackgroundColor="WhiteSmoke">
-                                    <Grid ColumnDefinitions="*,Auto">
-                                        <StackLayout>
-                                            <Label Text="{Binding ShortName}" FontSize="16" FontAttributes="Bold" />
-                                            <Label Text="{Binding Description}" FontSize="14" />
-                                        </StackLayout>
-                                        <HorizontalStackLayout HorizontalOptions="End">
-                                            <Button Text="Új ellenőrzés" 
+            <RefreshView x:Name="CheckListTemplateRefreshView"
+             IsRefreshing="{Binding IsRefreshingT}"
+             Command="{Binding RefreshCommandT}">
+                <ScrollView>
+                    <VerticalStackLayout>
+                        <Label Text="Új ellenőrzés" FontAttributes="Bold" FontSize="Medium" HorizontalOptions="Center" />
+                        <CollectionView x:Name="CheckListTemplate">
+                            <CollectionView.ItemTemplate>
+                                <DataTemplate>
+                                    <Frame BorderColor="Gray" Padding="10" Margin="5" HasShadow="True" BackgroundColor="WhiteSmoke">
+                                        <Grid ColumnDefinitions="*,Auto">
+                                            <StackLayout>
+                                                <Label Text="{Binding ShortName}" FontSize="16" FontAttributes="Bold" />
+                                                <Label Text="{Binding Description}" FontSize="14" />
+                                            </StackLayout>
+                                            <HorizontalStackLayout HorizontalOptions="End">
+                                                <Button Text="Új ellenőrzés" 
                                                 BackgroundColor="Green"
                                                 Margin="5,0,0,0"
                                                 HeightRequest="50"
@@ -220,14 +223,15 @@
                                                 MaximumWidthRequest="120"
                                                 Command="{Binding BindingContext.NewCommand, Source={x:Reference CheckListTemplate}}" 
                                                 CommandParameter="{Binding .}" />
-                                        </HorizontalStackLayout>
-                                    </Grid>
-                                </Frame>
-                            </DataTemplate>
-                        </CollectionView.ItemTemplate>
-                    </CollectionView>
-                </VerticalStackLayout>
-            </ScrollView>
+                                            </HorizontalStackLayout>
+                                        </Grid>
+                                    </Frame>
+                                </DataTemplate>
+                            </CollectionView.ItemTemplate>
+                        </CollectionView>
+                    </VerticalStackLayout>
+                </ScrollView>
+            </RefreshView>
         </Frame>
         <Grid BackgroundColor="#80000000"
               IsVisible="{Binding IsLoading}"
diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs
index ac975af..64435fb 100644
--- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs
@@ -31,6 +31,7 @@ public partial class CheckListPage : ContentPage
     public ICommand InfoCommand { get; set; }
     public ICommand CloseCommand { get; set; }
     public ICommand RefreshCommand { get; }
+    public ICommand RefreshCommandT { get; }
 
     public bool IsLoading
     {
@@ -52,6 +53,7 @@ public partial class CheckListPage : ContentPage
     }
 
     private bool _isRefreshing;
+    private bool _isRefreshingT;
     public bool IsRefreshing
     {
         get => _isRefreshing;
@@ -64,6 +66,18 @@ public partial class CheckListPage : ContentPage
             }
         }
     }
+    public bool IsRefreshingT
+    {
+        get => _isRefreshingT;
+        set
+        {
+            if (_isRefreshingT != value)
+            {
+                _isRefreshingT = value;
+                OnPropertyChanged(nameof(IsRefreshingT));
+            }
+        }
+    }
 
     public CheckListPage()
     {
@@ -79,6 +93,7 @@ public partial class CheckListPage : ContentPage
         InfoCommand = new Command<CheckListHeaderDTO>(OnInfoItem);
         CloseCommand = new Command<CheckListHeaderDTO>(OnCloseItem);
         RefreshCommand = new Command(async () => await OnRefresh());
+        RefreshCommandT = new Command(async () => await OnRefreshT());
 
     }
     private async void OnSyncClicked(object sender, EventArgs e)
@@ -128,6 +143,16 @@ public partial class CheckListPage : ContentPage
 
         IsRefreshing = false;
     }
+    private async Task OnRefreshT()
+    {
+        IsRefreshingT = true;
+
+        //await _syncService.SyncCheckListHeader_Down((d, s) => { });
+
+        await LoadCheckListTemplate();  
+
+        IsRefreshingT = false;
+    }
     private void SetInfo()
     {
         _currentUser = _userService.GetCurrentUser();
diff --git a/src/WorkFlowCheck.Web/Helpers/AspForDataTypeTagHelper.cs b/src/WorkFlowCheck.Web/Helpers/AspForDataTypeTagHelper.cs
new file mode 100644
index 0000000..de3375e
--- /dev/null
+++ b/src/WorkFlowCheck.Web/Helpers/AspForDataTypeTagHelper.cs
@@ -0,0 +1,44 @@
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace WorkFlowCheck.Web.Helpers
+{
+    [HtmlTargetElement("input", Attributes = "asp-for-datatype")]
+    public class AspForDataTypeTagHelper : TagHelper
+    {
+        [HtmlAttributeName("asp-for-datatype")]
+        public ModelExpression For { get; set; }
+
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (For == null) return;
+
+            var type = For.ModelExplorer.ModelType;
+
+            string dataType = GetDataTypeString(type);
+            output.Attributes.SetAttribute("data-type", dataType);
+
+            // 🔥 EZ HIÁNYZIK → Rakd be!
+            output.Attributes.RemoveAll("asp-for-datatype");
+        }
+
+
+        private string GetDataTypeString(Type type)
+        {
+            // Nullable<T> esetén nyerjük ki az alaptípust
+            if (Nullable.GetUnderlyingType(type) is Type underlyingType)
+            {
+                type = underlyingType;
+            }
+
+            if (type == typeof(string)) return "string";
+            if (type == typeof(int) || type == typeof(long) || type == typeof(float) ||
+                type == typeof(double) || type == typeof(decimal)) return "number";
+            if (type == typeof(bool)) return "bool";
+            if (type == typeof(DateTime)) return "date";
+
+            return "string"; // default fallback
+        }
+
+    }
+}
diff --git a/src/WorkFlowCheck.Web/Helpers/SystemHelper.cs b/src/WorkFlowCheck.Web/Helpers/SystemHelper.cs
index 40cb4a8..7519383 100644
--- a/src/WorkFlowCheck.Web/Helpers/SystemHelper.cs
+++ b/src/WorkFlowCheck.Web/Helpers/SystemHelper.cs
@@ -7,7 +7,7 @@ namespace WorkFlowCheck.Web.Helpers
     public static class SystemHelper
     {
         public static string DatabaseName = "";
-        public static string ProgramVersion = "v1.1.025";
+        public static string ProgramVersion = "v1.1.027";
 
         public async static Task GetAPIInfoAsync(IConfiguration configuration)
         {
diff --git a/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentsPage.cshtml b/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentsPage.cshtml
index ab5b443..1c7a0ff 100644
--- a/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentsPage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentsPage.cshtml
@@ -79,7 +79,7 @@
         $('#tbEquipmentsPage').on('click', '.delete-btn', function ()
         {
             const row = table.row($(this).closest('tr')).data();
-            deleteEntity(table, '/BaseStock/Equipments/EquipmentPage?handler=DeleteEquipment', row.id);
+            deleteEntity(table, '/BaseStock/Equipments/EquipmentsPage?handler=DeleteEquipment', row.id);
         });
     </script>
 }
diff --git a/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationsPage.cshtml b/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationsPage.cshtml
index b0cc1a8..649e0d0 100644
--- a/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationsPage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationsPage.cshtml
@@ -17,14 +17,14 @@
         <thead class="table-primary">
             <tr>
                 <th>ID</th>
-                <th>Full name</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(LocationDTO.FullName), typeof(LocationDTO))</th>
                 <th class="text-center">Action</th>
             </tr>
         </thead>
         <tfoot class="table-light">
             <tr>
                 <th>ID</th>
-                <th>Full name</th>
+                <th>@DisplayNameHelper.GetDisplayName(nameof(LocationDTO.FullName), typeof(LocationDTO))</th>
                 <th>Action</th>
             </tr>
         </tfoot>
diff --git a/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml
index 47e2a92..78f9c11 100644
--- a/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml
@@ -33,23 +33,23 @@
             <div class="tab-pane fade show active" id="general" role="tabpanel">
                 <form method="post" id="CheckListHeaderForm">
                     <meta name="csrf-token" content="@Antiforgery.GetAndStoreTokens(HttpContext).RequestToken" />
-                    <input type="hidden" asp-for="CheckListHeaderDTO.Id" />
-                    <input type="hidden" asp-for="CheckListHeaderDTO.IsEditable" />
-                    <input type="hidden" asp-for="CheckListHeaderDTO.IsStorno" />
-                    <input type="hidden" asp-for="CheckListHeaderDTO.GuidNumber" />
-                    <input type="hidden" asp-for="CheckListHeaderDTO.CheckListTemplateHeaderId" />
-                    <input type="hidden" asp-for="CheckListHeaderDTO.UserId" />
-                    <input type="hidden" name="CheckListHeaderDTO.DateExecution" value="@Model.CheckListHeaderDTO.DateExecution.ToString("yyyy-MM-dd")" />
-                    <input type="hidden" asp-for="CheckListHeaderDTO.AcceptUserId" />
+                    <input type="hidden" asp-for="CheckListHeaderDTO.Id" data-type="int" />
+                    <input type="hidden" asp-for="CheckListHeaderDTO.IsEditable" data-type="bool" />
+                    <input type="hidden" asp-for="CheckListHeaderDTO.IsStorno" data-type="bool" />
+                    <input type="hidden" asp-for="CheckListHeaderDTO.GuidNumber"  />
+                    <input type="hidden" asp-for="CheckListHeaderDTO.CheckListTemplateHeaderId" data-type="int" />
+                    <input type="hidden" asp-for="CheckListHeaderDTO.UserId" data-type="int" />
+                    <input type="hidden" name="CheckListHeaderDTO.DateExecution" value="@Model.CheckListHeaderDTO.DateExecution.ToString("yyyy-MM-dd")"  />
+                    <input type="hidden" asp-for="CheckListHeaderDTO.AcceptUserId" data-type="int" />
                     <div class="row">
                         <div class="col-md-3">
                             <label asp-for="CheckListHeaderDTO.DocumentNumber"></label>
-                            <input asp-for="CheckListHeaderDTO.DocumentNumber" class="form-control" readonly />
+                            <input asp-for="CheckListHeaderDTO.DocumentNumber" class="form-control" readonly  />
                             <span asp-validation-for="CheckListHeaderDTO.DocumentNumber" class="text-danger"></span>
                         </div>
                         <div class="col-md-3">
                             <label asp-for="CheckListHeaderDTO.CheckStatus"></label>
-                            <select asp-for="CheckListHeaderDTO.CheckStatus" class="form-control" asp-items="Model.CheckStatus" readonly></select>
+                            <select asp-for="CheckListHeaderDTO.CheckStatus" class="form-control" asp-items="Model.CheckStatus" readonly data-type="int"></select>
                             <span asp-validation-for="CheckListHeaderDTO.CheckStatus" class="text-danger"></span>
                         </div>
                     </div>
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml
index 6f22ace..c17af80 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml
@@ -3,7 +3,7 @@
 @using Microsoft.AspNetCore.Antiforgery
 @inject IAntiforgery Antiforgery
 @{
-    ViewData["Title"] = "Ellenőrzési pont";
+    ViewData["Title"] = "Szabály - ellenőrzési sablon";
     var RoleCheckListTemplateHeaderId = Model.RoleCheckListTemplateHeaderDTO.Id;
     var urlPost = Url.Page("./RoleCheckListTemplateHeaderEditPage", "Save");
 }
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml
index 878e147..4b9363b 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml
@@ -15,18 +15,18 @@
         <thead class="table-primary">
             <tr>
                 <th>ID</th>
-                <th>Role name</th>
-                <th>Template name</th>
-                <th>Enabled</th>
+                <th>Szabály neve</th>
+                <th>Ellenőrzési sablon neve</th>
+                <th>Engedélyezve?</th>
                 <th class="text-center">Action</th>
             </tr>
         </thead>
         <tfoot class="table-light">
             <tr>
                 <th>ID</th>
-                <th>Role name</th>
-                <th>Template name</th>
-                <th>Enabled</th>
+                <th>Szabály neve</th>
+                <th>Ellenőrzési sablon neve</th>
+                <th>Engedélyezve?</th>
                 <th class="text-center">Action</th>
             </tr>
         </tfoot>
@@ -90,17 +90,7 @@
         $('#tbRoleCheckListTemplateHeadersPage').on('click', '.delete-btn', function ()
         {
             const row = table.row($(this).closest('tr')).data();
-            console.log(row);
-            showConfirmModal({
-                title: 'Törlés megerősítése',
-                message: 'Biztosan törölni szeretnéd ezt az elemet?',
-                okText: 'Törlés',
-                cancelText: 'Mégsem'
-            }).then(function(result) {
-                if(result === 'ok') {
-                    console.log('Törlés végrehajtva');
-                }
-            });
+            deleteEntity(table, '/UserAndRole/RoleCheckListTemplateHeadersPage?handler=DeleteRoleCheckListTemplateHeader', row.id);
         });
     </script>
 }
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml.cs
index 5018f89..19f94c3 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml.cs
@@ -21,5 +21,10 @@ namespace WorkFlowCheck.Web.Pages.UserAndRole
             var results = await _userService.GetAllRoleCheckListTemplates();
             return new JsonResult(new { data = results });
         }
+        public async Task<JsonResult> OnGetDeleteRoleCheckListTemplateHeader(int id)
+        {
+            var isSuccess = await _userService.DeleteRoleCheckListTemplateHeader(id);
+            return new JsonResult(new { result = isSuccess });
+        }
     }
 }
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml
index 6fd55d7..a0c45d5 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml
@@ -3,7 +3,7 @@
 @using Microsoft.AspNetCore.Antiforgery
 @inject IAntiforgery Antiforgery
 @{
-    ViewData["Title"] = "Ellenőrzési pont";
+    ViewData["Title"] = "Szabály - Ellenőrzési pont";
     var RoleCheckPointId = Model.RoleCheckPointDTO.Id;
     var urlPost = Url.Page("./RoleCheckPointEditPage", "Save");
 }
@@ -96,6 +96,8 @@
             }
 
         });
+        
+        
 
         $(document).ready(function () {
             const $form = $("#RoleCheckPointForm");
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml.cs
index 758a06f..f06de1b 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml.cs
@@ -71,5 +71,6 @@ namespace WorkFlowCheck.Web.Pages.UserAndRole
                 this.RoleCheckPoints.Add(new SelectListItem() { Value = CheckPoint.Id.ToString(), Text = CheckPoint.ShortName });
             }
         }
+        
     }
 }
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointsPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointsPage.cshtml
index 6fb495e..6c574b7 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointsPage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointsPage.cshtml
@@ -3,7 +3,7 @@
 @using WorkFlowCheck.Common.Helper
 @using WorkFlowCheck.Common.DTO
 @{
-    ViewData["Title"] = "Szabályok - Ellenőrzési sablonok";
+    ViewData["Title"] = "Szabályok - Ellenőrzési pontok";
 }
 <h1>@ViewData["Title"]</h1>
 
@@ -17,8 +17,8 @@
         <thead class="table-primary">
             <tr>
                 <th>ID</th>
-                <th>>@DisplayNameHelper.GetDisplayName(nameof(RoleCheckPointDTO.RoleDTO.RoleName), typeof(RoleCheckPointDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleCheckPointDTO.CheckPointDTO.ShortName), typeof(RoleCheckPointDTO))</th>
+                <th>Szabály @DisplayNameHelper.GetDisplayName(nameof(RoleDTO.RoleName), typeof(RoleDTO))</th>
+                <th>Ellenőrzési pont @DisplayNameHelper.GetDisplayName(nameof(CheckPointDTO.ShortName), typeof(CheckPointDTO))</th>
                 <th>@DisplayNameHelper.GetDisplayName(nameof(RoleCheckPointDTO.Enabled), typeof(RoleCheckPointDTO))</th>
                 <th class="text-center">Action</th>
             </tr>
@@ -26,8 +26,8 @@
         <tfoot class="table-light">
             <tr>
                 <th>ID</th>
-                <th>>@DisplayNameHelper.GetDisplayName(nameof(RoleCheckPointDTO.RoleDTO.RoleName), typeof(RoleCheckPointDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleCheckPointDTO.CheckPointDTO.ShortName), typeof(RoleCheckPointDTO))</th>
+                <th>Szabály @DisplayNameHelper.GetDisplayName(nameof(RoleDTO.RoleName), typeof(RoleDTO))</th>
+                <th>Ellenőrzési pont @DisplayNameHelper.GetDisplayName(nameof(CheckPointDTO.ShortName), typeof(CheckPointDTO))</th>
                 <th>@DisplayNameHelper.GetDisplayName(nameof(RoleCheckPointDTO.Enabled), typeof(RoleCheckPointDTO))</th>
                 <th class="text-center">Action</th>
             </tr>
@@ -91,18 +91,8 @@
 
         $('#tbRoleCheckPointsPage').on('click', '.delete-btn', function ()
         {
-            const row = table.row($(this).closest('tr')).data();
-            console.log(row);
-            showConfirmModal({
-                title: 'Törlés megerősítése',
-                message: 'Biztosan törölni szeretnéd ezt az elemet?',
-                okText: 'Törlés',
-                cancelText: 'Mégsem'
-            }).then(function(result) {
-                if(result === 'ok') {
-                    console.log('Törlés végrehajtva');
-                }
-            });
+             const row = table.row($(this).closest('tr')).data();
+            deleteEntity(table, '/UserAndRole/RoleCheckPointsPage?handler=DeleteRoleCheckPoint', row.id);
         });
     </script>
 }
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointsPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointsPage.cshtml.cs
index 23d0c7c..28dec09 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointsPage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointsPage.cshtml.cs
@@ -21,5 +21,10 @@ namespace WorkFlowCheck.Web.Pages.UserAndRole
             var results = await _userService.GetAllRoleCheckPoints();
             return new JsonResult(new { data = results });
         }
+        public async Task<JsonResult> OnGetDeleteRoleCheckPoint(int id)
+        {
+            var isSuccess = await _userService.DeleteRoleCheckPoint(id);
+            return new JsonResult(new { result = isSuccess });
+        }
     }
 }
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml
index f98be30..a2d4556 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml
@@ -3,7 +3,7 @@
 @using Microsoft.AspNetCore.Antiforgery
 @inject IAntiforgery Antiforgery
 @{
-    ViewData["Title"] = "Ellenőrzési pont";
+    ViewData["Title"] = "Szabály szerkesztése";
     var RoleId = Model.RoleDTO.Id;
     var urlPost = Url.Page("./RoleEditPage", "Save");
 }
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RolePage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RolePage.cshtml
index 2876353..a5a6909 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RolePage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RolePage.cshtml
@@ -140,7 +140,7 @@
         $('#tbRolesPage').on('click', '.delete-btn', function ()
         {
             const row = table.row($(this).closest('tr')).data();
-            deleteEntity(table, '/UserAndRole/UserRole?handler=DeleteUser', row.id);
+            deleteEntity(table, '/UserAndRole/RolePage?handler=DeleteRole', row.id);
         });
     </script>
 }
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml
index 0ed640e..3454d2d 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml
@@ -20,30 +20,46 @@
         <meta name="csrf-token" content="@Antiforgery.GetAndStoreTokens(HttpContext).RequestToken" />
         <input type="hidden" asp-for="UserDTO.Id" />
         <input type="hidden" asp-for="UserDTO.Password" value="" />
-        
-        <input type="hidden" asp-for="UserDTO.NFCCode" value="" />
+
+
         <input type="hidden" asp-for="UserDTO.JwtToken" value="" />
         <input type="hidden" asp-for="UserDTO.RoleDTO" value="" />
-        <div class="mb-3">
-            <label asp-for="UserDTO.UserName"></label>
-            <input asp-for="UserDTO.UserName" class="form-control" />
-            <span asp-validation-for="UserDTO.UserName" class="text-danger"></span>
-        </div>
+        @if (Model.UserDTO.Id == 0)
+        {
+            <div class="mb-3">
+                <label asp-for="UserDTO.UserName"></label>
+                <input asp-for="UserDTO.UserName" class="form-control" autocomplete="off" />
+                <span asp-validation-for="UserDTO.UserName" class="text-danger"></span>
+            </div>
+        }
+        else
+        {
+            <div class="mb-3">
+                <label asp-for="UserDTO.UserName"></label>
+                <input asp-for="UserDTO.UserName" class="form-control" readonly />
+                <span asp-validation-for="UserDTO.UserName" class="text-danger"></span>
+            </div>
+        }
         @if (Model.UserDTO.Id == 0)
         {
             <div class="row">
-                <div class="mb-6">
-                    <label asp-for="UserDTO.Password"></label>
-                    <input asp-for="UserDTO.Password" class="form-control" type="password" />
+                <div class="mb-3">
+                    <label asp-for="UserDTO.Password" class="form-label"></label>
+                    <div class="input-group">
+                        <input asp-for="UserDTO.Password" class="form-control" type="password" id="passwordInput" autocomplete="off" />
+                        <button class="btn btn-outline-secondary" type="button" onclick="togglePasswordVisibility()" tabindex="-1">
+                            <i class="bi bi-eye" id="toggleIcon"></i>
+                        </button>
+                    </div>
                     <span asp-validation-for="UserDTO.Password" class="text-danger"></span>
                 </div>
-                <div class="mb-6">
-                    <label asp-for="UserDTO.NFCCode"></label>
-                    <input asp-for="UserDTO.NFCCode" class="form-control" type="password" />
-                    <span asp-validation-for="UserDTO.NFCCode" class="text-danger"></span>
-                </div>
             </div>
         }
+        <div class="mb-3">
+            <label asp-for="UserDTO.NFCCode"></label>
+            <input asp-for="UserDTO.NFCCode" class="form-control" />
+            <span asp-validation-for="UserDTO.NFCCode" class="text-danger"></span>
+        </div>
         <div class="mb-3">
             <label asp-for="UserDTO.Email"></label>
             <input asp-for="UserDTO.Email" class="form-control" />
@@ -78,35 +94,38 @@
         </div>
     </form>
 </div>
-<br></br>
-<div class="card shadow p-4">
-    <table id="tbUserPage" class="table table-bordered table-hover table-sm" style="width:100%">
-        <thead class="table-primary">
-            <tr>
-                <th>ID</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.RoleName), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.ParentRoleName), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.IsAdmin), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanEnableBlocked), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanDownloadAPK), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanUseMobilApp), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanUseWebAdmin), typeof(RoleDTO))</th>
-            </tr>
-        </thead>
-        <tfoot class="table-light">
-            <tr>
-                <th>ID</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.RoleName), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.ParentRoleName), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.IsAdmin), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanEnableBlocked), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanDownloadAPK), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanUseMobilApp), typeof(RoleDTO))</th>
-                <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanUseWebAdmin), typeof(RoleDTO))</th>
-            </tr>
-        </tfoot>
-    </table>
-</div>
+@if (Model.UserDTO.Id != 0)
+{
+    <br></br>
+    <div class="card shadow p-4">
+        <table id="tbUserPage" class="table table-bordered table-hover table-sm" style="width:100%">
+            <thead class="table-primary">
+                <tr>
+                    <th>ID</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.RoleName), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.ParentRoleName), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.IsAdmin), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanEnableBlocked), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanDownloadAPK), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanUseMobilApp), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanUseWebAdmin), typeof(RoleDTO))</th>
+                </tr>
+            </thead>
+            <tfoot class="table-light">
+                <tr>
+                    <th>ID</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.RoleName), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.ParentRoleName), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.IsAdmin), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanEnableBlocked), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanDownloadAPK), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanUseMobilApp), typeof(RoleDTO))</th>
+                    <th>@DisplayNameHelper.GetDisplayName(nameof(RoleDTO.CanUseWebAdmin), typeof(RoleDTO))</th>
+                </tr>
+            </tfoot>
+        </table>
+    </div>
+}
 @section Scripts {
     <script>
 
@@ -189,6 +208,7 @@
             const $form = $('#UserForm');
 
             formData.UserDTO.RoleDTO=[];
+            formData.UserDTO.JwtToken='';
             formData.UserDTO.Active = $('#UserForm input[name="UserDTO.Active"]').is(':checked');
             formData.UserDTO.NFCActive = $('#UserForm input[name="UserDTO.NFCActive"]').is(':checked');
 
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml.cs
index 6a8ae39..a196c91 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml.cs
@@ -23,8 +23,17 @@ namespace WorkFlowCheck.Web.Pages.UserAndRole
 
         public async Task OnGet(int id)
         {
-            UserDTO = await _userService.GetUser(id);
+            if (id == 0)
+            {
+                UserDTO = new UserDTO();
+            }
+            else
+            {
+                UserDTO = await _userService.GetUser(id);
+            }
         }
+        
+        
         public async Task<IActionResult> OnPostSave([FromBody] UserDTO userDTO)
         {
             try
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml
index a6a8d01..47d9185 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml
@@ -78,17 +78,7 @@
         $('#tbUserRolesPage').on('click', '.delete-btn', function ()
         {
             const row = table.row($(this).closest('tr')).data();
-            console.log(row);
-            showConfirmModal({
-                title: 'Törlés megerősítése',
-                message: 'Biztosan törölni szeretnéd ezt az elemet?',
-                okText: 'Törlés',
-                cancelText: 'Mégsem'
-            }).then(function(result) {
-                if(result === 'ok') {
-                    console.log('Törlés végrehajtva');
-                }
-            });
+            deleteEntity(table, '/UserAndRole/UserRolePage?handler=DeleteUserRole', row.id);
         });
     </script>
 }
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml.cs
index b0e3381..d55830f 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml.cs
@@ -21,5 +21,10 @@ namespace WorkFlowCheck.Web.Pages.UserAndRole
             var results = await _userService.GetAllUserRoles();
             return new JsonResult(new { data = results });
         }
+        public async Task<JsonResult> OnGetDeleteUserRole(int id)
+        {
+            var results = await _userService.DeleteUserRole(id);
+            return new JsonResult(new { data = results });
+        }
     }
 }
diff --git a/src/WorkFlowCheck.Web/Pages/_ViewImports.cshtml b/src/WorkFlowCheck.Web/Pages/_ViewImports.cshtml
index 30510b3..e0356cc 100644
--- a/src/WorkFlowCheck.Web/Pages/_ViewImports.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/_ViewImports.cshtml
@@ -2,3 +2,4 @@
 @using WorkFlowCheck.Web.Helpers
 @namespace WorkFlowCheck.Web.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, WorkFlowCheck.Web.Helpers
diff --git a/src/WorkFlowCheck.Web/Services/Interfaces/IUserService.cs b/src/WorkFlowCheck.Web/Services/Interfaces/IUserService.cs
index b61951d..86909dc 100644
--- a/src/WorkFlowCheck.Web/Services/Interfaces/IUserService.cs
+++ b/src/WorkFlowCheck.Web/Services/Interfaces/IUserService.cs
@@ -21,14 +21,16 @@ namespace WorkFlowCheck.Web.Services.Interfaces
         Task<UserRoleDTO> GetUserRole(int id);
         Task<List<UserRoleDTO>> GetAllUserRoles();
         Task<ApiResponseDTO<UserRoleDTO>> UpdateUserRole(UserRoleDTO userRoleDTO);
-
+        Task<bool> DeleteUserRole(int id);
 
         Task<RoleCheckListTemplateHeaderDTO> GetRoleCheckListTemplateHeader(int id);
         Task<List<RoleCheckListTemplateHeaderDTO>> GetAllRoleCheckListTemplates();
         Task<ApiResponseDTO<RoleCheckListTemplateHeaderDTO>> UpdateRoleCheckListTemplateHeader(RoleCheckListTemplateHeaderDTO roleCheckListTemplateHeaderDTO);
+        Task<bool> DeleteRoleCheckListTemplateHeader(int id);
 
         Task<RoleCheckPointDTO> GetRoleCheckPoint(int id);
         Task<List<RoleCheckPointDTO>> GetAllRoleCheckPoints();
         Task<ApiResponseDTO<RoleCheckPointDTO>> UpdateRoleCheckPoint(RoleCheckPointDTO roleCheckPointDTO);
+        Task<bool> DeleteRoleCheckPoint(int id);
     }
 }
diff --git a/src/WorkFlowCheck.Web/Services/UserService.cs b/src/WorkFlowCheck.Web/Services/UserService.cs
index dbbec88..c0a6069 100644
--- a/src/WorkFlowCheck.Web/Services/UserService.cs
+++ b/src/WorkFlowCheck.Web/Services/UserService.cs
@@ -59,7 +59,12 @@ namespace WorkFlowCheck.Web.Services
         {
             try
             {
-                string endpoint = $"{_httpClient.BaseAddress}api/user/updateUser";
+                if (userDTO.Id != null)
+                {
+                    userDTO.Password = "xXyY3456!!!;;"; // Ez csak amiatt kell, hogy ne szálljon el a JSON
+                }
+
+                string endpoint = $"{_httpClient.BaseAddress}api/user/UpdateUser";
 
                 using (HttpResponseMessage httpResponseMessage = await _httpClient.PostAsJsonAsync(endpoint, userDTO))
                 {
@@ -131,7 +136,7 @@ namespace WorkFlowCheck.Web.Services
                 {
                     UserName = username,
                     Password = password,
-                    
+
                 };
 
 
@@ -161,7 +166,7 @@ namespace WorkFlowCheck.Web.Services
         {
             try
             {
-                
+
                 string endpoint = $"{_httpClient.BaseAddress}api/User/Authenticate2F2";
 
                 var userSimpleDTO = new User2FADTO()
@@ -188,7 +193,7 @@ namespace WorkFlowCheck.Web.Services
             }
             catch (Exception ex)
             {
-               
+
                 return new ApiResponseDTO<UserDTO>
                 {
                     IsSuccess = false
@@ -206,7 +211,7 @@ namespace WorkFlowCheck.Web.Services
                 {
                     UserName = username,
                     OldPassword = oldpassword,
-                    NewPassword1 = newpassword, 
+                    NewPassword1 = newpassword,
                     NewPassword2 = newpassword,
                     Code = code,
                     Token2FA = token2FA
@@ -421,6 +426,27 @@ namespace WorkFlowCheck.Web.Services
                 };
             }
         }
+        public async Task<bool> DeleteUserRole(int id)
+        {
+            string endpoint = $"{_httpClient.BaseAddress}api/User/DeleteUserRole/{id}";
+            var retVal = false;
+            try
+            {
+                var response = await _httpClient.GetFromJsonAsync<ApiResponseDTO<bool>>(endpoint);
+                if (response != null)
+                {
+                    if (response.IsSuccess)
+                    {
+                        return response.Data;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+            }
+            return retVal;
+        }
 
         public async Task<RoleCheckListTemplateHeaderDTO> GetRoleCheckListTemplateHeader(int id)
         {
@@ -492,6 +518,27 @@ namespace WorkFlowCheck.Web.Services
                 };
             }
         }
+        public async Task<bool> DeleteRoleCheckListTemplateHeader(int id)
+        {
+            string endpoint = $"{_httpClient.BaseAddress}api/User/DeleteRoleCheckListTemplateHeader/{id}";
+            var retVal = false;
+            try
+            {
+                var response = await _httpClient.GetFromJsonAsync<ApiResponseDTO<bool>>(endpoint);
+                if (response != null)
+                {
+                    if (response.IsSuccess)
+                    {
+                        return response.Data;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+            }
+            return retVal;
+        }
 
         public async Task<RoleCheckPointDTO> GetRoleCheckPoint(int id)
         {
@@ -563,7 +610,28 @@ namespace WorkFlowCheck.Web.Services
                 };
             }
         }
+        public async Task<bool> DeleteRoleCheckPoint(int id)
+        {
+            string endpoint = $"{_httpClient.BaseAddress}api/User/DeleteRoleCheckPoint/{id}";
+            var retVal = false;
+            try
+            {
+                var response = await _httpClient.GetFromJsonAsync<ApiResponseDTO<bool>>(endpoint);
+                if (response != null)
+                {
+                    if (response.IsSuccess)
+                    {
+                        return response.Data;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+            }
+            return retVal;
+        }
+
 
-        
     }
 }
diff --git a/src/WorkFlowCheck.Web/wwwroot/js/site.js b/src/WorkFlowCheck.Web/wwwroot/js/site.js
index d05f211..a666dc4 100644
--- a/src/WorkFlowCheck.Web/wwwroot/js/site.js
+++ b/src/WorkFlowCheck.Web/wwwroot/js/site.js
@@ -2,7 +2,11 @@
 // for details on configuring this project to bundle and minify static web assets.
 
 // Write your JavaScript code.
-function parseValue(value) {
+function parseValue(value, type = "string") {
+    if (type === "string") {
+        return value;
+    }
+
     if (value === "") return null;
 
     // Boolean
@@ -23,17 +27,17 @@ function getFormAsNestedObject(formSelector) {
 
     formArray.forEach(function (item) {
         var keys = item.name.split('.');
-        var value = parseValue(item.value);
+        var inputElement = document.querySelector(`[name="${item.name}"]`);
+        var type = inputElement?.dataset?.type || "string"; // ha nincs data-type, alap: string
+        var value = parseValue(item.value, type);
         var current = result;
 
         for (var i = 0; i < keys.length; i++) {
             var key = keys[i];
 
-            // Ha utolsó kulcs, értéket rendelünk hozzá
             if (i === keys.length - 1) {
                 current[key] = value;
             } else {
-                // Ha a következő szint nincs meg, hozzuk létre
                 if (!current[key]) {
                     current[key] = {};
                 }
@@ -44,6 +48,7 @@ function getFormAsNestedObject(formSelector) {
 
     return result;
 }
+
 function showConfirmModal(options) {
     return new Promise(function (resolve) {
         // Alapértelmezett értékek
@@ -434,4 +439,18 @@ function saveEntity(csrfToken, data, url) {
             });
         }
     });
+}
+function togglePasswordVisibility() {
+    const passwordInput = document.getElementById("passwordInput");
+    const icon = document.getElementById("toggleIcon");
+
+    if (passwordInput.type === "password") {
+        passwordInput.type = "text";
+        icon.classList.remove("bi-eye");
+        icon.classList.add("bi-eye-slash");
+    } else {
+        passwordInput.type = "password";
+        icon.classList.remove("bi-eye-slash");
+        icon.classList.add("bi-eye");
+    }
 }
\ No newline at end of file