diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor
index f2e85394..9115782c 100644
--- a/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor
+++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor
@@ -32,33 +32,31 @@
             <Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
                 <div class="card">
                     <div class="d-flex flex-column mb-4 pb-2">
-                        
 
-                        <CarDetailGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" ContextId="driverId" GetAllTag="SignalRTags.GetCarsForUserProductMapping"></CarDetailGridComponent>
+
+                        <CarGridComponent ContextId="DriverId" GetAllTag="SignalRTags.GetCarsForUserProductMapping"
+                                          NewButtonVisible="true" DeleteButtonVisible="false" EditButtonVisible="true" DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Never" />
 
                     </div>
-
                 </div>
             </Animation>
         </div>
-
         <div class=" col-12 col-xl-6">
         </div>
-
     </div>
 </div>
 
 @code {
 
-    [Parameter] public Guid driverId { get; set; }
+    [Parameter] public Guid DriverId { get; set; }
 
     private LoggerClient<DriverManageCars> _logger;
-    
 
-    protected override async Task OnInitializedAsync()
-    {        
+
+    protected override void OnInitialized()
+    {
         _logger = new LoggerClient<DriverManageCars>(LogWriters.ToArray());
-        
+
         base.OnInitialized();
     }
 
diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
index 8c8ef4f8..6f6fb0d3 100644
--- a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
@@ -100,7 +100,7 @@
                                                     ShowFilterRow="true">
 
                                     <Columns>
-                                        <DxGridCommandColumn NewButtonVisible="false" DeleteButtonVisible="AcDomain.IsDeveloperVersion" Width="80" MinWidth="80" FixedPosition="GridColumnFixedPosition.Left" />
+                                        <DxGridCommandColumn Visible="false" Width="80" MinWidth="80" FixedPosition="GridColumnFixedPosition.Left" />
                                         <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
                                         <DxGridDataColumn FieldName="OrderId" Caption="Order" SortIndex="1" SortOrder="GridColumnSortOrder.Descending" Width="70">
                                             <CellDisplayTemplate>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor
index 5d0aea89..5d329073 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor
@@ -50,10 +50,10 @@
     </Columns>
     <DetailRowTemplate>
         @{
+            // TODO: ide max a transferek kellenek, nem a UserProductMapping! - J.
             <DxTabs>
-
                 <DxTabPage Text="Driving permissions assigned">
-                    <UserProductMappingGridComponent GetAllTag="SignalRTags.GetUserProductMappingsById" ContextIds="new[] { ((Car)context.DataItem).UserProductMappingId }" />
+                    <UserProductMappingGridComponent GetAllTag="SignalRTags.GetUserProductMappingsById" ContextIds="new[] { ((Car)context.DataItem).UserProductMappingId }"/>
                 </DxTabPage>
 
             </DxTabs>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor
index 8b1160f0..bc255083 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor
@@ -20,6 +20,7 @@
 
 <CarGrid Logger="_logger"
          GetAllMessageTag="GetAllTag"
+         ContextIds="@(ContextId.IsNullOrEmpty() ? null : [ContextId])"
          SignalRClient="AdminSignalRClient"
          PageSize="10"
          ValidationEnabled="false"
@@ -29,7 +30,8 @@
          DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"
          ShowFilterRow="true">
     <Columns>
-        <DxGridCommandColumn NewButtonVisible="false" DeleteButtonVisible="false" Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
+        <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" 
+                             Visible="CommandColumnVisible" NewButtonVisible="NewButtonVisible" EditButtonVisible="EditButtonVisible" DeleteButtonVisible="DeleteButtonVisible" />
         <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
         <DxGridDataColumn FieldName="UserProductMappingId" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
         @{
@@ -49,13 +51,12 @@
     </Columns>
     <DetailRowTemplate>
         @{
+            // TODO: ide max a transferek kellenek, nem a UserProductMapping! - J.
             <DxTabs>
-
                 <DxTabPage Text="Driving permissions assigned">
                     <UserProductMappingGridComponent GetAllTag="SignalRTags.GetUserProductMappingsById" ContextIds="new[] { ((Car)context.DataItem).UserProductMappingId }"
                                                      CommandColumnVisible="false" />
                 </DxTabPage>
-
             </DxTabs>
         }
     </DetailRowTemplate>
@@ -95,10 +96,16 @@
 </CarGrid>
 
 @code {
-    [Parameter] public ICarRelation ParentData { get; set; } = null!;
+    [Parameter] public Guid ContextId { get; set; }
+    //[Parameter] public ICarRelation ParentData { get; set; } = null!;
     [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllCars;
     [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
 
+    [Parameter] public bool CommandColumnVisible { get; set; } = true;
+    [Parameter] public bool NewButtonVisible { get; set; } = false;
+    [Parameter] public bool EditButtonVisible { get; set; } = true;
+    [Parameter] public bool DeleteButtonVisible { get; set; } = false;
+
     private LoggerClient<CarGridComponent> _logger = null!;
 
     protected override void OnInitialized()
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
index cd0b9636..fb63d9b6 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
@@ -43,7 +43,7 @@
             var userEmailFieldNameComboItem = $"{nameof(UserProductMapping.User)}.{nameof(User.EmailAddress)}";
             var userNameFieldNameComboItem = $"{nameof(UserProductMapping.User)}.{nameof(User.FullName)}";
         }
-        <DxGridDataColumn FieldName="@userEmailFieldName" Caption="Driver" SortIndex="0" ReadOnly="!DriverId.IsNullOrEmpty()">
+        <DxGridDataColumn FieldName="@userEmailFieldName" Caption="Driver" SortIndex="0" ReadOnly="!DriverId.IsNullOrEmpty()" Visible="DriverId.IsNullOrEmpty()">
             <CellDisplayTemplate>
                 @{
                     var email = string.Empty;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
index 025b5842..88842114 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
@@ -72,8 +72,8 @@
         </DxGridDataColumn>
 
         <DxGridDataColumn FieldName="Permissions" />
-        <DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
-        <DxGridDataColumn FieldName="Modified" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
+        <DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" ReadOnly="true" />
+        <DxGridDataColumn FieldName="Modified" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" ReadOnly="true" />
     </Columns>
     <DetailRowTemplate>
         @{