diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
index 6cd6575410..98e7659f86 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
@@ -7,27 +7,28 @@
 @using Microsoft.Extensions.Localization
 @using Volo.Abp.Identity.Localization
 @using Volo.Abp.AspNetCore.Components.WebAssembly.Theming
-@using Volo.Abp.BlazoriseUI.Components.ObjectExtending 
+@using Volo.Abp.BlazoriseUI.Components.ObjectExtending
+@using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Layout
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
 
 @inherits AbpCrudPageBase<IIdentityRoleAppService, IdentityRoleDto, Guid, GetIdentityRolesInput, IdentityRoleCreateDto, IdentityRoleUpdateDto>
 <Card>
     <CardHeader>
         @* ************************* PAGE HEADER ************************* *@
-        <Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Layout.PageHeader Title="@L["Roles"]" 
-                                                                              BreadcrumbItems="@BreadcrumbItems" 
-                                                                              Toolbar="@Toolbar">
-        </Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Layout.PageHeader>
+        <PageHeader Title="@L["Roles"]"
+                    BreadcrumbItems="@BreadcrumbItems"
+                    Toolbar="@Toolbar">
+        </PageHeader>
     </CardHeader>
     <CardBody>
         @* ************************* DATA GRID ************************* *@
         <AbpExtensibleDataGrid TItem="IdentityRoleDto"
-                     Data="@Entities"
-                     ReadData="@OnDataGridReadAsync"
-                     TotalItems="@TotalCount"
-                     ShowPager="true"
-                     PageSize="@PageSize"
-                     Columns="@RoleManagementTableColumns">
+                               Data="@Entities"
+                               ReadData="@OnDataGridReadAsync"
+                               TotalItems="@TotalCount"
+                               ShowPager="true"
+                               PageSize="@PageSize"
+                               Columns="@RoleManagementTableColumns">
         </AbpExtensibleDataGrid>
     </CardBody>
 </Card>
@@ -36,12 +37,12 @@
 @if (HasCreatePermission)
 {
     <Modal @ref="CreateModal">
-        <ModalBackdrop />
+        <ModalBackdrop/>
         <ModalContent Centered="true">
             <Form>
                 <ModalHeader>
                     <ModalTitle>@L["NewRole"]</ModalTitle>
-                    <CloseButton Clicked="CloseCreateModalAsync" />
+                    <CloseButton Clicked="CloseCreateModalAsync"/>
                 </ModalHeader>
                 <ModalBody>
                     <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
@@ -50,7 +51,7 @@
                                 <FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
                                 <TextEdit @bind-Text="@NewEntity.Name" Autofocus="true">
                                     <Feedback>
-                                        <ValidationError />
+                                        <ValidationError/>
                                     </Feedback>
                                 </TextEdit>
                             </Field>
@@ -64,7 +65,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Clicked="@CreateEntityAsync" />
+                    <SubmitButton Clicked="@CreateEntityAsync"/>
                 </ModalFooter>
             </Form>
         </ModalContent>
@@ -74,26 +75,26 @@
 @if (HasUpdatePermission)
 {
     <Modal @ref="EditModal">
-        <ModalBackdrop />
+        <ModalBackdrop/>
         <ModalContent Centered="true">
             <Form>
                 <ModalHeader>
                     <ModalTitle>@L["Edit"]</ModalTitle>
-                    <CloseButton Clicked="CloseEditModalAsync" />
+                    <CloseButton Clicked="CloseEditModalAsync"/>
                 </ModalHeader>
                 <ModalBody>
                     <Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false">
-                        <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
+                        <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp"/>
                         <Validation MessageLocalizer="@LH.Localize">
                             <Field>
                                 <FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
                                 <TextEdit @bind-Text="EditingEntity.Name" Autofocus="true">
                                     <Feedback>
-                                        <ValidationError />
+                                        <ValidationError/>
                                     </Feedback>
                                 </TextEdit>
                             </Field>
-                            <ExtensionProperties TEntityType="IdentityRoleUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH" />
+                            <ExtensionProperties TEntityType="IdentityRoleUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH"/>
                         </Validation>
                         <Field>
                             <Check TValue="bool" @bind-Checked="@EditingEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
@@ -103,7 +104,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Clicked="@UpdateEntityAsync" />
+                    <SubmitButton Clicked="@UpdateEntityAsync"/>
                 </ModalFooter>
             </Form>
         </ModalContent>
@@ -112,5 +113,5 @@
 
 @if (HasManagePermissionsPermission)
 {
-    <PermissionManagementModal @ref="PermissionManagementModal" />
+    <PermissionManagementModal @ref="PermissionManagementModal"/>
 }
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
index bf9befa1e4..35042e7de3 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
@@ -23,7 +23,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
 
         protected bool HasManagePermissionsPermission { get; set; }
 
-        protected PageToolbar Toolbar { get; set; }
+        protected PageToolbar Toolbar { get; } = new();
 
         protected List<TableColumn> RoleManagementTableColumns => TableColumns.Get<RoleManagement>();
 
@@ -36,7 +36,6 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             UpdatePolicyName = IdentityPermissions.Roles.Update;
             DeletePolicyName = IdentityPermissions.Roles.Delete;
             ManagePermissionsPolicyName = IdentityPermissions.Roles.ManagePermissions;
-            Toolbar = new PageToolbar();
         }
 
         protected override ValueTask SetEntityActionsAsync()
@@ -49,10 +48,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
                     {
                         Text = L["Edit"],
                         RequiredPolicy = UpdatePolicyName,
-                        Clicked = async (data) =>
-                        {
-                            await OpenEditModalAsync(data.As<IdentityRoleDto>());
-                        }
+                        Clicked = async (data) => { await OpenEditModalAsync(data.As<IdentityRoleDto>()); }
                     },
                     new EntityAction
                     {
@@ -94,7 +90,9 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
                     },
                 });
 
-            RoleManagementTableColumns.AddRange(GetExtensionTableColumns(IdentityModuleExtensionConsts.ModuleName, IdentityModuleExtensionConsts.EntityNames.Role));
+            RoleManagementTableColumns.AddRange(GetExtensionTableColumns(IdentityModuleExtensionConsts.ModuleName,
+                IdentityModuleExtensionConsts.EntityNames.Role));
+            
             return base.SetTableColumnsAsync();
         }
 
@@ -102,7 +100,8 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
         {
             await base.SetPermissionsAsync();
 
-            HasManagePermissionsPermission = await AuthorizationService.IsGrantedAsync(IdentityPermissions.Roles.ManagePermissions);
+            HasManagePermissionsPermission =
+                await AuthorizationService.IsGrantedAsync(IdentityPermissions.Roles.ManagePermissions);
         }
 
         protected override string GetDeleteConfirmationMessage(IdentityRoleDto entity)
@@ -110,18 +109,14 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             return string.Format(L["RoleDeletionConfirmationMessage"], entity.Name);
         }
 
-        protected override ValueTask SetBreadcrumbItemsAsync()
-        {
-            //BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Roles"]));
-            return base.SetBreadcrumbItemsAsync();
-        }
-
         protected override ValueTask SetToolbarItemsAsync()
         {
-            Toolbar.AddButton(L["NewRole"], OpenCreateModalAsync, IconName.Add,
+            Toolbar.AddButton(L["NewRole"],
+                OpenCreateModalAsync,
+                IconName.Add,
                 requiredPolicyName: CreatePolicyName);
 
             return base.SetToolbarItemsAsync();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
index 1feb03c295..14d62c70e1 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
@@ -1,9 +1,10 @@
 @page "/identity/users"
-@attribute [Authorize( IdentityPermissions.Users.Default )]
+@attribute [Authorize(IdentityPermissions.Users.Default)]
 @using Microsoft.AspNetCore.Authorization
 @using Volo.Abp.PermissionManagement.Blazor.Components
 @using Volo.Abp.BlazoriseUI.Components.ObjectExtending
 @using Volo.Abp.Identity.Localization
+@using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Layout
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
 
 @inherits AbpCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>
@@ -11,20 +12,20 @@
 <Card>
     <CardHeader>
         @* ************************* PAGE HEADER ************************* *@
-        <Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Layout.PageHeader Title="@L["Users"]"
-                                                                              BreadcrumbItems="@BreadcrumbItems"
-                                                                              Toolbar="@Toolbar">
-        </Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Layout.PageHeader>
+        <PageHeader Title="@L["Users"]"
+                    BreadcrumbItems="@BreadcrumbItems"
+                    Toolbar="@Toolbar">
+        </PageHeader>
     </CardHeader>
     <CardBody>
         @* ************************* DATA GRID ************************* *@
         <AbpExtensibleDataGrid TItem="IdentityUserDto"
-                             Data="Entities"
-                             ReadData="OnDataGridReadAsync"
-                             TotalItems="TotalCount"
-                             ShowPager="true"
-                             PageSize="PageSize"
-                             Columns="@UserManagementTableColumns">
+                               Data="Entities"
+                               ReadData="OnDataGridReadAsync"
+                               TotalItems="TotalCount"
+                               ShowPager="true"
+                               PageSize="PageSize"
+                               Columns="@UserManagementTableColumns">
         </AbpExtensibleDataGrid>
     </CardBody>
 </Card>
@@ -33,12 +34,12 @@
 @if (HasCreatePermission)
 {
     <Modal @ref="CreateModal">
-        <ModalBackdrop />
+        <ModalBackdrop/>
         <ModalContent Centered="true">
             <Form>
                 <ModalHeader>
                     <ModalTitle>@L["NewUser"]</ModalTitle>
-                    <CloseButton Clicked="CloseCreateModalAsync" />
+                    <CloseButton Clicked="CloseCreateModalAsync"/>
                 </ModalHeader>
                 <ModalBody>
                     <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
@@ -54,7 +55,7 @@
                                             <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
                                             <TextEdit @bind-Text="NewEntity.UserName" Autofocus="true">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -64,7 +65,7 @@
                                             <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
                                             <TextEdit @bind-Text="NewEntity.Name">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -74,7 +75,7 @@
                                             <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
                                             <TextEdit @bind-Text="NewEntity.Surname">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -84,7 +85,7 @@
                                             <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
                                             <TextEdit Role="TextRole.Password" @bind-Text="NewEntity.Password">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -94,7 +95,7 @@
                                             <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
                                             <TextEdit @bind-Text="NewEntity.Email">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -104,7 +105,7 @@
                                             <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
                                             <TextEdit @bind-Text="NewEntity.PhoneNumber">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -120,7 +121,7 @@
                                         @foreach (var role in NewUserRoles)
                                         {
                                             <Field>
-                                                <input type="hidden" @bind-value="@role.Name" />
+                                                <input type="hidden" @bind-value="@role.Name"/>
                                                 <Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check>
                                             </Field>
                                         }
@@ -132,7 +133,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Clicked="@CreateEntityAsync" />
+                    <SubmitButton Clicked="@CreateEntityAsync"/>
                 </ModalFooter>
             </Form>
         </ModalContent>
@@ -143,16 +144,16 @@
 @if (HasUpdatePermission)
 {
     <Modal @ref="EditModal">
-        <ModalBackdrop />
+        <ModalBackdrop/>
         <ModalContent Centered="true">
             <Form>
                 <ModalHeader>
                     <ModalTitle>@L["Edit"]</ModalTitle>
-                    <CloseButton Clicked="CloseEditModalAsync" />
+                    <CloseButton Clicked="CloseEditModalAsync"/>
                 </ModalHeader>
                 <ModalBody>
                     <Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false">
-                        <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
+                        <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp"/>
 
                         <Tabs @bind-SelectedTab="@EditModalSelectedTab">
                             <Items>
@@ -166,7 +167,7 @@
                                             <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
                                             <TextEdit @bind-Text="EditingEntity.UserName" Autofocus="true">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -176,7 +177,7 @@
                                             <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
                                             <TextEdit @bind-Text="EditingEntity.Name">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -186,7 +187,7 @@
                                             <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
                                             <TextEdit @bind-Text="EditingEntity.Surname">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -196,7 +197,7 @@
                                             <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
                                             <TextEdit Role="TextRole.Password" @bind-Text="EditingEntity.Password">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -206,7 +207,7 @@
                                             <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
                                             <TextEdit @bind-Text="EditingEntity.Email">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -216,7 +217,7 @@
                                             <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
                                             <TextEdit @bind-Text="EditingEntity.PhoneNumber">
                                                 <Feedback>
-                                                    <ValidationError />
+                                                    <ValidationError/>
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -232,7 +233,7 @@
                                         @foreach (var role in EditUserRoles)
                                         {
                                             <Field>
-                                                <input type="hidden" @bind-value="@role.Name" />
+                                                <input type="hidden" @bind-value="@role.Name"/>
                                                 <Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check>
                                             </Field>
                                         }
@@ -244,7 +245,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Clicked="@UpdateEntityAsync" />
+                    <SubmitButton Clicked="@UpdateEntityAsync"/>
                 </ModalFooter>
             </Form>
         </ModalContent>
@@ -253,5 +254,5 @@
 
 @if (HasManagePermissionsPermission)
 {
-    <PermissionManagementModal @ref="PermissionManagementModal" />
+    <PermissionManagementModal @ref="PermissionManagementModal"/>
 }
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
index 52386ddf8f..bc3a2acb14 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
@@ -31,14 +31,14 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
         protected AssignedRoleViewModel[] EditUserRoles;
 
         protected string ManagePermissionsPolicyName;
-        
+
         protected bool HasManagePermissionsPermission { get; set; }
 
         protected string CreateModalSelectedTab = DefaultSelectedTab;
 
         protected string EditModalSelectedTab = DefaultSelectedTab;
 
-        protected PageToolbar Toolbar { get; set; }
+        protected PageToolbar Toolbar { get; } = new();
 
         private List<TableColumn> UserManagementTableColumns => TableColumns.Get<UserManagement>();
 
@@ -51,7 +51,6 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             UpdatePolicyName = IdentityPermissions.Users.Update;
             DeletePolicyName = IdentityPermissions.Users.Delete;
             ManagePermissionsPolicyName = IdentityPermissions.Users.ManagePermissions;
-            Toolbar = new PageToolbar();
         }
 
         protected override async Task OnInitializedAsync()
@@ -179,21 +178,17 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
                     }
                 });
 
-            UserManagementTableColumns.AddRange(GetExtensionTableColumns(IdentityModuleExtensionConsts.ModuleName, IdentityModuleExtensionConsts.EntityNames.User));
+            UserManagementTableColumns.AddRange(GetExtensionTableColumns(IdentityModuleExtensionConsts.ModuleName,
+                IdentityModuleExtensionConsts.EntityNames.User));
             return base.SetEntityActionsAsync();
         }
 
-        protected override ValueTask SetBreadcrumbItemsAsync()
-        {
-            //BreadcrumbItems.Add(new(L["Users"]));
-            return base.SetBreadcrumbItemsAsync();
-        }
-
         protected override ValueTask SetToolbarItemsAsync()
         {
-            Toolbar.AddButton(L["NewUser"], OpenCreateModalAsync, IconName.Add,
-                    requiredPolicyName: CreatePolicyName);
-            
+            Toolbar.AddButton(L["NewUser"], OpenCreateModalAsync,
+                IconName.Add,
+                requiredPolicyName: CreatePolicyName);
+
             return base.SetToolbarItemsAsync();
         }
     }