diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
index d67f4081c14fd68073dcfd0baf4d2e3a1b400068..fd03630f3c0069e6bfcc43da2fcb92eae426dbb5 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
@@ -253,16 +253,16 @@ function MainController(profile) {
 				case "showLabNotebookPage":
 					document.title = "Lab Notebook";
 					var newView = new LabNotebookController(this);
-					var content = this._getBackwardsCompatibleMainContainer();
-					newView.init(content);
+					var views = this._getNewViewModel(true, true, false);
+					newView.init(views);
 					this.currentView = newView;
 					//window.scrollTo(0,0);
 					break;
 				case "showInventoryPage":
 					document.title = "Inventory";
 					var newView = new InventoryController(this);
-					var content = this._getBackwardsCompatibleMainContainer();
-					newView.init(content);
+					var views = this._getNewViewModel(true, true, false);
+					newView.init(views);
 					this.currentView = newView;
 					//window.scrollTo(0,0);
 					break;
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryController.js
index 6263f9bef83a01ae00556b6792dc5b54fc84b9c6..55f0c9b3874c42940a9fa31ed88793d6e39f7d04 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryController.js
@@ -19,7 +19,7 @@ function InventoryController(parentController) {
 	var inventoryModel = new InventoryModel();
 	var inventoryView = new InventoryView(this, inventoryModel);
 	
-	this.init = function($container) {
-		inventoryView.repaint($container);
+	this.init = function(views) {
+		inventoryView.repaint(views);
 	}
 }
\ No newline at end of file
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryView.js
index 5bc2bff7ce81dadac6fabb1687c46c9bdbcee302..96dee3ac740e45481c11922236a10a934f4f54c1 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryView.js
@@ -18,8 +18,7 @@ function InventoryView(inventoryController, inventoryView) {
 	var inventoryController = inventoryController;
 	var inventoryView = inventoryView;
 	
-	this.repaint = function($container) {
-		$container.empty();
+	this.repaint = function(views) {
 		
 		var $form = $("<div>", { "class" : "form-horizontal"});
 		var $formColumn = $("<div>");
@@ -56,15 +55,10 @@ function InventoryView(inventoryController, inventoryView) {
 				
 			});
 		});
-		
 		toolbarModel.push({ component : $export, tooltip: "Export" });
 		
-		
-		
-		$formColumn.append($formTitle);
-		$formColumn.append(FormUtil.getToolbar(toolbarModel));
-		$formColumn.append("<br>");
-		
-		$container.append($form);
+		views.header.append($formTitle);
+		views.header.append(FormUtil.getToolbar(toolbarModel));
+		views.content.append($formColumn);
 	}
 }
\ No newline at end of file
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookController.js
index 183923542f410fac82e224f694ce18213dcb635e..fe2abc707c22c70055542f45ebcf83ff5bd22873 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookController.js
@@ -19,7 +19,7 @@ function LabNotebookController(parentController) {
 	var labNotebookModel = new LabNotebookModel();
 	var labNotebookView = new LabNotebookView(this, labNotebookModel);
 	
-	this.init = function($container) {
-		labNotebookView.repaint($container);
+	this.init = function(views) {
+		labNotebookView.repaint(views);
 	}
 }
\ No newline at end of file
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookView.js
index 3afcb47d63af51e0f961a85ed9eaca10f652c1bb..8ce4cf7ff2dcaa97598ab49bf0aa270b4ba6ff11 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookView.js
@@ -18,8 +18,7 @@ function LabNotebookView(labNotebookController, labNotebookView) {
 	var labNotebookController = labNotebookController;
 	var labNotebookView = labNotebookView;
 	
-	this.repaint = function($container) {
-		$container.empty();
+	this.repaint = function(views) {
 		
 		var $form = $("<div>", { "class" : "form-horizontal"});
 		var $formColumn = $("<div>");
@@ -56,15 +55,10 @@ function LabNotebookView(labNotebookController, labNotebookView) {
 				
 			});
 		});
-		
 		toolbarModel.push({ component : $export, tooltip: "Export" });
 		
-		
-		
-		$formColumn.append($formTitle);
-		$formColumn.append(FormUtil.getToolbar(toolbarModel));
-		$formColumn.append("<br>");
-		
-		$container.append($form);
+		views.header.append($formTitle);
+		views.header.append(FormUtil.getToolbar(toolbarModel));
+		views.content.append($formColumn);
 	}
 }
\ No newline at end of file