diff --git a/css/backoffice/pages/_datamodel-viewer.scss b/css/backoffice/pages/_datamodel-viewer.scss
index 33021fc90..a684eda10 100644
--- a/css/backoffice/pages/_datamodel-viewer.scss
+++ b/css/backoffice/pages/_datamodel-viewer.scss
@@ -33,14 +33,7 @@ $ibo-datamodel-viewer--schema--tooltip--span--margin: 3px !default;
 $ibo-datamodel-viewer--schema--tooltip-top--border-color: $ibo-color-grey-700 !default;
 $ibo-datamodel-viewer--schema--tooltip-top--padding: 3px !default;
 
-
-#ibo-datamodel-viewer{
-  display: flex;
-  flex-direction: row;
-}
-
 .ibo-datamodel-viewer--details{
-  flex-grow: 1;
   .ibo-panel--subtitle{
     @extend %ibo-font-ral-nor-150;
   }
diff --git a/pages/schema.php b/pages/schema.php
index c799b43ee..3566c68fb 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -986,9 +986,12 @@ function DisplayClassDetails($oPage, $sClass, $sContext)
 		'moreinfo' => array('label' => Dict::S('UI:Schema:MoreInfo'), 'description' => Dict::S('UI:Schema:MoreInfo+')),
 		'origin' => array('label' => Dict::S('UI:Schema:Origin'), 'description' => Dict::S('UI:Schema:Origin+')),
 	);
-	
+	$oTablePanel = PanelUIBlockFactory::MakeForClass($sClass, '');
+	$oTablePanel->AddCSSClass('ibo-datatable-panel');
+
 	$oAttributesTable = DataTableUIBlockFactory::MakeForStaticData('', $aConfig, $aDetails, 'ibo-datamodel-viewer--attributes-table', [], "", array('pageLength' => -1));
-	$oPage->AddUiBlock($oAttributesTable);
+	$oTablePanel->AddSubBlock($oAttributesTable);
+	$oPage->AddUiBlock($oTablePanel);
 	$sOrigins = json_encode(array_keys($aOrigins));
 
 	//color calculation in order to keep 1 color for 1 extended class. Colors are interpolated and will be used for