diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/StandardProfile.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/StandardProfile.js
index 16c5443a079d802b782f80e3e434afac1f63d784..a6c8709f2f4956d198582d262efc233706c63eea 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/StandardProfile.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/StandardProfile.js
@@ -280,6 +280,7 @@ $.extend(StandardProfile.prototype, DefaultProfile.prototype, {
 					}]
 				},
 				"ORDER" : {
+					"SAMPLE_INFO_DISABLED_AFTER_CREATE" : true,
 					"SAMPLE_PARENTS_TITLE" : "Requests",
 					"SAMPLE_PARENTS_ANY_TYPE_DISABLED" : true,
 					"SAMPLE_CHILDREN_DISABLED" : true,
@@ -619,7 +620,7 @@ $.extend(StandardProfile.prototype, DefaultProfile.prototype, {
 					var orderSummary = new DataGridController("Order Summary", columns, getDataRows, null, false, "ORDER_SUMMARY");
 					orderSummary.init(orderSummaryContainer);
 					
-					var totalsByCurrencyContainer = $("<div>").append($("<h3>").append("Total:"));
+					var totalsByCurrencyContainer = $("<div>").append($("<br>")).append($("<legend>").append("Total:"));
 					for(var currency in absoluteTotalByCurrency) {
 						totalsByCurrencyContainer.append(absoluteTotalByCurrency[currency] + " " + currency).append($("<br>"));
 					}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridView.js
index 87c267f369cb6fbd1b452c6c330a6f0c017b54c0..8a5933cf912b04473a8a56dfe1690c12524276b7 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridView.js
@@ -20,7 +20,7 @@ function DataGridView(dataGridController, dataGridModel) {
 	this.repaint = function($container) {
 		$container.empty();
 		if(this._dataGridModel.title) {
-			$container.append($("<h2>").append(this._dataGridModel.title));
+			$container.append($("<br>")).append($("<legend>").append(this._dataGridModel.title));
 		}
 		$container.append(this._dataGridModel.datagrid);
 	}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
index e5b327dc6950f9bc10edba7036cf87c62922a06a..0abb2f67bf71edab812d42fd8ca9dd8f4130738e 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
@@ -151,15 +151,17 @@ function ProjectFormView(projectFormController, projectFormModel) {
 		// Experiment And Samples Table
 		if(this._projectFormModel.mode !== FormMode.CREATE && !isInventoryProject) {
 			var $experimentsContainer = $("<div>");
+			$formColumn.append($("<legend>").append("Experiments"))
 			$formColumn.append($experimentsContainer);
 			
-			var experimentTableController = new ExperimentTableController(this._projectFormController, "Experiments", this._projectFormModel.project, true);
+			var experimentTableController = new ExperimentTableController(this._projectFormController, null, this._projectFormModel.project, true);
 			experimentTableController.init($experimentsContainer);
 			
 			var $samplesContainer = $("<div>");
+			$formColumn.append($("<legend>").append("Samples"))
 			$formColumn.append($samplesContainer);
 			
-			var sampleTableController = new SampleTableController(this._projectFormController, "Samples", null, this._projectFormModel.project.permId, true);
+			var sampleTableController = new SampleTableController(this._projectFormController, null, null, this._projectFormModel.project.permId, true);
 			sampleTableController.init($samplesContainer);
 		}
 		
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
index 2517a4a25d61ecab808f6d3cb372871157aab359..b4ce49e4aa8154640504b3eaed2a58c3fefa941b 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
@@ -362,7 +362,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
 		//
 		// Identification Info on View/Edit
 		//
-		if(this._sampleFormModel.mode !== FormMode.CREATE) {
+		if(this._sampleFormModel.mode !== FormMode.CREATE && (!sampleTypeDefinitionsExtension || !sampleTypeDefinitionsExtension["SAMPLE_INFO_DISABLED_AFTER_CREATE"])) {
 			this._paintIdentificationInfo($formColumn);
 		}