Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
===================================================================
diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision 60db93c549c96bad95e890f34add10c4ef9d3d2e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -47,7 +47,6 @@
 	
 	private static var MODULE:String = "authoring";
 
-	private static var _controlKeyPressed:String;
 	public static var TOOLBAR_X:Number = 0;
     public static var TOOLBAR_Y:Number = 21;
 	public static var TOOLBAR_HEIGHT:Number = 35;
@@ -689,14 +688,6 @@
 		return _canvas;
 	}
 	
-	public function get controlKeyPressed():String{
-        return _controlKeyPressed;
-    }
-	
-	public function set controlKeyPressed(key:String){
-        _controlKeyPressed = key;
-    }
-	
 	public function set root_layout(a:String){
 		_root_layout = a;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -r9aab591f71aa913ad9b848d8cd406728c171470b -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 9aab591f71aa913ad9b848d8cd406728c171470b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -67,7 +67,7 @@
 	private var _activity:Activity;
 	
 	private var _isSelected:Boolean;
-	private var app:Application;
+	private var app:ApplicationParent;
 	
 	//locals
 	private var learnerOffset_X:Number = 4;
@@ -110,12 +110,14 @@
 	private var _branchView:CanvasBranchView;
 	private var _setupBranchView:Boolean;
 	
+	private var _ddm:DesignDataModel;
+	
 	function CanvasActivity(_connector){
 		_tm = ThemeManager.getInstance();
 		_ccm = CustomContextMenu.getInstance();
 		
 		//Get reference to application and design data model
-		app = Application.getInstance();
+		app = ApplicationParent.getInstance();
 		
 		//let it wait one frame to set up the components.
 		//this has to be set b4 the do later :)
@@ -340,7 +342,7 @@
 		clickTarget_mc._visible = true;
 		fade_mc._visible = false;
 			
-		if(_activity.isReadOnly() && app.canvas.ddm.editOverrideLock == 1){
+		if(_activity.isReadOnly() && getDDM().editOverrideLock == 1){
 			Debugger.log("Making transparent layer visible. ", Debugger.CRITICAL, 'draw', 'CanvasActivity');
 			fade_mc._visible = true;
 		}
@@ -460,6 +462,7 @@
 						_canvasController.activityDoubleClick(this);
 					}
 				}
+				
 				app.controlKeyPressed = "";
 				
 			}else{
@@ -664,5 +667,13 @@
 	public function set setupBranchView(a:Boolean):Void {
 		_setupBranchView = a;
 	}
+	
+	private function getDDM():DesignDataModel {
+		if(_module == "monitoring") {
+			return _monitorView.ddm;
+		} else {
+			return _canvasView.ddm;
+		}
+	}
 
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -r7548a5a6349a58e304bfa7b35805978121ccbd87 -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 7548a5a6349a58e304bfa7b35805978121ccbd87)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -54,28 +54,32 @@
 	private var _canvasView : CanvasView;
 	private var _monitorController : MonitorController;
 	private var _monitorTabView : MonitorTabView;
-	private var _ca = ComplexActivity;
+	private var _ca = ComplexActivity;
+	
 	//Set by the init obj
 	private var _activity : Activity;
 	private var _children : Array;
 	private var children_mc : Array 
 	private var panelHeight : Number;
 	private var actMinOptions: Number;
-	private var actMaxOptions: Number;
+	private var actMaxOptions: Number;
+	
 	//refs to screen items:
 	private var container_pnl : Panel;
 	private var header_pnl : Panel;
 	private var act_pnl : Panel;
 	private var title_lbl : Label;
-	private var actCount_lbl : Label;
+	private var actCount_lbl : Label;
+	
 	//locals
 	private var childActivities_mc : MovieClip;
 	private var optionalActivity_mc : MovieClip;
 	private var clickTarget_mc : MovieClip;
 	private var padlockClosed_mc : MovieClip;
 	private var padlockOpen_mc : MovieClip;
 	private var _dcStartTime : Number = 0;
-	private var _doubleClicking : Boolean;
+	private var _doubleClicking : Boolean;
+	
 	// Only for Monitor Optional Container children
 	private var fromModuleTab:String;
 	private var learner:Object = new Object();
@@ -89,22 +93,19 @@
 	private var _visibleHeight : Number;
 	private var _visibleWidth : Number;
 	private var _tm : ThemeManager;
-	private var _ddm : DesignDataModel;
 	private var _dictionary:Dictionary;
 	
-	function CanvasOptionalActivity ()	{
-		optionalActivity_mc = this
-		_ddm = new DesignDataModel ();
+	function CanvasOptionalActivity()	{
+		optionalActivity_mc = this;
 		
 		_visible = false;
 		_tm = ThemeManager.getInstance ();
 		_dictionary = Dictionary.getInstance();
 		_visibleHeight = container_pnl._height;
 		_visibleWidth = container_pnl._width;
 		_ca = new ComplexActivity(_activity.activityUIID)
-		_activity.activityCategoryID = Activity.CATEGORY_SYSTEM
-		//_activity.title = Dictionary.getValue('opt_activity_title')
-		//init();
+		_activity.activityCategoryID = Activity.CATEGORY_SYSTEM;
+		
 		MovieClipUtils.doLater (Proxy.create (this, init));
 	}
 	
@@ -116,15 +117,15 @@
 		actMinOptions = _ca.minOptions;
 		actMaxOptions = _ca.maxOptions;
 		
-		_ddm.getComplexActivityChildren(_activity.activityUIID);
 		showStatus(false);
 		
 		CHILD_OFFSET_X = 8;
 		CHILD_OFFSET_Y = 57;
 		
 		for (var j=0; j<children_mc.length; j++){
 			children_mc[j].removeMovieClip();
-		}
+		}
+		
 		children_mc = new Array();
 		
 		for (var i = 0; i < _children.length; i ++)		{
@@ -133,7 +134,8 @@
 			}else {
 				children_mc [i] = childActivities_mc.attachMovie ("CanvasActivity", "CanvasActivity"+i, childActivities_mc.getNextHighestDepth (), {_activity:_children [i] , _canvasController:_canvasController, _canvasView:_canvasView});
 				
-			}
+			}
+			
 			//set the positioning co-ords
 			children_mc [i].activity.xCoord = CHILD_OFFSET_X;
 			children_mc [i].activity.yCoord = CHILD_OFFSET_Y + (i * CHILD_INCRE);
@@ -212,7 +214,8 @@
 		//clickTarget_mc.swapDepths(childActivities_mc.getNextHighestDepth());
 		var numOfChildren = _children.length
 		panelHeight = CHILD_OFFSET_Y + (numOfChildren * CHILD_INCRE);
-		setStyles ()
+		setStyles();
+		
 		//write text
 		title_lbl.text = _activity.title 		//Dictionary.getValue('opt_activity_title'); //'Optional Activities'
 		//_activity.title = 'Optional Activities';
@@ -234,7 +237,6 @@
 		
 		Debugger.log ("I am in Draw :" + _activity.title + 'uiID:' + _activity.activityUIID + ' children:' + _children.length, Debugger.GEN, 'Draw', 'CanvasOptionalActivity');
 		_visible = true;
-		//child1_mc._visible = true;
 	}
 	
 	private function setLocking():Void{
@@ -364,8 +366,8 @@
 		styleObj = _tm.getStyleObject ('PIlabel');
 		actCount_lbl.setStyle ('styleName', styleObj);
 		styleObj = _tm.getStyleObject ('OptHeadPanel');
-		header_pnl.setStyle ('styleName', styleObj);
-		//styleObj = _tm.getStyleObject ('OptActContainerPanel');
+		header_pnl.setStyle ('styleName', styleObj);
+		
 		styleObj = getAssociatedStyle();
 		container_pnl.setStyle ('styleName', styleObj);
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
diff -u -r30b7641a18c8c83b3722fc22bb936d54f4eaa18b -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 30b7641a18c8c83b3722fc22bb936d54f4eaa18b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -45,12 +45,14 @@
 	private var CHILD2_OFFSET_Y:Number = 108 //130.5;
 	private var newContainerXCoord:Number; 
 	private var newContainerYCoord:Number;
+	
 	//this is set by the init object
 	private var _canvasController:CanvasController;
 	private var _canvasView:CanvasView;
 	private var _monitorController:MonitorController;
-	private var _monitorTabView : MonitorTabView;
+	private var _monitorTabView:MonitorTabView;
 	private var _tm:ThemeManager;
+	
 	//Set by the init obj
 	private var _activity:Activity;
 	private var _children:Array;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
diff -u -r9cff9ef484b8a878642260d5417f1bb407c7f281 -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 9cff9ef484b8a878642260d5417f1bb407c7f281)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -471,6 +471,10 @@
 	public function showEditOnFly(b:Boolean){
 		isRedit_on_fly = b;
 	}
+	
+	public function get ddm():DesignDataModel {
+		return _cm.getCanvas().ddm;
+	}
 
 	/**
 	 * Overrides method in abstract view to ensure cortect type of controller is returned
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as
===================================================================
diff -u -ra1c9450f32f9aad15fbaf25627742f22865df864 -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as	(.../Application.as)	(revision a1c9450f32f9aad15fbaf25627742f22865df864)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as	(.../Application.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -47,16 +47,9 @@
 		
 	private static var SHOW_DEBUGGER:Boolean = false;
 	private static var MODULE:String = "monitoring";
-	/*
-    private static var TOOLBAR_X:Number = 10;
-    private static var TOOLBAR_Y:Number = 35;
-*/
-	private static var _controlKeyPressed:String;
+
 	public static var TOOLBAR_X:Number = 0;
     public static var TOOLBAR_Y:Number = 21;
-
-    //private static var LESSONS_X:Number = 0;
-    //private static var LESSONS_Y:Number = 21;
     
     public static var MONITOR_X:Number = 0;
     public static var MONITOR_Y:Number = 55;
@@ -84,7 +77,6 @@
     private static var X_KEY:Number = 88;
     private static var C_KEY:Number = 67;
 	private static var D_KEY:Number = 68;
-	//private static var T_KEY:Number = 84;
     private static var V_KEY:Number = 86;
     private static var Z_KEY:Number = 90; 
     private static var Y_KEY:Number = 89;
@@ -93,9 +85,7 @@
 
 	private var _uiLoadCheckCount = 0;				// instance counter for number of times we have checked to see if theme and dict are loaded
 	private var _dataLoadCheckCount = 0;			
-	
-	//private var _ddm:DesignDataModel;
-    //private var _toolbar:Toolbar;
+	
     private var _lessons:Lesson;
     private var _monitor:Monitor;
     private var _workspace:Workspace;
@@ -382,17 +372,7 @@
     public function UIElementLoaded(evt:Object) {
         //Debugger.log('UIElementLoaded: ' + evt.target.className,Debugger.GEN,'UIElementLoaded','Application');
         if(evt.type=='load'){
-            //Which item has loaded
-            /**switch (evt.target.className) {
-				case 'LFMenuBar' :
-                    _menuLoaded = true;
-                    break;
-                case 'Monitor' :
-                    _monitorLoaded = true;
-                    break;
-                default:
-            }*/
-			
+
 			_layout.manager.addLayoutItem(new LFLayoutItem(evt.target.className, evt.target));
 			
 			loader.complete();
@@ -412,9 +392,11 @@
     */
     private function setupUI(){
 		_ccm.showCustomCM(_ccm.loadMenu("application", "monitoring"))
-        //Create the application root
+        
+		//Create the application root
         _appRoot_mc = _container_mc.createEmptyMovieClip('appRoot_mc',APP_ROOT_DEPTH);
-        //Create screen elements
+        
+		//Create screen elements
         _dialogueContainer_mc = _container_mc.createEmptyMovieClip('_dialogueContainer_mc',DIALOGUE_DEPTH);
         
         _cursorContainer_mc = _container_mc.createEmptyMovieClip('_cursorContainer_mc',CURSOR_DEPTH);
@@ -540,11 +522,7 @@
     */
     public function getMonitor():Monitor{
         return _monitor;
-    }
-	public function get controlKeyPressed():String{
-        return _controlKeyPressed;
-    }
-   
+    }
 	
 	/**
 	* returns the lesson instance
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
===================================================================
diff -u -r4f3911de7b458bcf548489361221b859f4d5cfa5 -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision 4f3911de7b458bcf548489361221b859f4d5cfa5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -481,7 +481,7 @@
 			switch(stateID){
 				case LessonTabView.REMOVE_CBI :
 					var confirmMsg:String = Dictionary.getValue('ls_remove_confirm_msg');
-					var warningMsg:String = Dictionary.getValue('ls_remove_warning_msg', [_monitorModel.getSequence().getSequenceName()]);
+					var warningMsg:String = Dictionary.getValue('ls_remove_warning_msg', [LessonTabView(getView()).showStatus(_monitorModel.getSequence().state).toLowerCase()]);
 					
 					var warningNoHandler = Proxy.create(_monitorModel, _monitorModel.removeSequence);
 					var confirmOkHandler = Proxy.create(this, removalAlert, warningMsg, null, warningNoHandler);
@@ -508,6 +508,8 @@
 			}
 			
 			clearBusy();
+		} else {
+			Debugger.log("Unable to run method as controller is busy", Debugger.CRITICAL, "changeStatus", "MonitorController");
 		}
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
===================================================================
diff -u -r639307d7ea962ea58a2978c48ed024812317919e -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	(.../LessonTabView.as)	(revision 639307d7ea962ea58a2978c48ed024812317919e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	(.../LessonTabView.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -506,7 +506,7 @@
 		
 	}
 
-	private function showStatus(seqStatus:Number):String{
+	public function showStatus(seqStatus:Number):String{
 		var seqStat:String;
 		var s:Object = mm.getSequence();
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
diff -u -r87e51ef841f44d50ea12a33c634f2495a01c7fe3 -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision 87e51ef841f44d50ea12a33c634f2495a01c7fe3)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -24,18 +24,20 @@
 import org.lamsfoundation.lams.common.util.*
 import org.lamsfoundation.lams.common.ui.*
 import org.lamsfoundation.lams.common.*
-import org.lamsfoundation.lams.common.style.*
+import org.lamsfoundation.lams.common.style.*
+import org.lamsfoundation.lams.common.dict.*
+import org.lamsfoundation.lams.common.mvc.*
+
 import org.lamsfoundation.lams.monitoring.mv.*
 import org.lamsfoundation.lams.monitoring.mv.tabviews.*;
-import org.lamsfoundation.lams.monitoring.*;
-import org.lamsfoundation.lams.common.dict.*
-import org.lamsfoundation.lams.common.mvc.*
+import org.lamsfoundation.lams.monitoring.*;
+
 import org.lamsfoundation.lams.authoring.Activity;
 import org.lamsfoundation.lams.authoring.ComplexActivity;
-import org.lamsfoundation.lams.authoring.cv.CanvasActivity;
-//import org.lamsfoundation.lams.authoring.cv.CanvasParallelActivity;
-import org.lamsfoundation.lams.authoring.Transition;
-//import org.lamsfoundation.lams.authoring.cv.*;
+import org.lamsfoundation.lams.authoring.cv.CanvasActivity;
+import org.lamsfoundation.lams.authoring.DesignDataModel;
+import org.lamsfoundation.lams.authoring.Transition;
+
 import mx.managers.*
 import mx.containers.*;
 import mx.events.*
@@ -339,17 +341,17 @@
 		
 		//take action depending on act type
 		if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity() ){
-			newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc,_monitorTabView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc});
+			newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc});
 		} else if (a.isGateActivity()){
-			newActivity_mc = activityLayer.createChildAtDepth("CanvasGateActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc,_monitorTabView:mtv, _module:"monitoring"});
+			newActivity_mc = activityLayer.createChildAtDepth("CanvasGateActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring"});
 		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE){
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
-			newActivity_mc = activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kBottom,{_activity:a,_children:children,_monitorController:mc,_monitorTabView:mtv,fromModuleTab:"monitorMonitorTab",learnerContainer:_learnerContainer_mc});
+			newActivity_mc = activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kBottom,{_activity:a,_children:children, _monitorController:mc,_monitorTabView:mtv,fromModuleTab:"monitorMonitorTab",learnerContainer:_learnerContainer_mc});
 		} else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
 			newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kBottom,{_activity:a,_children:children,_monitorController:mc,_monitorTabView:mtv,fromModuleTab:"monitorMonitorTab",learnerContainer:_learnerContainer_mc});	
 		} else if(a.isBranchingActivity()){	
-			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc,_monitorTabView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc});
+			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc});
 		} else {
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','MonitorTabView');
 		}
@@ -505,6 +507,10 @@
 	public function getLearnerIcon():MovieClip {
 		return _learnerContainer_mc;
 	}
+	
+	public function get ddm():DesignDataModel {
+		return mm.getMonitor().ddm;
+	}
 	
 	/**
 	 * Overrides method in abstract view to ensure cortect type of controller is returned
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as
===================================================================
diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision 60db93c549c96bad95e890f34add10c4ef9d3d2e)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -53,6 +53,8 @@
 	public static var NORMAL_MODE:String = "author";		// Normal Operation Mode
 	public static var EDIT_MODE:String = "editonfly";		// Edit-On-The-Fly Mode
 
+	public static var DIALOGUE_DEPTH:Number = 55;	//depth of the cursors
+    
     private var _comms:Communication;
     private var _themeManager:ThemeManager;
     private var _dictionary:Dictionary;
@@ -61,8 +63,9 @@
 	
 	private var _currentDialog:MovieClip;
 	private var _customCursor_mc:MovieClip;         //Cursor container
-    
 	
+	private static var _controlKeyPressed:String;
+	
 	//Data flags
     private var _dictionaryLoaded:Boolean;             //Dictionary loaded flag
     private var _dictionaryEventDispatched:Boolean     //Event status flag
@@ -75,8 +78,6 @@
 
 	private var _appRoot_mc:MovieClip;                 //Application root clip
 	private var _dialogueContainer_mc:MovieClip;       //Dialog container
-    
-    
 
 	// constructor
 	public function ApplicationParent(app:Object) {
@@ -264,12 +265,25 @@
         }
     }
 	
+	public function get dialogueContainer():MovieClip {
+		if(_dialogueContainer_mc == undefined) _dialogueContainer_mc = _appRoot_mc.createEmptyMovieClip('_dialogueContainer_mc', DIALOGUE_DEPTH);
+		return _dialogueContainer_mc;
+	}
+	
 	public function get dialog():MovieClip {
 		return _currentDialog;
 	}
 	
 	public function set dialog(a:MovieClip) {
 		_currentDialog = a;
-	}
+	}
 	
+	public function get controlKeyPressed():String{
+        return _controlKeyPressed;
+    }
+	
+	public function set controlKeyPressed(key:String){
+        _controlKeyPressed = key;
+    }
+	
 }
\ No newline at end of file
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as
===================================================================
diff -u -r30d3b69f71320d2c72e923ea6f18df194c76acdd -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as	(.../Dialog.as)	(revision 30d3b69f71320d2c72e923ea6f18df194c76acdd)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as	(.../Dialog.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -54,6 +54,10 @@
     }
 	
 	static function createAlertDialog(title:String, msg:String, okButtonLabel:String, cancelButtonLabel:String, okHandler:Function, cancelHandler:Function, type:Number):MovieClip {
+		Debugger.log("static fn", Debugger.CRITICAL, "createAlertDialog", "Dialog");
+		
+		var _alertDialog:MovieClip;
+		
 		_inputTitle = title;
 		_inputMessage = msg;
 		_inputOkButtonLabel = okButtonLabel;
@@ -63,19 +67,29 @@
 		
 		if(type != null) _inputType = type;
 		
-		var target:MovieClip;
+		var target:MovieClip = null;
 		
-		
 		if(ApplicationParent.getInstance().getWorkspace().getWV().isOpen) {
 			target = ApplicationParent.getInstance().getWorkspace().getWV().workspaceDialog;
+			Debugger.log("target 1:" + target, Debugger.CRITICAL, "createAlertDialog", "Dialog");
 		} else if(ApplicationParent.getInstance().dialog.content) {
 			target = ApplicationParent.getInstance().dialog;
+			Debugger.log("target 2:" + target, Debugger.CRITICAL, "createAlertDialog", "Dialog");
 		} else {
-			target = ApplicationParent.dialogue;
+			target = ApplicationParent.getInstance().dialogueContainer;
+			Debugger.log("target 3:" + target, Debugger.CRITICAL, "createAlertDialog", "Dialog");
 		}
 		
-		var _alertDialog:MovieClip = target.attachMovie('alertDialog', 'alertDialog' + new Date().toString(), DepthManager.kTopmost, {_x:0, _y:0});
-
+		try {
+			_alertDialog = target.attachMovie('alertDialog', 'alertDialog' + new Date().toString(), DepthManager.kTopmost, {_x:0, _y:0});
+			
+			Debugger.log("target:" + target, Debugger.CRITICAL, "createAlertDialog", "Dialog");
+			Debugger.log("alertDialog:" + _alertDialog, Debugger.CRITICAL, "createAlertDialog", "Dialog");
+			
+		} catch(error:Error) {
+			Debugger.log(error.name + ": " + error.message, Debugger.CRITICAL, "createAlertDialog", "Dialog");
+			_alertDialog.removeMovieClip();
+		}
 		//Assign dialog load handler
 		_alertDialog.addEventListener('contentLoaded', Proxy.create(org.lamsfoundation.lams.common.ui.Dialog,alertDialogLoaded));
 
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as
===================================================================
diff -u -r30d3b69f71320d2c72e923ea6f18df194c76acdd -r245728d04c9feab340685e9d94b5623e0f9a1d74
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as	(.../LFMessage.as)	(revision 30d3b69f71320d2c72e923ea6f18df194c76acdd)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as	(.../LFMessage.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
@@ -77,16 +77,20 @@
   
   public static function showMessageAlert(msg, okHandler){
 	var title:String = "<b>" + Dictionary.getValue('al_alert') + "</b>\n";
-	var _dialog:MovieClip;
+	var _dialog:MovieClip;
+	
 	if(okHandler != undefined){
 		_dialog = Dialog.createAlertDialog(title, msg, Dictionary.getValue('al_ok'), null, okHandler, null, AlertDialog.ALERT);
 	}else{
 		_dialog = Dialog.createAlertDialog(title, msg, Dictionary.getValue('al_ok'), null, null, null, AlertDialog.ALERT);
 	}
+	
+	Debugger.log("dialog: " + _dialog, Debugger.CRITICAL, "showMessageAlert", "LFMessage");
   }
   
    public static function showMessageConfirm(msg:String, okHandler:Function, cancelHandler:Function, okLabel:String, cancelLabel:String,  msgTitle:String){
-
+	var _dialog:MovieClip;
+	
 	if(msgTitle == null){
 		msgTitle = Dictionary.getValue('al_confirm');
 	}
@@ -101,7 +105,9 @@
 		cancelLabel = Dictionary.getValue('al_cancel');
 	}
 	
-	Dialog.createAlertDialog(title, msg, okLabel, cancelLabel, okHandler, cancelHandler, AlertDialog.CONFIRM);
+	_dialog = Dialog.createAlertDialog(title, msg, okLabel, cancelLabel, okHandler, cancelHandler, AlertDialog.CONFIRM);
+	
+	Debugger.log("dialog: " + _dialog, Debugger.CRITICAL, "showMessageConfirm", "LFMessage");
   }
   
  /**
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -ra1c9450f32f9aad15fbaf25627742f22865df864 -r245728d04c9feab340685e9d94b5623e0f9a1d74
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -ra1c9450f32f9aad15fbaf25627742f22865df864 -r245728d04c9feab340685e9d94b5623e0f9a1d74
Binary files differ