diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/TreeUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/TreeUtil.js
index b8f6e3a4669be70aadf2ad8c98be27761bc518bb..1469a5e620b7fbe2d0d5ce8ff23e7f2a51ff588d 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/TreeUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/TreeUtil.js
@@ -18,7 +18,7 @@ var TreeUtil = new function() {
 	
 	this.getCompleteTree = function($treeContainer) {
 		var treeModel = [{ title : "/", entityType: "ROOT", key : "/", folder : true, lazy : true }];
-		return this.getTreeFromModel($treeContainer, treeModel);
+		return this.getTreeFromModel($treeContainer, treeModel, false);
 	}
 	
 	this.getTreeForEntity = function($treeContainer, entity) {
@@ -26,26 +26,26 @@ var TreeUtil = new function() {
 		debugger;
 		switch(entity["@type"]) {
 			case "SpaceWithProjectsAndRoleAssignments":
-				treeModel = { title : Util.getDisplayNameForEntity(entity), entityType: "SPACE", key : entity.code, folder : true, lazy : true };
+				treeModel = { title : Util.getDisplayNameForEntity(entity), entityType: "SPACE", key : entity.code, folder : true, lazy : true, hideCheckbox: true };
 				break;
 			case "Project":
-				treeModel = { title : Util.getDisplayNameForEntity(entity), entityType: "PROJECT", key : entity.permId, folder : true, lazy : true };
+				treeModel = { title : Util.getDisplayNameForEntity(entity), entityType: "PROJECT", key : entity.permId, folder : true, lazy : true, hideCheckbox: true };
 				break;
 			case "Experiment":
-				treeModel = { title : Util.getDisplayNameForEntity(entity), entityType: "EXPERIMENT", key : entity.permId, folder : true, lazy : true };
+				treeModel = { title : Util.getDisplayNameForEntity(entity), entityType: "EXPERIMENT", key : entity.permId, folder : true, lazy : true, hideCheckbox: true };
 				break;
 			case "Sample":
-				treeModel = { title : Util.getDisplayNameForEntity(entity), entityType: "SAMPLE", key : entity.permId, folder : true, lazy : true };
+				treeModel = { title : Util.getDisplayNameForEntity(entity), entityType: "SAMPLE", key : entity.permId, folder : true, lazy : true, hideCheckbox: true };
 				break;
 			case "DataSet":
 				treeModel = { title : Util.getDisplayNameForEntity(entity), entityType: "DATASET", key : entity.code, folder : false, lazy : false, icon : "fa fa-database" };
 				break;
 		}
 		
-		return this.getTreeFromModel($treeContainer, [treeModel]);
+		return this.getTreeFromModel($treeContainer, [treeModel], true);
 	}
 	
-	this.getTreeFromModel = function($treeContainer, treeModel) {
+	this.getTreeFromModel = function($treeContainer, treeModel, hideCheckboxForFolders) {
 		var glyph_opts = {
         	    map: {
         	      doc: "glyphicon glyphicon-file",
@@ -79,7 +79,7 @@ var TreeUtil = new function() {
     	                var spaces = searchResult.objects;
     	                for (var i = 0; i < spaces.length; i++) {
     	                    var space = spaces[i];
-    	                    results.push({ title : Util.getDisplayNameForEntity(space), entityType: "SPACE", key : space.code, folder : true, lazy : true });
+    	                    results.push({ title : Util.getDisplayNameForEntity(space), entityType: "SPACE", key : space.code, folder : true, lazy : true, hideCheckbox: hideCheckboxForFolders });
     	                }
     	                dfd.resolve(results);
     	    		});
@@ -91,7 +91,7 @@ var TreeUtil = new function() {
     	                var projects = searchResult.objects;
     	                for (var i = 0; i < projects.length; i++) {
     	                    var project = projects[i];
-    	                    results.push({ title : Util.getDisplayNameForEntity(project), entityType: "PROJECT", key : project.permId, folder : true, lazy : true });
+    	                    results.push({ title : Util.getDisplayNameForEntity(project), entityType: "PROJECT", key : project.permId, folder : true, lazy : true, hideCheckbox: hideCheckboxForFolders });
     	                }
     	                dfd.resolve(results);
     	    		});
@@ -103,7 +103,7 @@ var TreeUtil = new function() {
     	                var experiments = searchResult.objects;
     	                for (var i = 0; i < experiments.length; i++) {
     	                    var experiment = experiments[i];
-    	                    results.push({ title : Util.getDisplayNameForEntity(experiment), entityType: "EXPERIMENT", key : experiment.permId, folder : true, lazy : true });
+    	                    results.push({ title : Util.getDisplayNameForEntity(experiment), entityType: "EXPERIMENT", key : experiment.permId, folder : true, lazy : true, hideCheckbox: hideCheckboxForFolders });
     	                }
     	                dfd.resolve(results);
     	    		});
@@ -115,7 +115,7 @@ var TreeUtil = new function() {
     	                var samples = searchResult.objects;
     	                for (var i = 0; i < samples.length; i++) {
     	                    var sample = samples[i];
-    	                    results.push({ title : Util.getDisplayNameForEntity(sample), entityType: "SAMPLE", key : sample.permId, folder : true, lazy : true });
+    	                    results.push({ title : Util.getDisplayNameForEntity(sample), entityType: "SAMPLE", key : sample.permId, folder : true, lazy : true, hideCheckbox: hideCheckboxForFolders });
     	                }
     	                
     	                var datasetRules = { "UUIDv4" : { type : "Experiment", name : "ATTR.PERM_ID", value : permId } };
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/JupyterNotebookView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/JupyterNotebookView.js
index 1d7a175132bc95390e5237a32e877d96a4e762a7..5255bd470e259bd7d8c6267cfcf4d45621f99eb5 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/JupyterNotebookView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/JupyterNotebookView.js
@@ -23,13 +23,12 @@ function JupyterNotebookView(jupyterNotebookController, jupyterNotebookModel) {
 		var $window = $('<form>', { 'action' : 'javascript:void(0);' });
 		
 		$window.append($('<legend>').append("Create Jupyter Notebook"));
-		var $treeContainer = $('<div>');
+		var $treeContainer = $('<div>', { style : "height: 200px; overflow:auto;" });
 		$window.append(FormUtil.getFieldForLabelWithText("Included Datasets (*) ", ""));
 		$window.append($treeContainer);
 		
 		var tree = TreeUtil.getTreeForEntity($treeContainer, this._jupyterNotebookModel.entity);
 		
-		
 		var $workspace = FormUtil._getInputField('text', null, 'workspace Name', null, true);
 		var $notebookName = FormUtil._getInputField('text', null, 'notebook Name', null, true);
 		$window.append(FormUtil.getFieldForComponentWithLabel($workspace, "Workspace"));