Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -r705e46f5a95d075036b16b9fdc1ce322559c327a -re22e7e035f082eb6b38b4fcadbaef0d2097930ba
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 705e46f5a95d075036b16b9fdc1ce322559c327a)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision e22e7e035f082eb6b38b4fcadbaef0d2097930ba)
@@ -74,6 +74,7 @@
 	private var completed_mc:MovieClip;
 	private var current_mc:MovieClip;
 	private var todo_mc:MovieClip;
+	private var childHolder_mc:MovieClip;
 	//---------------------------//
 	private var child_mc : MovieClip;
 	private var _locked : Boolean;
@@ -116,14 +117,15 @@
 			
 			}else {
 				trace("child's activityID is "+_children [i].activityID)
-				children_mc [i] = childActivities_mc.attachMovie ("CanvasActivityLinear_forOptional", "CanvasActivity" + i, childActivities_mc.getNextHighestDepth (), {_activity : _children [i] , _monitorController : _monitorController, _monitorView : _monitorView, actLabel:_children [i].title, learner:learner});
+				children_mc [i] = childHolder_mc.attachMovie ("CanvasActivityLinear_forOptional", "CanvasActivity" + i, childHolder_mc.getNextHighestDepth (), {_activity : _children [i] , _monitorController : _monitorController, _monitorView : _monitorView, actLabel:_children [i].title, learner:learner});
 				//set the positioning co-ords
-				children_mc [i]._y = (i*21)+8;
-				children_mc [i]._x = 57;
+				children_mc [i]._y = (i*21);
+				//children_mc [i]._x = 57;
 			
 			
 			}
 			children_mc [i]._visible = true;
+			childHolder_mc._visible = false;
 		}
 		
 		MovieClipUtils.doLater (Proxy.create (this, draw));
@@ -133,6 +135,7 @@
 		completed_mc._visible = isVisible;
 		current_mc._visible = isVisible;
 		todo_mc._visible = isVisible;
+		
 	}
 	
 	public function get activity () : Activity
@@ -239,9 +242,28 @@
 	private function localOnRelease () : Void
 	{
 		Debugger.log ('_doubleClicking:' + _doubleClicking + ', localOnRelease:' + this, Debugger.GEN, 'localOnRelease', 'CanvasOptionalActivity');
-		if ( ! _doubleClicking)
-		{
-			_canvasController.activityRelease (this);
+		if (fromModuleTab != "monitorLearnerTab"){
+			if ( ! _doubleClicking)
+			{
+				_canvasController.activityRelease (this);
+			}
+		}else {
+			if (_locked)
+			{
+				_locked = false;
+				gotoAndStop('collapse')
+				childHolder_mc._visible = false;
+				draw ();
+				
+			}else
+			{
+				_locked = true;
+				childHolder_mc._visible = true;
+				gotoAndStop('expand')
+				draw ();
+				
+			}
+			
 		}
 	}
 	private function localOnReleaseOutside () : Void