diff --git a/src/WorkFlowCheck.Web/Pages/Shared/_Layout.cshtml b/src/WorkFlowCheck.Web/Pages/Shared/_Layout.cshtml
index dd70680..a3a1fe8 100644
--- a/src/WorkFlowCheck.Web/Pages/Shared/_Layout.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/Shared/_Layout.cshtml
@@ -20,9 +20,9 @@
                 </button>
                 <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
                     <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
+                        @* <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
-                        </li>
+                        </li> *@
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle text-dark" href="#" id="baseStockDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                                 Törzsadatok
@@ -33,6 +33,27 @@
                                 <li><a class="dropdown-item" asp-area="" asp-page="/BaseStock/Locations/LocationsPage">Lokációk</a></li>
                             </ul>
                         </li>
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle text-dark" href="#" id="checkListDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                Ellenőrzési adatok
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="checkListDropdown">
+                                <li><a class="dropdown-item" asp-area="" asp-page="/CheckList/CheckListHeader/CheckListHeaderPage">Ellenőrzések</a></li>
+                                <li><hr class="dropdown-divider"></li> <!-- EZ AZ ELVÁLASZTÓ VONAL -->
+                                <li><a class="dropdown-item" asp-area="" asp-page="/CheckListTemplate/CheckListTemplateHeader/CheckListTemplateHeaderPage">Ellenőrzési sablonok</a></li>
+                            </ul>
+                        </li>
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle text-dark" href="#" id="adminDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                Felhasználók - szabályok
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="adminDropdown">
+                                <li><a class="dropdown-item" asp-area="" asp-page="/UserAndRole/UserPage">Felhasználók</a></li>
+                                <li><a class="dropdown-item" asp-area="" asp-page="/UserAndRole/RolePage">Szabályok</a></li>
+                                <li><hr class="dropdown-divider"></li> <!-- EZ AZ ELVÁLASZTÓ VONAL -->
+                                <li><a class="dropdown-item" asp-area="" asp-page="/UserAndRole/UserRolePage">Felhasználók - szabályok</a></li>
+                            </ul>
+                        </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>
                         </li>
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeaderEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeaderEditPage.cshtml
deleted file mode 100644
index 1398e4a..0000000
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeaderEditPage.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@page
-@model WorkFlowCheck.Web.Pages.UserAnRole.RoleCheckListTemplateHeaderEditPageModel
-@{
-}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeadersPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeadersPage.cshtml
deleted file mode 100644
index 33fac3e..0000000
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeadersPage.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@page
-@model WorkFlowCheck.Web.Pages.UserAnRole.RoleCheckListTemplateHeadersPageModel
-@{
-}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleEditPage.cshtml
deleted file mode 100644
index 41460b7..0000000
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleEditPage.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@page
-@model WorkFlowCheck.Web.Pages.UserAnRole.RoleEditPageModel
-@{
-}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/RolePage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAnRole/RolePage.cshtml
deleted file mode 100644
index 4248985..0000000
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/RolePage.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@page
-@model WorkFlowCheck.Web.Pages.UserAnRole.RolePageModel
-@{
-}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAnRole/UserEditPage.cshtml
deleted file mode 100644
index b8281eb..0000000
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserEditPage.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@page
-@model WorkFlowCheck.Web.Pages.UserAnRole.UserEditPageModel
-@{
-}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAnRole/UserPage.cshtml
deleted file mode 100644
index 1ec9c89..0000000
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserPage.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@page
-@model WorkFlowCheck.Web.Pages.UserAnRole.UserPageModel
-@{
-}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserRoleEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAnRole/UserRoleEditPage.cshtml
deleted file mode 100644
index ff55930..0000000
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserRoleEditPage.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@page
-@model WorkFlowCheck.Web.Pages.UserAnRole.UserRoleEditPageModel
-@{
-}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserRolePage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAnRole/UserRolePage.cshtml
deleted file mode 100644
index 34279fb..0000000
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserRolePage.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@page
-@model WorkFlowCheck.Web.Pages.UserAnRole.UserRolePageModel
-@{
-}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml
new file mode 100644
index 0000000..357c498
--- /dev/null
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml
@@ -0,0 +1,4 @@
+@page
+@model WorkFlowCheck.Web.Pages.UserAndRole.RoleCheckListTemplateHeaderEditPageModel
+@{
+}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeaderEditPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml.cs
similarity index 82%
rename from src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeaderEditPage.cshtml.cs
rename to src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml.cs
index 118e3c0..b2103f0 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeaderEditPage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace WorkFlowCheck.Web.Pages.UserAnRole
+namespace WorkFlowCheck.Web.Pages.UserAndRole
 {
     public class RoleCheckListTemplateHeaderEditPageModel : PageModel
     {
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml
new file mode 100644
index 0000000..ca8bb9a
--- /dev/null
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml
@@ -0,0 +1,4 @@
+@page
+@model WorkFlowCheck.Web.Pages.UserAndRole.RoleCheckListTemplateHeadersPageModel
+@{
+}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeadersPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml.cs
similarity index 81%
rename from src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeadersPage.cshtml.cs
rename to src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml.cs
index 8acfd73..62ddc62 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleCheckListTemplateHeadersPage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeadersPage.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace WorkFlowCheck.Web.Pages.UserAnRole
+namespace WorkFlowCheck.Web.Pages.UserAndRole
 {
     public class RoleCheckListTemplateHeadersPageModel : PageModel
     {
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml
new file mode 100644
index 0000000..ab5b744
--- /dev/null
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml
@@ -0,0 +1,4 @@
+@page
+@model WorkFlowCheck.Web.Pages.UserAndRole.RoleEditPageModel
+@{
+}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleEditPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml.cs
similarity index 80%
rename from src/WorkFlowCheck.Web/Pages/UserAnRole/RoleEditPage.cshtml.cs
rename to src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml.cs
index 22ab548..451a9f0 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/RoleEditPage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace WorkFlowCheck.Web.Pages.UserAnRole
+namespace WorkFlowCheck.Web.Pages.UserAndRole
 {
     public class RoleEditPageModel : PageModel
     {
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RolePage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RolePage.cshtml
new file mode 100644
index 0000000..34cc0de
--- /dev/null
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RolePage.cshtml
@@ -0,0 +1,4 @@
+@page
+@model WorkFlowCheck.Web.Pages.UserAndRole.RolePageModel
+@{
+}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/RolePage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/RolePage.cshtml.cs
similarity index 79%
rename from src/WorkFlowCheck.Web/Pages/UserAnRole/RolePage.cshtml.cs
rename to src/WorkFlowCheck.Web/Pages/UserAndRole/RolePage.cshtml.cs
index 3fef794..0fae111 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/RolePage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RolePage.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace WorkFlowCheck.Web.Pages.UserAnRole
+namespace WorkFlowCheck.Web.Pages.UserAndRole
 {
     public class RolePageModel : PageModel
     {
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml
new file mode 100644
index 0000000..f2feb46
--- /dev/null
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml
@@ -0,0 +1,4 @@
+@page
+@model WorkFlowCheck.Web.Pages.UserAndRole.UserEditPageModel
+@{
+}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserEditPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml.cs
similarity index 80%
rename from src/WorkFlowCheck.Web/Pages/UserAnRole/UserEditPage.cshtml.cs
rename to src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml.cs
index cd37721..6b9bf1e 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserEditPage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace WorkFlowCheck.Web.Pages.UserAnRole
+namespace WorkFlowCheck.Web.Pages.UserAndRole
 {
     public class UserEditPageModel : PageModel
     {
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserPage.cshtml
new file mode 100644
index 0000000..e08894c
--- /dev/null
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserPage.cshtml
@@ -0,0 +1,4 @@
+@page
+@model WorkFlowCheck.Web.Pages.UserAndRole.UserPageModel
+@{
+}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserPage.cshtml.cs
similarity index 79%
rename from src/WorkFlowCheck.Web/Pages/UserAnRole/UserPage.cshtml.cs
rename to src/WorkFlowCheck.Web/Pages/UserAndRole/UserPage.cshtml.cs
index b7a49af..4be5364 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserPage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserPage.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace WorkFlowCheck.Web.Pages.UserAnRole
+namespace WorkFlowCheck.Web.Pages.UserAndRole
 {
     public class UserPageModel : PageModel
     {
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRoleEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRoleEditPage.cshtml
new file mode 100644
index 0000000..f6abcf7
--- /dev/null
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRoleEditPage.cshtml
@@ -0,0 +1,4 @@
+@page
+@model WorkFlowCheck.Web.Pages.UserAndRole.UserRoleEditPageModel
+@{
+}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserRoleEditPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRoleEditPage.cshtml.cs
similarity index 80%
rename from src/WorkFlowCheck.Web/Pages/UserAnRole/UserRoleEditPage.cshtml.cs
rename to src/WorkFlowCheck.Web/Pages/UserAndRole/UserRoleEditPage.cshtml.cs
index 749c504..117d259 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserRoleEditPage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRoleEditPage.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace WorkFlowCheck.Web.Pages.UserAnRole
+namespace WorkFlowCheck.Web.Pages.UserAndRole
 {
     public class UserRoleEditPageModel : PageModel
     {
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml
new file mode 100644
index 0000000..0265bb5
--- /dev/null
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml
@@ -0,0 +1,4 @@
+@page
+@model WorkFlowCheck.Web.Pages.UserAndRole.UserRolePageModel
+@{
+}
diff --git a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserRolePage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml.cs
similarity index 80%
rename from src/WorkFlowCheck.Web/Pages/UserAnRole/UserRolePage.cshtml.cs
rename to src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml.cs
index 9d5b1b3..58828c2 100644
--- a/src/WorkFlowCheck.Web/Pages/UserAnRole/UserRolePage.cshtml.cs
+++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace WorkFlowCheck.Web.Pages.UserAnRole
+namespace WorkFlowCheck.Web.Pages.UserAndRole
 {
     public class UserRolePageModel : PageModel
     {