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 5e1100ef3ab1b45c7158c19210b234817890a7de..8252cfdafe0b3da41fc102ecf4acb299bb6181b3 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
@@ -648,10 +648,10 @@ function MainController(profile) {
 	}
 	
 	this._showVocabularyManager = function() {
-		var content = this._getBackwardsCompatibleMainContainer();
+		var views = this._getNewViewModel(true, true, false);
 		
 		var vocabularyManagerController = new VocabularyManagerController(this);
-		vocabularyManagerController.init(content);
+		vocabularyManagerController.init(views);
 		this.currentView = vocabularyManagerController;
 	}
 	
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/VocabularyManager/VocabularyManagerController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/VocabularyManager/VocabularyManagerController.js
index c6f8e94214aab4305b910a47a4c8e5e80c7e00f8..c93f416f6970ff650ae3bc78fe37d82f0d956594 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/VocabularyManager/VocabularyManagerController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/VocabularyManager/VocabularyManagerController.js
@@ -19,7 +19,7 @@ function VocabularyManagerController(mainController) {
 	this._vocabularyManagerModel = new VocabularyManagerModel();
 	this._vocabularyManagerView = new VocabularyManagerView(this, this._vocabularyManagerModel);
 	
-	this.init = function($container) {
-		this._vocabularyManagerView.repaint($container);
+	this.init = function(views) {
+		this._vocabularyManagerView.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/VocabularyManager/VocabularyManagerView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/VocabularyManager/VocabularyManagerView.js
index 5a49197249c7fcb116f92559e9017eb343c001c5..4bde2f281be8bcb6929d20a92da3f869bab47500 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/VocabularyManager/VocabularyManagerView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/VocabularyManager/VocabularyManagerView.js
@@ -20,8 +20,7 @@ function VocabularyManagerView(vocabularyManagerController, vocabularyManagerMod
 	this._dataGridContainer = $("<div>");
 	this._subtitle = $("<legend>");
 	
-	this.repaint = function($container) {
-		$container.empty();
+	this.repaint = function(views) {
 		
 		//
 		// Form template and title
@@ -33,11 +32,14 @@ function VocabularyManagerView(vocabularyManagerController, vocabularyManagerMod
 			"onsubmit" : ""
 		});
 		
-		$containerColumn.append($("<h1>").append("Vocabulary Viewer"));
-		$containerColumn.append(this._subtitle);
+		
+		views.header.append($("<h1>").append("Vocabulary Browser"));
+		views.header.append(this._subtitle);
+		views.content.append($containerColumn);
+		
 		this._showVocabularies();
 		$containerColumn.append(this._dataGridContainer);
-		$container.append($containerColumn);
+		
 	}
 	
 	this._showVocabularies = function() {