diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml
index e276aecf..5172224a 100644
--- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml
@@ -1,6 +1,10 @@
 @model AccountManagement.Application.Contracts.Role.CreateRole
 @{
 	<style>
+
+		.modal .modal-dialog .modal-content{
+			width: 645px;
+		}
         .child-check {
             margin-left: 15px;
             display: none;
@@ -224,9 +228,18 @@
 	<div class="child-check level3">
 		<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="10323" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور قرارداد </span> </label>
 	</div>
-	<div class="child-check level3">
-		<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="10324" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور بیمه ای </span> </label>
-	</div>
+    <div class="child-check level3">
+        <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+            <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+        </label>
+        <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="10324" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور بیمه ای </span> </label>
+									
+        <!-----------------------Sub Menu------------------->
+        <div class="child-check level3">
+										<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="1032401" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> محاسبه اضافه کار و حق عائله مندی در بیمه  </span> </label>
+        </div>
+    </div>
+   
 	<div class="child-check level3">
 		<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="10327" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور مالیاتی </span> </label>
 	</div>
diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml
index b1e53af0..f7193980 100644
--- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml
@@ -1,6 +1,10 @@
 @model AccountManagement.Application.Contracts.Role.EditRole
 @{
 	<style>
+
+		.modal .modal-dialog .modal-content {
+			width: 645px;
+		}
         .child-check {
             margin-left: 15px;
             display: none;
@@ -224,9 +228,17 @@
 	<div class="child-check level3">
 		<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="10323" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور قرارداد </span> </label>
 	</div>
-	<div class="child-check level3">
-		<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="10324" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور بیمه ای </span> </label>
-	</div>
+    <div class="child-check level3">
+        <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+            <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+        </label>
+        <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="10324" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور بیمه ای </span> </label>
+									
+        <!-----------------------Sub Menu------------------->
+        <div class="child-check level3">
+										<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="1032401" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative">  محاسبه اضافه کار و حق عائله مندی در بیمه  </span> </label>
+        </div>
+    </div>
 	<div class="child-check level3">
 		<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="10327" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور مالیاتی </span> </label>
 	</div>
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml
index 928e334d..2b66d76c 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml
@@ -515,7 +515,7 @@
                                 @if (Model.Command.PermissionIds != null && Model.Command.PermissionIds.Contains(10324))
                                 {
                                     <div class="col-md-12 col-xs-12">
-                                        <div class="row card m-b-10">
+                                        <div class="row card m-b-10 @(Model.Command.PermissionIds.Contains(1032401) ? "" : "disabled")">
                                             <div class="col-md-6 col-xs-12">
                                                 <h4>محاسبه اضافه کار و حق عائله مندی در لیست بیمه کارگاه</h4>
                                                 <div>
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml
index 4a24360f..727cb5ff 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml
@@ -523,7 +523,7 @@
                                 <input type="hidden" id="PermissionInsurance" asp-for="@Model.HasPermissionInsurance" value="@Model.HasPermissionInsurance" />
                                 <div style="@(Model.HasPermissionInsurance ? "" : "display: none;")">
                                     <div class="col-md-12 col-xs-12">
-                                        <div class="row card m-b-10">
+                                        <div class="row card m-b-10  @(Model.Command.PermissionIds.Contains(1032401) ? "" : "disabled")">
                                             <div class="col-md-6 col-xs-12">
                                                 <h4>محاسبه اضافه کار و حق عائله مندی در لیست بیمه کارگاه</h4>
                                                 <div>
diff --git a/ServiceHost/Notifications/ProgramManager/SignalRBoardNotificationPublisher.cs b/ServiceHost/Notifications/ProgramManager/SignalRBoardNotificationPublisher.cs
index 87a0c539..ed971635 100644
--- a/ServiceHost/Notifications/ProgramManager/SignalRBoardNotificationPublisher.cs
+++ b/ServiceHost/Notifications/ProgramManager/SignalRBoardNotificationPublisher.cs
@@ -30,7 +30,7 @@ public class SignalRBoardNotificationPublisher:IBoardNotificationPublisher
         var taskGroup = $"pm.task:{sectionId}";
 
         // گروه permission-based (مثلاً برای Admin ها)
-        var permissionGroup = $"pm.perm:{ProgramManagerPermissionCode.Board.All.ViewAll}";
+        var permissionGroup = $"pm.perm:{ProgramManagerPermissionCode.Board.ViewAllUsersProjects.Code}";
 
         // ارسال به هر دو گروه؛ SignalR خودش duplicate connection رو هندل می‌کنه
         return _hubContext.Clients.Groups(taskGroup, permissionGroup)