diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
index 0a85403b..98411287 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
@@ -15,9 +15,7 @@
 @inject ITransferDataService transferDataService 
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 
-<div class="mb-2">
-    Profile
-</div>
+
 <DxGrid @ref="Grid" Data="_detailGridData"
         PageSize="5"
         AutoExpandAllGroupRows="true"
@@ -66,10 +64,11 @@
 
     ILogger _logger;
 
-    public void SaveAddress(Address addressToSave)
+    public void SaveAddress(object addressOwnerToSave)
     {
         
         Grid.SaveChangesAsync();
+        
     }
 
     protected override async Task OnInitializedAsync()
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor b/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor
index d846a529..d9bdb817 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor
@@ -10,12 +10,7 @@
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 
 
-<div class="mb-2">
-    Contact Phone: @PhoneNumber
-</div>
-<div class="mb-2">
-    Contact Phone: @EmailAddress
-</div>
+
 <DxGrid Data="DetailGridData"
         PageSize="5"
         AutoExpandAllGroupRows="true" 
@@ -46,8 +41,6 @@
     List<TransferToDriver> DetailGridData { get; set; }
 
     public UserModelDtoDetail? UserModelDtoDetail;
-    public string PhoneNumber = "";
-    public string EmailAddress = "";
 
     protected override async Task OnInitializedAsync()
     {
@@ -57,8 +50,6 @@
 
         if (UserModelDtoDetail == null) return;
 
-        PhoneNumber = UserModelDtoDetail.UserDto.PhoneNumber;
-        EmailAddress = UserModelDtoDetail.UserDto.EmailAddress;
         DetailGridData = Customer.TransferToDrivers;
 
         _logger.Info($"DetailGridData: {DetailGridData.Count}");
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
index c28d8c4e..5dee744d 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
@@ -85,7 +85,7 @@
 <div class="container">
     <div class="row">
         <div class=" col-12">
-            <Animation Effect="@Effect.Pulse" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
+            <Animation Effect="@Effect.Pulse" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
                 <div class="card">
                     <CompanyGrid @ref="_gridCompany"
                                  Logger="_logger"
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
index 517391f2..3dd18d81 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
@@ -15,6 +15,7 @@
 @using TIAMWebApp.Shared.Application.Services
 @using TIAMSharedUI.Shared.Components
 @using TIAMSharedUI.Shared.Components.Grids
+@using TIAM.Models.Dtos.Users
 @layout AdminLayout
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 @inject IStringLocalizer<TIAMResources> localizer
@@ -59,7 +60,7 @@
 <div class="container">
     <div class="row">
         <div class=" col-12">
-            <Animation Effect="@Effect.Pulse" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
+            <Animation Effect="@Effect.Pulse" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(500)">
                 <div class="card">
 
                     <DxTabs>
@@ -143,7 +144,13 @@
                                         </DxGridDataColumn>
                                     </Columns>
                                     <DetailRowTemplate>
-                                        <Grid_MasterDetail_NestedGrid_DetailContent Customer="(Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
+
+                                        <DxTabs>
+                                            <DxTabPage Text="Driver">
+                                                <Grid_MasterDetail_NestedGrid_DetailContent Customer="(TIAM.Entities.Transfers.Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
+                                            </DxTabPage>                                            
+                                        </DxTabs>
+                                        
                                     </DetailRowTemplate>
                                     <EditFormTemplate Context="EditFormContext">
                                         @{
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
index 3d7bb033..9fcf207c 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
@@ -88,11 +88,11 @@
 
                             <Columns>
                                 <DxGridCommandColumn NewButtonVisible="false" Width="8%" FixedPosition="GridColumnFixedPosition.Left" />
-                                <DxGridDataColumn FieldName="Id" ShowInColumnChooser="false" SortIndex="0" Visible="false" />
-                                <DxGridDataColumn FieldName="ProfileDto.FullName" />                                
-                                <DxGridDataColumn FieldName="UserDto.PhoneNumber" />
-                                <DxGridDataColumn FieldName="UserDto.Created" />
-                                <DxGridDataColumn FieldName="UserDto.EmailConfirmed" />
+                                <DxGridDataColumn Name="@Localizer.GetString("Id")" FieldName="Id" ShowInColumnChooser="false" SortIndex="0" Visible="false" />
+                                <DxGridDataColumn Name="@Localizer.GetString("FullName")" FieldName="ProfileDto.FullName" />
+                                <DxGridDataColumn Name="@Localizer.GetString("PhoneNumber")" FieldName="UserDto.PhoneNumber" />
+                                <DxGridDataColumn Name="@Localizer.GetString("Created")" FieldName="UserDto.Created" />
+                                <DxGridDataColumn Name="@Localizer.GetString("EmailConfirmed")" FieldName="UserDto.EmailConfirmed" />
                                 <DxGridDataColumn FieldName="UserDto.RefferalId" />
                                 <DxGridDataColumn FieldName="UserDto.EmailAddress">
                                     <CellDisplayTemplate>
@@ -107,11 +107,21 @@
                                     </DxGridDataColumn>                                
                             </Columns>
                             <DetailRowTemplate>
-                                <UserGrid_MasterDetail_NestedGrid_UserProductMapping UserModelDtoDetail="(UserModelDtoDetail)context.DataItem" KeyboardNavigationEnabled="true" />
-                            </DetailRowTemplate>
-                            <DetailRowTemplate>
-                                <AddressGridComponent AddressContext="(UserModelDtoDetail)context.DataItem" ContextIdType="userdetailprofile" KeyboardNavigationEnabled="true" />
+                                <DxTabs>
+                                    <DxTabPage Text="Address">
+                                        <AddressGridComponent AddressContext="(UserModelDtoDetail)context.DataItem" ContextIdType="userdetailprofile" KeyboardNavigationEnabled="true" />
+                                    </DxTabPage>
+                                    <DxTabPage Text="Companies owned">
+                                        <ServiceProviderGridComponent UserModelDtoDetail="(UserModelDtoDetail)context.DataItem" />
+                                    </DxTabPage>
+                                    <DxTabPage Text="Roles in services">
+                                        <UserProductMappingGridComponent UserModelDtoDetail="(UserModelDtoDetail)context.DataItem" KeyboardNavigationEnabled="true" />
+                                    </DxTabPage>
+                                </DxTabs>
+                                
+                                
                             </DetailRowTemplate>
+                        
                             <EditFormTemplate Context="EditFormContext">
                                 @{
                                     var transfer2 = (UserModelDtoDetail)EditFormContext.EditModel;
@@ -230,7 +240,6 @@
         }
     }
 
-
     void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
     {
         if (!e.IsNew) return;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
index df3a63f4..e6162284 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
@@ -13,7 +13,7 @@
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 
 <div class="mb-2">
-    Profile
+    <h3>Profile</h3>
 </div>
 <DxGrid Data="_detailGridData"
         PageSize="5"
@@ -54,7 +54,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        _logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_ServiceProviders>(LogWriters.ToArray());
+        _logger = new LoggerClient<ProfileGridComponent>(LogWriters.ToArray());
         if(ContextIdType == null)
         {
             //get all profiles from DB
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_ServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor
similarity index 96%
rename from TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_ServiceProviders.razor
rename to TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor
index 1b57b299..f3c1a5e1 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_ServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor
@@ -12,7 +12,7 @@
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 
 <div class="mb-2">
-    UserProductMapping
+    <h3>Companies owned</h3>
 </div>
 <DxGrid Data="_detailGridData"
         PageSize="5"
@@ -71,7 +71,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        _logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_ServiceProviders>(LogWriters.ToArray());
+        _logger = new LoggerClient<ServiceProviderGridComponent>(LogWriters.ToArray());
 
         _detailGridData = UserModelDtoDetail.ServiceProviders ?? new List<Company>();
         _availableServices = await ServiceProviderDataService.GetServiceProvidersAsync();
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
similarity index 85%
rename from TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor
rename to TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
index 26aefa9a..66afd837 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
@@ -11,9 +11,7 @@
 @inject IServiceProviderDataService ServiceProviderDataService
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 
-<div class="mb-2">
-    UserProductMapping
-</div>
+
 <DxGrid Data="_detailGridData"
         PageSize="5"
         AutoExpandAllGroupRows="true"
@@ -33,19 +31,19 @@
         <DxGridDataColumn FieldName="ProductId" Width="40%" />
         <DxGridDataColumn FieldName="Permissions" />
     </Columns>
-    <EditFormTemplate Context="EditFormContext">
+    <EditFormTemplate Context="UserEditFormContext">
         @{
-            var transfer2 = (UserProductMapping)EditFormContext.EditModel;
+            var transfer2 = (UserProductMapping)UserEditFormContext.EditModel;
         }
         <DxFormLayout CssClass="w-100">
             <DxFormLayoutItem Caption="UserId" ColSpanMd="4">
-                @EditFormContext.GetEditor("UserId")
+                @UserEditFormContext.GetEditor("UserId")
             </DxFormLayoutItem>
             <DxFormLayoutItem Caption="Product:" ColSpanMd="4">
-                <DxComboBox Data="@_availableProducts" TextFieldName="Name" @bind-Value="((UserProductMapping)EditFormContext.EditModel).ProductId" />
+                <DxComboBox Data="@_availableProducts" TextFieldName="Name" @bind-Value="((UserProductMapping)UserEditFormContext.EditModel).ProductId" />
             </DxFormLayoutItem>
             <DxFormLayoutItem Caption="Permissions" ColSpanMd="4">
-                @EditFormContext.GetEditor("Permissions")
+                @UserEditFormContext.GetEditor("Permissions")
             </DxFormLayoutItem>
 
 
@@ -61,14 +59,14 @@
     [Parameter]
     public UserModelDtoDetail UserModelDtoDetail { get; set; }
 
-    private LoggerClient<UserGrid_MasterDetail_NestedGrid_UserProductMapping> _logger;
+    private LoggerClient<UserProductMappingGridComponent> _logger;
 
     List<UserProductMapping> _detailGridData;
     List<Product> _availableProducts;
 
     protected override async Task OnInitializedAsync()
     {
-        _logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_UserProductMapping>(LogWriters.ToArray());
+        _logger = new LoggerClient<UserProductMappingGridComponent>(LogWriters.ToArray());
 
         _detailGridData = UserModelDtoDetail.UserProductMappings ?? new List<UserProductMapping>();
         _availableProducts = await ServiceProviderDataService.GetAllProductsAsync();
diff --git a/TIAMSharedUI/wwwroot/css/TourIAm.css b/TIAMSharedUI/wwwroot/css/TourIAm.css
index 3878a143..39e65a5b 100644
--- a/TIAMSharedUI/wwwroot/css/TourIAm.css
+++ b/TIAMSharedUI/wwwroot/css/TourIAm.css
@@ -243,6 +243,13 @@ select {
         box-shadow: none;
     }
 
+.dxbl-grid .dxbl-grid-empty-data {
+    
+    padding: 5px;
+    border-top: 0;
+    border-bottom: 0;
+}
+
 /*my blazor overrides end*/
 .custom-select {
     padding: 10px 15px 10px 10px !important;