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 fdd979b2a0..e72711c6ee 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
@@ -7,51 +7,41 @@
 @using Volo.Abp.AspNetCore.Components.Web.Theming.Layout
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
 
-@inherits AbpCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>
+@inherits AbpCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto,
+IdentityUserUpdateDto>
 
 <Card>
     <CardHeader>
         @* ************************* PAGE HEADER ************************* *@
-        <PageHeader Title="@L["Users"]"
-                    BreadcrumbItems="@BreadcrumbItems"
-                    Toolbar="@Toolbar">
+        <PageHeader Title="@L["Users"]" BreadcrumbItems="@BreadcrumbItems" Toolbar="@Toolbar">
         </PageHeader>
     </CardHeader>
     <CardBody>
-        <Field Horizontal>
-            <FieldBody ColumnSize="ColumnSize.Is2.Is10.WithOffset">
-                <Addons>
-                    <Addon AddonType="AddonType.Start">
-                        <Label>@L["Search"]</Label>
-                    </Addon>
-                    <Addon AddonType="AddonType.Body">
-                        <TextEdit Style="margin-left: 0.5rem" Size="Size.Small" Text="@GetListInput.Filter" TextChanged="@OnSearchTextChanged"/>
-                    </Addon>
-                </Addons>
-            </FieldBody>
-        </Field>
+        <Row>
+            <Column ColumnSize="ColumnSize.Is3">
+                <Field>
+                    <FieldLabel>@L["Search"]</FieldLabel>
+                    <TextEdit Size="Size.Small" Text="@GetListInput.Filter" TextChanged="@OnSearchTextChanged" />
+                </Field>
+            </Column>
+        </Row>
         @* ************************* DATA GRID ************************* *@
-        <AbpExtensibleDataGrid TItem="IdentityUserDto"
-                               Data="Entities"
-                               ReadData="OnDataGridReadAsync"
-                               TotalItems="TotalCount"
-                               ShowPager="true"
-                               PageSize="PageSize"
-                               CurrentPage="@CurrentPage"
-                               Columns="@UserManagementTableColumns">
+        <AbpExtensibleDataGrid TItem="IdentityUserDto" Data="Entities" ReadData="OnDataGridReadAsync"
+            TotalItems="TotalCount" ShowPager="true" PageSize="PageSize" CurrentPage="@CurrentPage"
+            Columns="@UserManagementTableColumns">
         </AbpExtensibleDataGrid>
     </CardBody>
 </Card>
 
 @* ************************* CREATE MODAL ************************* *@
-@if ( HasCreatePermission )
+@if (HasCreatePermission)
 {
     <Modal @ref="CreateModal" Closing="@ClosingCreateModal">
         <ModalContent Centered="true">
             <Form>
                 <ModalHeader>
                     <ModalTitle>@L["NewUser"]</ModalTitle>
-                    <CloseButton Clicked="CloseCreateModalAsync"/>
+                    <CloseButton Clicked="CloseCreateModalAsync" />
                 </ModalHeader>
                 <ModalBody>
                     <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
@@ -67,7 +57,7 @@
                                             <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
                                             <TextEdit @bind-Text="NewEntity.UserName" Autofocus="true">
                                                 <Feedback>
-                                                    <ValidationError/>
+                                                    <ValidationError />
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -77,7 +67,7 @@
                                             <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
                                             <TextEdit @bind-Text="NewEntity.Name">
                                                 <Feedback>
-                                                    <ValidationError/>
+                                                    <ValidationError />
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -87,7 +77,7 @@
                                             <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
                                             <TextEdit @bind-Text="NewEntity.Surname">
                                                 <Feedback>
-                                                    <ValidationError/>
+                                                    <ValidationError />
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -101,10 +91,13 @@
                                                     </TextEdit>
                                                 </Addon>
                                                 <Addon AddonType="AddonType.End">
-                                                    <Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))"><Icon Name="IconName.EyeSlash"/></Button>
+                                                    <Button Color="Color.Secondary"
+                                                    Clicked="@(() => ChangePasswordTextRole(null))">
+                                                        <Icon Name="IconName.EyeSlash" />
+                                                    </Button>
                                                 </Addon>
                                             </Addons>
-                                            <ValidationError Style="display: block"/>
+                                            <ValidationError Style="display: block" />
                                         </Field>
                                     </Validation>
                                     <Validation MessageLocalizer="@LH.Localize">
@@ -112,7 +105,7 @@
                                             <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
                                             <TextEdit @bind-Text="NewEntity.Email">
                                                 <Feedback>
-                                                    <ValidationError/>
+                                                    <ValidationError />
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -122,26 +115,29 @@
                                             <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
                                             <TextEdit @bind-Text="NewEntity.PhoneNumber">
                                                 <Feedback>
-                                                    <ValidationError/>
+                                                    <ValidationError />
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
                                     </Validation>
                                     <Field>
-                                        <Check TValue="bool" @bind-Checked="@NewEntity.IsActive">@L["DisplayName:IsActive"]</Check>
+                                        <Check TValue="bool" @bind-Checked="@NewEntity.IsActive">@L["DisplayName:IsActive"]
+                                        </Check>
                                     </Field>
                                     <Field>
-                                        <Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
+                                        <Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">
+                                            @L["DisplayName:LockoutEnabled"]</Check>
                                     </Field>
-                                    <ExtensionProperties TEntityType="IdentityUserCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH"/>
+                                    <ExtensionProperties TEntityType="IdentityUserCreateDto"
+                                    TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH" />
                                 </TabPanel>
                                 <TabPanel Name="Roles">
-                                    @if ( NewUserRoles != null )
+                                    @if (NewUserRoles != null)
                                     {
-                                        @foreach ( var role in NewUserRoles )
+                                        @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>
                                         }
@@ -153,7 +149,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Clicked="@CreateEntityAsync"/>
+                    <SubmitButton Clicked="@CreateEntityAsync" />
                 </ModalFooter>
             </Form>
         </ModalContent>
@@ -161,18 +157,18 @@
 }
 
 @* ************************* EDIT MODAL ************************* *@
-@if ( HasUpdatePermission )
+@if (HasUpdatePermission)
 {
     <Modal @ref="EditModal" Closing="@ClosingEditModal">
         <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>
@@ -186,7 +182,7 @@
                                             <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
                                             <TextEdit @bind-Text="EditingEntity.UserName" Autofocus="true">
                                                 <Feedback>
-                                                    <ValidationError/>
+                                                    <ValidationError />
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -196,7 +192,7 @@
                                             <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
                                             <TextEdit @bind-Text="EditingEntity.Name">
                                                 <Feedback>
-                                                    <ValidationError/>
+                                                    <ValidationError />
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -206,7 +202,7 @@
                                             <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
                                             <TextEdit @bind-Text="EditingEntity.Surname">
                                                 <Feedback>
-                                                    <ValidationError/>
+                                                    <ValidationError />
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -220,10 +216,13 @@
                                                     </TextEdit>
                                                 </Addon>
                                                 <Addon AddonType="AddonType.End">
-                                                    <Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))"><Icon Name="IconName.EyeSlash"/></Button>
+                                                    <Button Color="Color.Secondary"
+                                                    Clicked="@(() => ChangePasswordTextRole(null))">
+                                                        <Icon Name="IconName.EyeSlash" />
+                                                    </Button>
                                                 </Addon>
                                             </Addons>
-                                            <ValidationError Style="display: block"/>
+                                            <ValidationError Style="display: block" />
                                         </Field>
                                     </Validation>
                                     <Validation MessageLocalizer="@LH.Localize">
@@ -231,7 +230,7 @@
                                             <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
                                             <TextEdit @bind-Text="EditingEntity.Email">
                                                 <Feedback>
-                                                    <ValidationError/>
+                                                    <ValidationError />
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
@@ -241,26 +240,29 @@
                                             <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
                                             <TextEdit @bind-Text="EditingEntity.PhoneNumber">
                                                 <Feedback>
-                                                    <ValidationError/>
+                                                    <ValidationError />
                                                 </Feedback>
                                             </TextEdit>
                                         </Field>
                                     </Validation>
                                     <Field>
-                                        <Check TValue="bool" @bind-Checked="EditingEntity.IsActive">@L["DisplayName:IsActive"]</Check>
+                                        <Check TValue="bool" @bind-Checked="EditingEntity.IsActive">
+                                            @L["DisplayName:IsActive"]</Check>
                                     </Field>
                                     <Field>
-                                        <Check TValue="bool" @bind-Checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
+                                        <Check TValue="bool" @bind-Checked="EditingEntity.LockoutEnabled">
+                                            @L["DisplayName:LockoutEnabled"]</Check>
                                     </Field>
-                                    <ExtensionProperties TEntityType="IdentityUserUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH"/>
+                                    <ExtensionProperties TEntityType="IdentityUserUpdateDto"
+                                    TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH" />
                                 </TabPanel>
                                 <TabPanel Name="Roles">
-                                    @if ( EditUserRoles != null )
+                                    @if (EditUserRoles != null)
                                     {
-                                        @foreach ( var role in EditUserRoles )
+                                        @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>
                                         }
@@ -272,14 +274,14 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Clicked="@UpdateEntityAsync"/>
+                    <SubmitButton Clicked="@UpdateEntityAsync" />
                 </ModalFooter>
             </Form>
         </ModalContent>
     </Modal>
 }
 
-@if ( HasManagePermissionsPermission )
+@if (HasManagePermissionsPermission)
 {
-    <PermissionManagementModal @ref="PermissionManagementModal"/>
+    <PermissionManagementModal @ref="PermissionManagementModal" />
 }