Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml
===================================================================
diff -u -r56b3234f9554fa6ae5a6f07319e88dd3e87fe288 -rc5f26ff17ed946dc8f8b33be285b2ee01178ef40
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml	(.../Advanced.mxml)	(revision 56b3234f9554fa6ae5a6f07319e88dd3e87fe288)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml	(.../Advanced.mxml)	(revision c5f26ff17ed946dc8f8b33be285b2ee01178ef40)
@@ -60,7 +60,8 @@
    				} else
    					updateLearnersPerLesson();
    					
-   				checkUsersLoaded();
+   				if(checkUsersLoaded())
+   					noLearnersPerLesson_stp.maximum = lesson.newLesson.learners.users.length;
    			}
    			
    			public function checkUsersLoaded():Boolean {
@@ -77,9 +78,11 @@
    				var valChk:Boolean = checkUsersLoaded();
    				var learnersSize:Number = lesson.newLesson.learners.users.length;
    				
-   				if(noLearnersPerLesson_stp.value > learnersSize)
-   					noLearnersPerLesson_stp.value = (learnersSize > 0) ? learnersSize : 1;
+   				noLearnersPerLesson_stp.maximum = learnersSize;
    				
+   				if(learnersSize <= 0)
+   					noLearnersPerLesson_stp.value = 1;
+   				
    				noLearnersPerLesson = noLearnersPerLesson_stp.value;
    				
    				noInstances = (valChk) ? Math.floor(learnersSize/noLearnersPerLesson) : 1;
@@ -224,7 +227,7 @@
 
 			<mx:CheckBox id="enableSplitLessons" name="enableSplitLessons" selected="false" change="enableSplitLessonsOption()" label="{dictionary.getLabel('wizard.splitLearners.cb.lbl')}" labelPlacement="right" />
 			<mx:FormItem id="enableSplitLessons_fItm" label="{dictionary.getLabel('wizard.splitLearners.LearnersPerLesson.lbl')}" visible="{enableSplitLessons.selected}" >
-				<mx:NumericStepper id="noLearnersPerLesson_stp" value="1" change="updateLearnersPerLesson()"  minimum="1"/>
+				<mx:NumericStepper id="noLearnersPerLesson_stp" value="1" change="updateLearnersPerLesson()"  minimum="1" />
 			</mx:FormItem>
 			
 			<mx:VBox id="learnersNoteBox" width="100%" />
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Learners.mxml
===================================================================
diff -u -r56b3234f9554fa6ae5a6f07319e88dd3e87fe288 -rc5f26ff17ed946dc8f8b33be285b2ee01178ef40
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Learners.mxml	(.../Learners.mxml)	(revision 56b3234f9554fa6ae5a6f07319e88dd3e87fe288)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Learners.mxml	(.../Learners.mxml)	(revision c5f26ff17ed946dc8f8b33be285b2ee01178ef40)
@@ -72,8 +72,10 @@
    				learnersUnselected.sort = getUserSort();
    				learnersUnselected.refresh();
    				
-   				//showOverlay(learners_dgd, false);
-   				//showOverlay(learnersSel_dgd, false);
+   				if(value.length >= 1) {
+   					showOverlay(learners_dgd, false);
+   					showOverlay(learnersSel_dgd, false);
+   				}
    			}
    			
    			public function set staff(value:ArrayCollection):void {
@@ -84,6 +86,11 @@
    				
    				staffSelected = new ArrayCollection();
    				
+   				if(value.length >= 1) {
+   					showOverlay(staff_dgd, false);
+   					showOverlay(staffSel_dgd, false);
+   				}
+   				
    				for each(var staff:Object in staffUnselected) {
    					if(staff.userID == 4) {
    						staffSelected = new ArrayCollection([staff]);
@@ -94,9 +101,6 @@
    				
    				staffSelected.sort = getUserSort();
    				staffSelected.refresh();
-   				
-   				//showOverlay(staff_dgd, false);
-   				//showOverlay(staffSel_dgd, false);
    			}
    			
    			public function printName(value:Object, column:DataGridColumn=null):String {
@@ -155,7 +159,7 @@
 			}
 			
 			private function showDataGridOverlay(event:Event):void {
-				//showOverlay(UIComponent(event.currentTarget), true);
+				showOverlay(UIComponent(event.currentTarget), true);
 			}
 			
 			/* sort users (by name) for data grid columns */
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/vos/WorkspaceItem.as
===================================================================
diff -u -rb791537342fb2b0446a7010efcc2db8ef94e826a -rc5f26ff17ed946dc8f8b33be285b2ee01178ef40
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/vos/WorkspaceItem.as	(.../WorkspaceItem.as)	(revision b791537342fb2b0446a7010efcc2db8ef94e826a)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/vos/WorkspaceItem.as	(.../WorkspaceItem.as)	(revision c5f26ff17ed946dc8f8b33be285b2ee01178ef40)
@@ -5,6 +5,8 @@
 	import flash.events.IEventDispatcher;
 	
 	import mx.collections.ArrayCollection;
+	import mx.collections.Sort;
+	import mx.collections.SortField;
 	
 	import org.lamsfoundation.lams.common.util.WDDXUtil;
 	
@@ -29,13 +31,17 @@
 		private var _resourceType:String;
 		
 		private var _children:ArrayCollection  = new ArrayCollection();
+		private var _sort:Sort;
 		
 		//private var creationDateTime:Date;
 		//private var lastModifiedDateTime:Date;
 	
 		public function WorkspaceItem(dispatcher:IEventDispatcher=null)
 		{
 			super(dispatcher);
+			
+			_sort = new Sort();
+			_sort.fields = [new SortField("name")];
 		}
 
 		public function get name():String {
@@ -78,13 +84,19 @@
 			
 			if(_resourceType == RT_FOLDER)
 				_workspaceFolderID = _resourceID;
+				
+			if(_resourceID != -1) _children.sort = _sort;
+			_children.refresh();
+			
 		}
 		
 		public function set children(value:ArrayCollection):void {
 			_children = value;
 		}
 		
 		public function get children():ArrayCollection {
+			_children.refresh();
+			
 			return _children;
 		}
 		
Index: lams_monitoring/web/CloudWizard.swf
===================================================================
diff -u -rbe74d3dc52dfbec1f93a16c71fd253972600d150 -rc5f26ff17ed946dc8f8b33be285b2ee01178ef40
Binary files differ