Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r17902f150cd4e5adee3f6c8f555ebdc9a8ef0133 -r9eb09148e5b2bc28bf60fa6c7300d544947f4379
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 17902f150cd4e5adee3f6c8f555ebdc9a8ef0133)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 9eb09148e5b2bc28bf60fa6c7300d544947f4379)
@@ -508,8 +508,8 @@
     			return;
     		}
     		var isFolder = !ldNode.learningDesignId,
-    			title = prompt(LABELS.RENAME_TITLE_PROMPT + ' ' + (isFolder ? LABELS.FOLDER : LABELS.SEQUENCE)
-						+ ' "' + ldNode.label + '"');
+    			title = prompt(LABELS.RENAME_TITLE_PROMPT + ' ' +
+						(isFolder ? LABELS.FOLDER + ' "' + ldNode.text + '"' : LABELS.SEQUENCE + ' "' + ldNode.label + '"'));
 			
 			// skip if no name or the same name was provided
 			if (!title || ldNode.label == title) {
@@ -969,6 +969,7 @@
 				if (canSetReadOnly && !isOpenDialog) {
 					// detect which folders/sequences are marked as read-only
 					// and which ones are immutable
+
 					if (!node.nodes) {
 						$('#ldStoreDialogReadOnlyCheckbox', layout.ldStoreDialog)
 							.prop('disabled', !node.canModify || !node.canHaveReadOnly)
@@ -980,7 +981,7 @@
 					}
 				} else {
 					// is this is normal user or open dialog, only show/hide read-only label
-					if (node.nodes ? !node.canSave : node.readOnly || !node.canModify){
+					if (node.nodes ? !node.canSave : node.readOnly){
 						$('#ldStoreDialogReadOnlySpan', layout.ldStoreDialog).show();
 					} else {
 						$('#ldStoreDialogReadOnlySpan', layout.ldStoreDialog).hide();
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r09831591952e208b90ca0df0bdaa98d670017e04 -r9eb09148e5b2bc28bf60fa6c7300d544947f4379
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 09831591952e208b90ca0df0bdaa98d670017e04)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 9eb09148e5b2bc28bf60fa6c7300d544947f4379)
@@ -339,62 +339,7 @@
 		return result;
 	},
 	
-	
 	/**
-	 * Loads subfolders and LDs from the server.
-	 */
-	getFolderContents : function(folderID, canSave, canHaveReadOnly) {
-		var result = null;
-			
-		$.ajax({
-			url : LAMS_URL + 'home/getFolderContents.do',
-			data : {
-				'folderID' : folderID,
-				'allowInvalidDesigns' : true
-			},
-			cache : false,
-			async: false,
-			dataType : 'json',
-			success : function(response) {
-				result = [];
-				// parse the response; extract folders and LDs
-				if (response.folders) {
-					$.each(response.folders, function(index){
-						// folderID == -2 is courses folder
-						var canSave = this.folderID > 0 && !this.isRunSequencesFolder;
-						result.push({'type'				   : 'html',
-									 'html'                : (this.isRunSequencesFolder ? LABELS.RUN_SEQUENCES_FOLDER : this.name)
-																+ (canSave ? '' : ' <i class="fa fa-lock"></i>'),
-								  	 'folderID'		       : this.folderID,
-								  	 'isRunSequenceFolder' : this.isRunSequencesFolder,
-								  	 // either take parent's setting or take 2nd (courses) and 3rd (public) folder 
-								  	 'canHaveReadOnly'	   : folderID ? canHaveReadOnly : index > 0,
-								  	 'canSave'		       : canSave,
-						  	         'canModify'	       : this.canModify && !this.isRunSequenceFolder
-									});
-					});
-				}
-				if (response.learningDesigns) {
-					$.each(response.learningDesigns, function(){
-						var canModify = canSave && this.canModify;
-						result.push({'type'				: 'html',
-									 'label'			: this.name,
-									 'html'             : this.name + (this.readOnly || !canModify ? ' <i class="fa fa-lock"></i>' : ''),
-						  	         'isLeaf'           : true,
-						  	         'learningDesignId' : this.learningDesignId,
-						  	         'canHaveReadOnly'	: canHaveReadOnly,
-						  	         'canModify'		: canModify,
-						  	         'readOnly'			: this.readOnly
-							        });
-					});
-				}
-			}
-		});
-		
-		return result;
-	},
-	
-	/**
 	 * Opens a pop up for importing LD. Loads the imported LD to canvas.
 	 */
 	importLearningDesign : function(){
Index: lams_central/web/includes/javascript/learning-design-treeview.js
===================================================================
diff -u -r3640a625938374e930a8842bb760b481ce176401 -r9eb09148e5b2bc28bf60fa6c7300d544947f4379
--- lams_central/web/includes/javascript/learning-design-treeview.js	(.../learning-design-treeview.js)	(revision 3640a625938374e930a8842bb760b481ce176401)
+++ lams_central/web/includes/javascript/learning-design-treeview.js	(.../learning-design-treeview.js)	(revision 9eb09148e5b2bc28bf60fa6c7300d544947f4379)
@@ -86,7 +86,7 @@
 						$.each(response.learningDesigns, function(){
 							var canModify = canSave && this.canModify;
 							result.push({'label'            : this.name,
-										 'text'             : this.name + (this.readOnly || !canModify ? ' <i class="fa fa-lock"></i>' : ''),
+										 'text'             : this.name + (this.readOnly ? ' <i class="fa fa-lock"></i>' : ''),
 							  	         'learningDesignId' : this.learningDesignId,
 							  	         'canHaveReadOnly'	: canHaveReadOnly,
 							  	         'canModify'		: canModify,