diff --git a/COMETwebapp.Tests/Components/SiteDirectory/EngineeringModels/EngineeringModelsTableTestFixture.cs b/COMETwebapp.Tests/Components/SiteDirectory/EngineeringModels/EngineeringModelsTableTestFixture.cs
index 679ea7c1..79b45c8e 100644
--- a/COMETwebapp.Tests/Components/SiteDirectory/EngineeringModels/EngineeringModelsTableTestFixture.cs
+++ b/COMETwebapp.Tests/Components/SiteDirectory/EngineeringModels/EngineeringModelsTableTestFixture.cs
@@ -141,13 +141,13 @@ public async Task VerifyAddEngineeringModel()
         [Test]
         public async Task VerifyRowClick()
         {
-            Assert.That(this.renderer.Instance.IsModelSelected, Is.EqualTo(false));
+            Assert.That(this.renderer.Instance.IsOnEditMode, Is.EqualTo(false));
 
             var firstRow = this.viewModel.Object.Rows.Items.First();
             var grid = this.renderer.FindComponent<DxGrid>();
             await this.renderer.InvokeAsync(async () => await grid.Instance.SelectedDataItemChanged.InvokeAsync(firstRow));
 
-            Assert.That(this.renderer.Instance.IsModelSelected, Is.EqualTo(true));
+            Assert.That(this.renderer.Instance.IsOnEditMode, Is.EqualTo(true));
         }
     }
 }
diff --git a/COMETwebapp/Components/SiteDirectory/DomainsOfExpertiseTable.razor b/COMETwebapp/Components/SiteDirectory/DomainsOfExpertiseTable.razor
index 447d655c..797f9be2 100644
--- a/COMETwebapp/Components/SiteDirectory/DomainsOfExpertiseTable.razor
+++ b/COMETwebapp/Components/SiteDirectory/DomainsOfExpertiseTable.razor
@@ -33,6 +33,7 @@ Copyright (c) 2023-2024 RHEA System S.A.
                 CustomizeEditModel="this.CustomizeEditThing"
                 EditMode="GridEditMode.PopupEditForm"
                 EditModelSaving="@(() => this.OnEditThingSaving())"
+                EditFormButtonsVisible="false"
                 PageSize="20"
                 PagerNavigationMode="PagerNavigationMode.Auto"
                 PageSizeSelectorVisible="true"
@@ -51,8 +52,6 @@ Copyright (c) 2023-2024 RHEA System S.A.
                         @{
                             var row = (DomainOfExpertiseRowViewModel)context.DataItem;
 
-                            <DxButton Id="editDomainOfExpertiseButton" Text="Edit" Click="@(() => this.Grid.StartEditRowAsync(context.VisibleIndex))" Enabled="@(row.IsAllowedToWrite)"/>
-
                             <DxButton Id="@(row.IsDeprecated ? "undeprecateButton" : "deprecateButton")"
                                       Text="@(row.IsDeprecated ? "Un-deprecate" : "Deprecate")"
                                       Click="() => this.ViewModel.OnDeprecateUnDeprecateButtonClick(row)"
diff --git a/COMETwebapp/Components/SiteDirectory/EngineeringModel/EngineeringModelsTable.razor b/COMETwebapp/Components/SiteDirectory/EngineeringModel/EngineeringModelsTable.razor
index 40c62358..b65c7a18 100644
--- a/COMETwebapp/Components/SiteDirectory/EngineeringModel/EngineeringModelsTable.razor
+++ b/COMETwebapp/Components/SiteDirectory/EngineeringModel/EngineeringModelsTable.razor
@@ -36,7 +36,7 @@ Copyright (c) 2023-2024 RHEA System S.A.
                 PageSizeSelectorVisible="true"
                 PageSizeSelectorItems="@(new[] { 20, 35, 50 })"
                 PageSizeSelectorAllRowsItemVisible="true"
-                CssClass="d-inline">
+                CssClass="d-inline height-fit-content">
             <Columns>
                 <DxGridDataColumn FieldName="@nameof(EngineeringModelRowViewModel.Name)" MinWidth="150"/>
                 <DxGridDataColumn FieldName="@nameof(EngineeringModelRowViewModel.ShortName)" MinWidth="80"/>
@@ -159,29 +159,25 @@ Copyright (c) 2023-2024 RHEA System S.A.
 
         </DxGrid>
         
-        @if (this.IsModelSelected)
-        {
-            <div style="width: 70%;">
-                <DxToolbar ItemClick="@this.OnDetailsItemClick">
-                    <Items>
-                        @foreach (var mappedValue in this.mapOfComponentsAndNames)
-                        {
-                            <DxToolbarItem @key="@(mappedValue.Value)"
-                                           Name="@(mappedValue.Value)" 
-                                           Text="@(mappedValue.Value)" 
-                                           Tooltip="@(mappedValue.Value)"
-                                           RenderStyle="@(mappedValue.Key == this.SelectedComponent ? ButtonRenderStyle.Primary : ButtonRenderStyle.Secondary)" />
-                        }
-                    </Items>
-                </DxToolbar>
-
-                @if (this.SelectedComponent != null)
-                {
-                    <DynamicComponent Type="@this.SelectedComponent" Parameters="this.parameters"/>
-                }
+        <DataItemDetailsComponent IsSelected="@this.IsOnEditMode">
+            <DxToolbar ItemClick="@this.OnDetailsItemClick">
+                <Items>
+                    @foreach (var mappedValue in this.mapOfComponentsAndNames)
+                    {
+                        <DxToolbarItem @key="@(mappedValue.Value)"
+                                       Name="@(mappedValue.Value)" 
+                                       Text="@(mappedValue.Value)" 
+                                       Tooltip="@(mappedValue.Value)"
+                                       RenderStyle="@(mappedValue.Key == this.SelectedComponent ? ButtonRenderStyle.Primary : ButtonRenderStyle.Secondary)" />
+                    }
+                </Items>
+            </DxToolbar>
 
-            </div>
-        }
+            @if (this.SelectedComponent != null)
+            {
+                <DynamicComponent Type="@this.SelectedComponent" Parameters="this.parameters"/>
+            }
+        </DataItemDetailsComponent>
     </div>
     <div class="pb-3"></div>
 </LoadingComponent>
diff --git a/COMETwebapp/Components/SiteDirectory/EngineeringModel/EngineeringModelsTable.razor.cs b/COMETwebapp/Components/SiteDirectory/EngineeringModel/EngineeringModelsTable.razor.cs
index 97a0d7bc..2a1ea2b8 100644
--- a/COMETwebapp/Components/SiteDirectory/EngineeringModel/EngineeringModelsTable.razor.cs
+++ b/COMETwebapp/Components/SiteDirectory/EngineeringModel/EngineeringModelsTable.razor.cs
@@ -45,11 +45,6 @@ public partial class EngineeringModelsTable : SelectedDataItemBase<EngineeringMo
         [Inject]
         public IEngineeringModelsTableViewModel ViewModel { get; set; }
 
-        /// <summary>
-        /// Gets or sets the value to check if a model has been selected
-        /// </summary>
-        public bool IsModelSelected { get; private set; }
-
         /// <summary>
         /// Gets the condition to check if the source model was selected in creation form
         /// </summary>
@@ -116,7 +111,7 @@ protected override void CustomizeEditThing(GridCustomizeEditModelEventArgs e)
         private void OnSelectedDataItemChanged(EngineeringModelRowViewModel row)
         {
             this.ViewModel.Thing = row.Thing;
-            this.IsModelSelected = true;
+            this.IsOnEditMode = true;
             this.parameters[nameof(EngineeringModelSetup)] = row.Thing;
         }