Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonView.as
===================================================================
diff -u -r0bf23dbe875312c421e1cd6dde296ecf919319aa -r627db0fbdb7c45f0f6db9325dc1cb91900b8ec8b
--- lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	(.../LessonView.as)	(revision 0bf23dbe875312c421e1cd6dde296ecf919319aa)
+++ lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	(.../LessonView.as)	(revision 627db0fbdb7c45f0f6db9325dc1cb91900b8ec8b)
@@ -54,8 +54,8 @@
 	private var progress_scp:MovieClip;
 	private var _activityList:Array;
 	
-	private var ACT_X:Number = 0;
-	private var ACT_Y:Number = 0;
+	private var ACT_X:Number = -32.5;
+	private var ACT_Y:Number = 32.5;
 	
 	//These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
@@ -169,8 +169,8 @@
 			var r = lm.activitiesDisplayed.remove(keys[i]);
 			r.removeMovieClip();
 		}
-		ACT_X = 0;
-		ACT_Y = 0;
+		ACT_X = -25;
+		ACT_Y = 32.5;
 	}
 	
 	/**
@@ -202,15 +202,15 @@
 			var children:Array = lm.learningDesignModel.getComplexActivityChildren(a.activityUIID);
 			Debugger.log('The activity:'+a.title+','+a.activityTypeID+' is is parellel (complex) activity',Debugger.CRITICAL,'drawActivity','LessonView');
 		
-			//newActivity_mc = _activityLayer_mc.createChildAtDepth("LearnerParallelActivityVertical",DepthManager.kTop,{_activity:a,_children:children,_lessonController:lc,_lessonView:lv, _x:ACT_X+25, _y:ACT_Y, learner:learner});
-			//ACT_Y = newActivity_mc._y + newActivity_mc._height;
+			newActivity_mc = _activityLayer_mc.attachMovie("LearnerParallelActivityVertical", "LearnerParallelActivityVertical" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_children:children,_lessonController:lc,_lessonView:lv, _x:ACT_X+25, _y:ACT_Y, learner:lm.progressData});
+			ACT_Y = newActivity_mc._y + newActivity_mc._height;
 			
 		}else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
 			var children:Array = lm.learningDesignModel.getComplexActivityChildren(a.activityUIID);
 			Debugger.log('The activity:'+a.title+','+a.activityTypeID+' is optional (complex) activity',Debugger.CRITICAL,'drawActivity','LessonView');
 		
-			//newActivity_mc = _activityLayer_mc.createChildAtDepth("LearnerOptionalActivityVertical",DepthManager.kTop,{_activity:a,_children:children,_lessonController:lc,_lessonView:lv, _x:ACT_X+25, _y:ACT_Y, learner:learner});
-			//ACT_Y = newActivity_mc._y + newActivity_mc._height;
+			newActivity_mc = _activityLayer_mc.attachMovie("LearnerOptionalActivityVertical","LearnerOptionalActivityVertical" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_children:children,_lessonController:lc,_lessonView:lv, _x:ACT_X+25, _y:ACT_Y, learner:lm.progressData});
+			ACT_Y = newActivity_mc._y + newActivity_mc._height;
 		
 		}else{
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','LessonView');
@@ -225,41 +225,6 @@
 		
 		return true;
 	}
-	
-	public function compareProgressData(learner:Object, activityID:Number):String{
-		trace ("activity ID passed is: "+activityID)
-		trace("Number of Activities completed in the lesson are: "+learner.getCompletedActivities().length)
-		
-		var arrLearnerProgComp = learner.getCompletedActivities()
-		for (var i=0; i<arrLearnerProgComp.length; i++){
-			if (activityID == arrLearnerProgComp[i]){
-				var clipName:String = "completed_mc";
-				return clipName;
-			}
-		
-		}
-		
-		var arrLearnerProgAttempt = learner.getAttemptedActivities()
-		trace("Attempted activities are: "+arrLearnerProgAttempt.length)
-		for (var j=0; j<arrLearnerProgAttempt.length; j++){
-			trace("Activity Id Passed is "+activityID+" and attempted ID is "+arrLearnerProgAttempt[j])
-			if (activityID == arrLearnerProgAttempt[j]){
-				if (activityID == learner.getCurrentActivityId()){
-					var clipName:String = "current_mc";
-					return clipName;
-				}else {
-					var clipName:String = "attempted_mc";
-					return clipName;
-				}
-			}
-			
-		}
-		//arrLearnerProg = learner.getCurrentActivityId()
-		if (activityID == learner.getCurrentActivityId()){
-			var clipName:String = "current_mc";
-			return clipName;
-		}
-	}
 	
 	 /**
     * Sets the size of the Lesson on stage, called from update