Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as
===================================================================
diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -rb17c7b6e4b3085653c225e06745863f8d7e580f0
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as	(.../AlertDialog.as)	(revision 60db93c549c96bad95e890f34add10c4ef9d3d2e)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as	(.../AlertDialog.as)	(revision b17c7b6e4b3085653c225e06745863f8d7e580f0)
@@ -166,7 +166,7 @@
 		Debugger.log("width: " + w, Debugger.CRITICAL, "setCancelButton", "AlertDialog");
 		
 		if(w > cancel_btn.width)
-		cancel_btn.setSize(w, cancel_btn.height);
+			cancel_btn.setSize(w, cancel_btn.height);
 		
 	}
 	
@@ -289,12 +289,12 @@
     * Called by the cancel button 
     */
     private function cancel(){
-       Debugger.log('cancel click',Debugger.GEN,'cancel','org.lamsfoundation.lams.common.ui.InputDialog');
+		Debugger.log('cancel click',Debugger.GEN,'cancel','org.lamsfoundation.lams.common.ui.InputDialog');
        
-	   _cancelHandler();
+		removeTransparentLayer();
 	   
-	   removeTransparentLayer();
-	   this.removeMovieClip();
+		_cancelHandler();
+		this.removeMovieClip();
     }
     
     /**
@@ -303,12 +303,14 @@
     public function ok(){
 		Debugger.log('ok click',Debugger.GEN,'ok','org.lamsfoundation.lams.common.ui.InputDialog');
 		
-		_okHandler();
+		removeTransparentLayer();
 		
-		removeTransparentLayer();
+		Debugger.log('okHandler fn:' + _okHandler, Debugger.CRITICAL, "ok", "AlertDialog");		
+		
+		_okHandler();
 		this.removeMovieClip();
-    }
-    
+    }
+	
     /**
     * If an alert was spawned by this dialog this method is called when it's closed
     */
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as
===================================================================
diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -rb17c7b6e4b3085653c225e06745863f8d7e580f0
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as	(.../Dialog.as)	(revision 60db93c549c96bad95e890f34add10c4ef9d3d2e)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as	(.../Dialog.as)	(revision b17c7b6e4b3085653c225e06745863f8d7e580f0)
@@ -47,13 +47,20 @@
     private static var _inputOkButtonLabel:String;
     private static var _inputCancelButtonLabel:String;
     private static var _inputOkHandler:Function;
-    private static var _inputCancelHandler:Function;
+    private static var _inputCancelHandler:Function;
+	
+	private static var _intervalID:Number;
+	private static var _dialogLoaded:Boolean;
+	private static var _count:Number;
+
+	private static var CHECK_INTERVAL:Number = 200;
+	private static var LIMIT:Number = 10;
 
     static function createPopUp(path:MovieClip,cls:Object, initobj:Object):MovieClip{
         return path.createClassChildAtDepth(cls, DepthManager.kTopmost, initobj);
     }
 	
-	static function createAlertDialog(title:String, msg:String, okButtonLabel:String, cancelButtonLabel:String, okHandler:Function, cancelHandler:Function, type:Number) {
+	static function createAlertDialog(title:String, msg:String, okButtonLabel:String, cancelButtonLabel:String, okHandler:Function, cancelHandler:Function, type:Number):MovieClip {
 		_inputTitle = title;
 		_inputMessage = msg;
 		_inputOkButtonLabel = okButtonLabel;
@@ -74,11 +81,17 @@
 			target = ApplicationParent.dialogue;
 		}
 		
-		_inputDialog = target.attachMovie('alertDialog', 'alertDialog', DepthManager.kTopmost, {_x:0, _y:0});
+		var _alertDialog:MovieClip = target.attachMovie('alertDialog', 'alertDialog' + new Date().toString(), DepthManager.kTopmost, {_x:0, _y:0});
 		
 		//Assign dialog load handler
-		_inputDialog.addEventListener('contentLoaded', Proxy.create(org.lamsfoundation.lams.common.ui.Dialog,alertDialogLoaded));
+		_alertDialog.addEventListener('contentLoaded', Proxy.create(org.lamsfoundation.lams.common.ui.Dialog,alertDialogLoaded));
 	
+		return _alertDialog;
+	}
+	
+	static function checkDialog() {
+		_dialogLoaded = (_inputDialog != null || _inputDialog != undefined) ? true : false;
+		_count++;
 	}
 	
 	static function createInputDialog(instructions:String, okButtonLabel:String, cancelButtonLabel:String, okHandler:Function, cancelHandler:Function){