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 e00eaefa8a5260caa346c4058a405a65b06b5534..b3d6b72d7f4d7cfc28be4c2efd5f86c217594c5a 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
@@ -640,10 +640,10 @@ function MainController(profile) {
 	}
 	
 	this._showStorageManager = function() {
-		var content = this._getBackwardsCompatibleMainContainer();
+		var views = this._getNewViewModel(true, true, false);
 		
 		var storageManagerController = new StorageManagerController(this);
-		storageManagerController.init(content);
+		storageManagerController.init(views);
 		this.currentView = storageManagerController;
 	}
 	
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerController.js
index 3a0c8b591713e47878cc7a1171ff8aa14f4742e1..412d5b4b5d6fac6c7e851bb283496f1b03dea423 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerController.js
@@ -265,11 +265,11 @@ function StorageManagerController(mainController) {
 		}
 	});
 	
-	this.init = function($container) {
+	this.init = function(views) {
 		if(!FormUtil.getDefaultStoragesDropDown("", true)) {
 			Util.showError("You need to configure the storage options to manage them. :-)");
 		} else {
-			this._storageManagerView.repaint($container);
+			this._storageManagerView.repaint(views);
 		}
 	}
 	
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerView.js
index 7d2db6b68c845082409f11275309f2e97672bad0..7d231404bd2b23dfa0b616038bdacbbc88c183e8 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerView.js
@@ -21,10 +21,17 @@ function StorageManagerView(storageManagerController, storageManagerModel, stora
 	this._storageFromView = storageFromView;
 	this._storageToView = storageToView;
 	this._changeLogContainer = $("<div>").append("None");
-	this._moveBtn = $("<a>", { "class" : "btn btn-primary"}).append("Accept Changes");
 	
-	this.repaint = function($container) {
-		$container.empty();
+	this._moveBtn = FormUtil.getButtonWithIcon("glyphicon-floppy-disk", null, "Save Changes");
+	this._moveBtn.removeClass("btn-default");
+	this._moveBtn.addClass("btn-primary");
+	
+	this.repaint = function(views) {
+		var $header = views.header;
+		var $container = views.content;
+		
+		$header.append($("<h2>").append("Storage Manager"));
+		$header.append(this._moveBtn);
 		
 		var $containerColumn = $("<form>", { 
 			"class" : "form-horizontal", 
@@ -46,9 +53,6 @@ function StorageManagerView(storageManagerController, storageManagerModel, stora
 		
 		$containerColumn.append($twoColumnsContainer);
 		$containerColumn.append($("<div>").append($("<h2>").append("Changes")).append(this._changeLogContainer));
-		$containerColumn.append($("<br>"));
-		$containerColumn.append(this._moveBtn);
-		
 		$container.append($containerColumn);
 	}