diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json
index abe70758..bbfef0e6 100644
--- a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json
+++ b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json
@@ -8649,10 +8649,7 @@
             "descriptionKey": "Abp.Localization.DefaultLanguage.Description",
             "defaultValue": "en",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.SiteManagement",
@@ -8686,10 +8683,7 @@
             "descriptionKey": "Abp.Localization.Timezone.Description",
             "defaultValue": "UTC",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.SiteManagement",
@@ -8845,11 +8839,7 @@
             "descriptionKey": "App.SiteManagement.Theme.Style.Description",
             "defaultValue": "dx.light.compact",
             "isVisibleToClients": true,
-            "providers": [
-                "U",
-                "G",
-                "D"
-            ],
+            "providers": ["U", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.SiteManagement",
@@ -8897,10 +8887,7 @@
             "descriptionKey": "App.SiteManagement.General.NewMemberNotificationEmails.Description",
             "defaultValue": "system@sozsoft.com",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.SiteManagement",
@@ -8916,10 +8903,7 @@
             "descriptionKey": "App.SiteManagement.General.TimedLoginEmails.Description",
             "defaultValue": "system@sozsoft.com",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.SiteManagement",
@@ -8935,11 +8919,7 @@
             "descriptionKey": "App.Sender.Sms.PostaGuvercini.Url.Description",
             "defaultValue": "https://www.postaguvercini.com/api_http",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.Sender",
@@ -8955,11 +8935,7 @@
             "descriptionKey": "App.Sender.Sms.PostaGuvercini.Username.Description",
             "defaultValue": "2AIlj4QlCrvlbDDBS/712A==",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": true,
             "mainGroupKey": "App.Sender",
@@ -8975,11 +8951,7 @@
             "descriptionKey": "App.Sender.Sms.PostaGuvercini.Password.Description",
             "defaultValue": "oTuwyZM9sxfJI+jDH5wJAw==",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": true,
             "mainGroupKey": "App.Sender",
@@ -8995,11 +8967,7 @@
             "descriptionKey": "App.Sender.WhatsApp.Url.Description",
             "defaultValue": "https://graph.facebook.com/v21.0",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.Sender",
@@ -9015,11 +8983,7 @@
             "descriptionKey": "App.Sender.WhatsApp.PhoneNumberId.Description",
             "defaultValue": "442035112335974",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.Sender",
@@ -9035,11 +8999,7 @@
             "descriptionKey": "App.Sender.WhatsApp.Token.Description",
             "defaultValue": "EAANoftqZAJ64BO5oPwXPqniUtNGF70u8TKvQVzGZBaYQh5UY8fYrgQkcXP9UbQUqT9PWRah1L7TzcBIiWQMacT8AkmZB33AP1begLoywIZCsQSdBSUz21GQaCowfVosYgBoXSyqH8irSBPQDLIjxxVxrC2n76SD9X6zPXeHgOqIPY92DqJXplstWrlhtZCAZDZD",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.Sender",
@@ -9055,11 +9015,7 @@
             "descriptionKey": "App.Sender.WhatsApp.TemplateName.Description",
             "defaultValue": "kurs_platform_notification",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.Sender",
@@ -9075,10 +9031,7 @@
             "descriptionKey": "App.Sender.Rocket.Url.Description",
             "defaultValue": "https://chat.sozsoft.com/api/v1",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.Sender",
@@ -9094,10 +9047,7 @@
             "descriptionKey": "App.Sender.Rocket.UserId.Description",
             "defaultValue": "LfpzPjzag4QJXm84N",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.Sender",
@@ -9113,10 +9063,7 @@
             "descriptionKey": "App.Sender.Rocket.Token.Description",
             "defaultValue": "jvqALawvXn0Q7c6FfHJV3h58DCHDfQLgFF5y7oIc7oc",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "App.Sender",
@@ -9132,11 +9079,7 @@
             "descriptionKey": "Abp.Mailing.DefaultFromDisplayName.Description",
             "defaultValue": "Kurs",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Mailing",
@@ -9152,11 +9095,7 @@
             "descriptionKey": "Abp.Mailing.DefaultFromAddress.Description",
             "defaultValue": "system@sozsoft.com",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Mailing",
@@ -9172,11 +9111,7 @@
             "descriptionKey": "Abp.Mailing.Smtp.UserName.Description",
             "defaultValue": "system@sozsoft.com",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Mailing",
@@ -9192,11 +9127,7 @@
             "descriptionKey": "Abp.Mailing.Smtp.Password.Description",
             "defaultValue": "QT9L7BCl1CT/1Hq19HoSlQ==",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": true,
             "mainGroupKey": "Abp.Mailing",
@@ -9212,11 +9143,7 @@
             "descriptionKey": "Abp.Mailing.Smtp.Host.Description",
             "defaultValue": "127.0.0.1",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Mailing",
@@ -9232,11 +9159,7 @@
             "descriptionKey": "Abp.Mailing.Smtp.Port.Description",
             "defaultValue": "25",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Mailing",
@@ -9252,11 +9175,7 @@
             "descriptionKey": "Abp.Mailing.Smtp.Domain.Description",
             "defaultValue": "sozsoft.com",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Mailing",
@@ -9272,11 +9191,7 @@
             "descriptionKey": "Abp.Mailing.Smtp.EnableSsl.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Mailing",
@@ -9292,11 +9207,7 @@
             "descriptionKey": "Abp.Mailing.AWS.Profile.Description",
             "defaultValue": "mail-sdk-user",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Mailing",
@@ -9312,11 +9223,7 @@
             "descriptionKey": "Abp.Mailing.AWS.Region.Description",
             "defaultValue": "eu-central-1",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Mailing",
@@ -9332,11 +9239,7 @@
             "descriptionKey": "Abp.Mailing.AWS.AccessKey.Description",
             "defaultValue": "aXW8L21rP6dPO6Txj76Be2FCpWRBa25EMrSAVL76",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Mailing",
@@ -9352,11 +9255,7 @@
             "descriptionKey": "Abp.Mailing.AWS.AccessKeyId.Description",
             "defaultValue": "AKIATULUYBLX4IY3S2P1",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Mailing",
@@ -9372,10 +9271,7 @@
             "descriptionKey": "Abp.Account.IsSelfRegistrationEnabled.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Account",
@@ -9391,10 +9287,7 @@
             "descriptionKey": "Abp.Account.EnableLocalLogin.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Account",
@@ -9410,11 +9303,7 @@
             "descriptionKey": "Abp.Account.TwoFactor.Enabled.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Account",
@@ -9430,10 +9319,7 @@
             "descriptionKey": "Abp.Account.Captcha.MaxFailedAccessAttempts.Description",
             "defaultValue": "3",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Account",
@@ -9449,10 +9335,7 @@
             "descriptionKey": "Abp.Account.Captcha.EndPoint.Description",
             "defaultValue": "https://challenges.cloudflare.com/turnstile/v0/siteverify",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Account",
@@ -9468,10 +9351,7 @@
             "descriptionKey": "Abp.Account.Captcha.SiteKey.Description",
             "defaultValue": "0x4AAAAAAAGadwQME-GSYuJU",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Account",
@@ -9487,10 +9367,7 @@
             "descriptionKey": "Abp.Account.Captcha.SecretKey.Description",
             "defaultValue": "0x4AAAAAAAGad_f_WP47IcNBs9FTu5DhNX8",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Account",
@@ -9506,11 +9383,7 @@
             "descriptionKey": "Abp.Identity.Profile.General.RequireVerifiedAccount.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9526,11 +9399,7 @@
             "descriptionKey": "Abp.Identity.Profile.General.BlacklistedEmailProviders.Description",
             "defaultValue": "gmail.com\r\nyahoo.com\r\nhotmail.com",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9546,11 +9415,7 @@
             "descriptionKey": "Abp.Identity.Password.ForceUsersToPeriodicallyChangePassword.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9566,11 +9431,7 @@
             "descriptionKey": "Abp.Identity.Password.PasswordChangePeriodDays.Description",
             "defaultValue": "0",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9586,11 +9447,7 @@
             "descriptionKey": "Abp.Identity.Password.RequiredLength.Description",
             "defaultValue": "6",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9606,11 +9463,7 @@
             "descriptionKey": "Abp.Identity.Password.RequiredUniqueChars.Description",
             "defaultValue": "1",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9626,11 +9479,7 @@
             "descriptionKey": "Abp.Identity.Password.RequireNonAlphanumeric.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9646,11 +9495,7 @@
             "descriptionKey": "Abp.Identity.Password.RequireLowercase.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9666,11 +9511,7 @@
             "descriptionKey": "Abp.Identity.Password.RequireUppercase.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9686,11 +9527,7 @@
             "descriptionKey": "Abp.Identity.Password.RequireDigit.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9706,11 +9543,7 @@
             "descriptionKey": "Abp.Identity.Lockout.AllowedForNewUsers.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9726,11 +9559,7 @@
             "descriptionKey": "Abp.Identity.Lockout.LockoutDuration.Description",
             "defaultValue": "300",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9746,11 +9575,7 @@
             "descriptionKey": "Abp.Identity.Lockout.MaxFailedAccessAttempts.Description",
             "defaultValue": "5",
             "isVisibleToClients": false,
-            "providers": [
-                "T",
-                "G",
-                "D"
-            ],
+            "providers": ["T", "G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9766,10 +9591,7 @@
             "descriptionKey": "Abp.Identity.SignIn.RequireConfirmedEmail.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9785,10 +9607,7 @@
             "descriptionKey": "Abp.Identity.SignIn.RequireConfirmedPhoneNumber.Description",
             "defaultValue": "False",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9804,10 +9623,7 @@
             "descriptionKey": "Abp.Identity.User.IsUserNameUpdateEnabled.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -9823,10 +9639,7 @@
             "descriptionKey": "Abp.Identity.User.IsEmailUpdateEnabled.Description",
             "defaultValue": "True",
             "isVisibleToClients": false,
-            "providers": [
-                "G",
-                "D"
-            ],
+            "providers": ["G", "D"],
             "isInherited": false,
             "isEncrypted": false,
             "mainGroupKey": "Abp.Identity",
@@ -25743,7 +25556,7 @@
             "path": "/admin/developerkit/components/edit/:id",
             "componentPath": "@/views/developerKit/CodePage",
             "routeType": "protected",
-            "authority": ["App.DeveloperKit.Components" ]
+            "authority": ["App.DeveloperKit.Components"]
         }
     ],
     "CustomEndpoints": [
@@ -25995,4 +25808,4 @@
             "dependencies": ["AxiosListComponent"]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/ui/src/views/admin/role-management/RolesPermission.tsx b/ui/src/views/admin/role-management/RolesPermission.tsx
index 79abe6bf..f1ff6c52 100644
--- a/ui/src/views/admin/role-management/RolesPermission.tsx
+++ b/ui/src/views/admin/role-management/RolesPermission.tsx
@@ -212,13 +212,24 @@ function RolesPermission({
         {translate('::Permission')} - {name}
       </h5>
       <hr className="mt-2 mb-2"></hr>
+
+      <div className="flex flex-col md:flex-row gap-4 mb-2">
+        <div style={{ width: '30%' }}>
+          <Checkbox name="all" checked={isAllSelected} onChange={onSelectAll}>
+            {translate('::SelectAllInAllTabs', 'AbpPermissionManagement')}
+          </Checkbox>
+        </div>
+        <div style={{ width: '70%' }}>
+          <Checkbox name="group" checked={isAllSelectedForGroup} onChange={onSelectAll}>
+            {translate('::SelectAllInThisTab', 'AbpPermissionManagement')}
+          </Checkbox>
+        </div>
+      </div>
+
       <Container className="h-full">
         <div className="flex flex-col md:flex-row gap-4">
-          <div style={{ width: '30%' }}>
-            <Checkbox name="all" checked={isAllSelected} onChange={onSelectAll}>
-              {translate('::SelectAllInAllTabs', 'AbpPermissionManagement')}
-            </Checkbox>
-            <hr className="mt-2 mb-2"></hr>
+          <div style={{ width: '30%' }} className="max-h-[470px] overflow-y-auto">
+            <hr className="mb-2"></hr>
             <Menu variant={mode} defaultActiveKeys={[selectedGroup?.displayName ?? '']}>
               {permissionList?.groups.map((group: any) => (
                 <Menu.MenuItem
@@ -234,11 +245,8 @@ function RolesPermission({
             </Menu>
           </div>
           <div style={{ width: '70%' }} className="max-h-[470px] overflow-y-auto">
-            <Checkbox name="group" checked={isAllSelectedForGroup} onChange={onSelectAll}>
-              {translate('::SelectAllInThisTab', 'AbpPermissionManagement')}
-            </Checkbox>
-            <hr className="mt-2 mb-2"></hr>
-            <AdaptableCard>
+            <hr className="mb-2"></hr>
+            <div className="card-body">
               {selectedGroupPermissions.map((permission) => (
                 <div key={permission.name}>
                   <Checkbox
@@ -251,7 +259,7 @@ function RolesPermission({
                   </Checkbox>
                 </div>
               ))}
-            </AdaptableCard>
+            </div>
           </div>
         </div>
       </Container>
diff --git a/ui/src/views/admin/user-management/UsersPermission.tsx b/ui/src/views/admin/user-management/UsersPermission.tsx
index 27f74ca8..8b49888d 100644
--- a/ui/src/views/admin/user-management/UsersPermission.tsx
+++ b/ui/src/views/admin/user-management/UsersPermission.tsx
@@ -222,12 +222,23 @@ function UsersPermission({
         {translate('::Permission')} - {name}
       </h5>
       <hr className="mt-2 mb-2"></hr>
+
+      <div className="flex flex-col md:flex-row gap-4">
+        <div style={{ width: '30%' }}>
+          <Checkbox name="all" checked={isAllSelected} onChange={onSelectAll}>
+            {translate('::SelectAllInAllTabs', 'AbpPermissionManagement')}
+          </Checkbox>
+        </div>
+        <div style={{ width: '70%' }}>
+          <Checkbox name="group" checked={isAllSelectedForGroup} onChange={onSelectAll}>
+            {translate('::SelectAllInThisTab', 'AbpPermissionManagement')}
+          </Checkbox>
+        </div>
+      </div>
+
       <Container className="h-full">
         <div className="flex flex-col md:flex-row gap-4">
-          <div style={{ width: '30%' }}>
-            <Checkbox name="all" checked={isAllSelected} onChange={onSelectAll}>
-              {translate('::SelectAllInAllTabs', 'AbpPermissionManagement')}
-            </Checkbox>
+          <div style={{ width: '30%' }} className="max-h-[470px] overflow-y-auto">
             <hr className="mt-2 mb-2"></hr>
             <Menu variant={mode} defaultActiveKeys={[selectedGroup?.displayName ?? '']}>
               {permissionList?.groups.map((group) => (
@@ -246,11 +257,8 @@ function UsersPermission({
             </Menu>
           </div>
           <div style={{ width: '70%' }} className="max-h-[470px] overflow-y-auto">
-            <Checkbox name="group" checked={isAllSelectedForGroup} onChange={onSelectAll}>
-              {translate('::SelectAllInThisTab', 'AbpPermissionManagement')}
-            </Checkbox>
             <hr className="mt-2 mb-2"></hr>
-            <AdaptableCard>
+            <div className="card-body">
               {selectedGroupPermissions.map((permission) => (
                 <div key={permission.name}>
                   <Checkbox
@@ -274,7 +282,7 @@ function UsersPermission({
                   </Checkbox>
                 </div>
               ))}
-            </AdaptableCard>
+            </div>
           </div>
         </div>
       </Container>