Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r57ace88428f8b87e37237985b0f52d6d7bb8028b -r1d4d284be0fb2b3eacf000364553f72c70e46eae
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r57ace88428f8b87e37237985b0f52d6d7bb8028b -r1d4d284be0fb2b3eacf000364553f72c70e46eae
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as
===================================================================
diff -u -r481129625a0ebaa053fa294cabecceaa230e274f -r1d4d284be0fb2b3eacf000364553f72c70e46eae
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as	(.../CompetenceContainer.as)	(revision 481129625a0ebaa053fa294cabecceaa230e274f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as	(.../CompetenceContainer.as)	(revision 1d4d284be0fb2b3eacf000364553f72c70e46eae)
@@ -63,7 +63,6 @@
 	private var delete_competence_btn:Button;
 	
     private var _bgpanel:MovieClip;       //The underlaying panel base
-	private var definitionDialog:MovieClip;
 	
 	private var app:Application;
     private var fm:FocusManager;            //Reference to focus manager
@@ -152,10 +151,9 @@
 	
 	public function editHandler():Void {
 		Debugger.log("editCompetence clicked: _competenceTitle "+_competenceTitle, Debugger.CRITICAL, "editHandler", "CompetenceContainer");
-		CompetenceEditorDialog(app.dialog.scrollContent).editingCompetence = _competenceTitle;
-		
-		definitionDialog = app.getCanvas().openCompetenceDefinitionWindow();
-		Selection.setFocus(definitionDialog.scrollContent);
+		CompetenceEditorDialog(app.canvas.model.competenceEditorDialog.scrollContent).editingCompetence = _competenceTitle;
+		app.getCanvas().openCompetenceDefinitionWindow(); // sets app.dialog to the definition dialog
+		Selection.setFocus(app.dialog.scrollContent);
 	}
 	
 	public function deleteHandler():Void {
@@ -215,8 +213,7 @@
 	
 	
 	private function deleteCompetence() {
-		// app.dialog.scrollContent must be an instance of CompetenceEditorDialog
-		var competenceEditorDialog:CompetenceEditorDialog = CompetenceEditorDialog(app.dialog.scrollContent);
+		var competenceEditorDialog:CompetenceEditorDialog = CompetenceEditorDialog(app.canvas.model.competenceEditorDialog.scrollContent);
 		app.getDesignDataModel().competences.remove(_competenceTitle);
 			
 		competenceEditorDialog.clear();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as
===================================================================
diff -u -rd8272e3360693eccf08daaf8ecb5f8d73e9fcf34 -r1d4d284be0fb2b3eacf000364553f72c70e46eae
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as	(.../CompetenceDefinitionDialog.as)	(revision d8272e3360693eccf08daaf8ecb5f8d73e9fcf34)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as	(.../CompetenceDefinitionDialog.as)	(revision 1d4d284be0fb2b3eacf000364553f72c70e46eae)
@@ -114,7 +114,7 @@
 		add_competence_btn.label = Dictionary.getValue("competence_editor_add_competence_btn");
 		save_competence_btn.label = Dictionary.getValue("mnu_file_save");
 		
-		editingCompetence = CompetenceEditorDialog(app.dialog.scrollContent).editingCompetence;
+		editingCompetence = CompetenceEditorDialog(app.canvas.model.competenceEditorDialog.scrollContent).editingCompetence;
 		
         //EVENTS
         //Add event listeners for ok, cancel and close buttons
@@ -210,21 +210,20 @@
 		var competenceDesc:String = StringUtils.trim(competence_description_txt.text);
 		
 		if (competenceName.length == 0) {
-			LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_blank"), null);
+			LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_blank"), Delegate.create(this, selectAndHighlightTitle));
 		}
 		else if (app.getDesignDataModel().competences.containsKey(competenceName)) {
 			// entry already exists, do not add
-			LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_exists", [competenceName]), null);
+			LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_exists", [competenceName]), Delegate.create(this, selectAndHighlightTitle));
 		} 
 		else {
 			// add the new competence to the hashtable
 			app.getDesignDataModel().competences.put(competenceName, competenceDesc);
 
-			CompetenceEditorDialog(app.dialog.scrollContent).clear();
-			CompetenceEditorDialog(app.dialog.scrollContent).draw();
+			CompetenceEditorDialog(app.canvas.model.competenceEditorDialog.scrollContent).clear();
+			CompetenceEditorDialog(app.canvas.model.competenceEditorDialog.scrollContent).draw();
+			_container.deletePopUp();
 		}
-		
-		_container.deletePopUp();
 	}
 	
 	// used for updating an existing competence
@@ -234,54 +233,52 @@
 		var updatedCompetenceDesc:String = StringUtils.trim(competence_description_txt.text);
 		
 		if (updatedCompetenceName.length == 0) {
-			LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_blank"), null);
+			LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_blank"), Delegate.create(this, selectAndHighlightTitle));
 		}
 		else if (editingCompetence != updatedCompetenceName && app.getDesignDataModel().competences.containsKey(updatedCompetenceName)) {
 			// entry already exists, do not add
-			LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_exists", [updatedCompetenceName]), null);
+			LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_exists", [updatedCompetenceName]), Delegate.create(this, selectAndHighlightTitle));
 		} 
 		else {
-		
 			if (editingCompetence != null && editingCompetence != undefined && app.getDesignDataModel().competences.containsKey(editingCompetence)) {
-				if (updatedCompetenceName.length > 0) {
-					app.getDesignDataModel().competences.remove(editingCompetence);  // remove the original competencetitle
-					app.getDesignDataModel().competences.put(updatedCompetenceName, updatedCompetenceDesc);
+				
+				app.getDesignDataModel().competences.remove(editingCompetence);  // remove the original competencetitle
+				app.getDesignDataModel().competences.put(updatedCompetenceName, updatedCompetenceDesc);
 		
-					// if the competence title has changed, update the mappings for all activities to the new competence title
-					if (editingCompetence != updatedCompetenceName) { 
+				// if the competence title has changed, update the mappings for all activities to the new competence title
+				if (editingCompetence != updatedCompetenceName) { 
 						
-						var activityKeys:Array = app.getDesignDataModel().activities.keys(); // contains the activity UIIDs
+					var activityKeys:Array = app.getDesignDataModel().activities.keys(); // contains the activity UIIDs
 						
-						for (var i=0; i<activityKeys.length; ++i) {
+					for (var i=0; i<activityKeys.length; ++i) {
 
-							if (app.getDesignDataModel().activities.get(activityKeys[i]) instanceof ToolActivity) {
-								var competenceMappings:Array = ToolActivity(app.getDesignDataModel().activities.get(activityKeys[i])).competenceMappings;
-								for (var j=0; j<competenceMappings.length; ++j) {
-									if (competenceMappings[j] == editingCompetence) {
-										competenceMappings[j] = updatedCompetenceName;
-									}
+						if (app.getDesignDataModel().activities.get(activityKeys[i]) instanceof ToolActivity) {
+							var competenceMappings:Array = ToolActivity(app.getDesignDataModel().activities.get(activityKeys[i])).competenceMappings;
+							for (var j=0; j<competenceMappings.length; ++j) {
+								if (competenceMappings[j] == editingCompetence) {
+									competenceMappings[j] = updatedCompetenceName;
 								}
 							}
 						}
 					}
 					
-					CompetenceEditorDialog(app.dialog.scrollContent).clear();
-					CompetenceEditorDialog(app.dialog.scrollContent).draw();
+					CompetenceEditorDialog(app.canvas.model.competenceEditorDialog.scrollContent).clear();
+					CompetenceEditorDialog(app.canvas.model.competenceEditorDialog.scrollContent).draw();
 				}
-				else {
-					LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_blank"), null);
-				}
+				_container.deletePopUp();
 			}
 		}
-		
-		_container.deletePopUp();
 	}
 	
+	private function selectAndHighlightTitle():Void {
+		Selection.setFocus(competence_title_txt);
+	}
+	
     /**
     * Called by the OK button 
     */
     private function close(){
-
+		app.dialog = app.canvas.model.competenceEditorDialog;
 		_container.deletePopUp();
 
     }
@@ -290,6 +287,7 @@
     * Event dispatched by parent container when close button clicked
     */
     public function click(e:Object):Void{
+		app.dialog = app.canvas.model.competenceEditorDialog;
         e.target.deletePopUp();
     }
     
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as
===================================================================
diff -u -r712d6bf4194c9a9dbdc67b739fbb2fcbcf2711f1 -r1d4d284be0fb2b3eacf000364553f72c70e46eae
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as	(.../CompetenceEditorDialog.as)	(revision 712d6bf4194c9a9dbdc67b739fbb2fcbcf2711f1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as	(.../CompetenceEditorDialog.as)	(revision 1d4d284be0fb2b3eacf000364553f72c70e46eae)
@@ -62,7 +62,6 @@
 	private var competenceContainer:MovieClip;
 	private var main_mc:MovieClip
 	private var competenceContainerLayer:MovieClip;
-	private var definitionDialog:MovieClip;
 	
 	private var containerArray:Array;
 	
@@ -233,8 +232,8 @@
 		
 		_editingCompetence = null;
 		
-		definitionDialog = app.getCanvas().openCompetenceDefinitionWindow();
-		Selection.setFocus(definitionDialog.scrollContent);
+		app.getCanvas().openCompetenceDefinitionWindow(); // sets app.dialog to the definition window
+		Selection.setFocus(app.dialog.scrollContent);
 	}
 
 	/**
@@ -278,6 +277,8 @@
     * Called by the close button 
     */
     private function close(){
+		if (model instanceof CanvasModel)
+			app.canvas.model.competenceEditorDialog = null;
 		
 		_container.deletePopUp();
     }
@@ -286,7 +287,10 @@
     * Event dispatched by parent container when close button clicked
     */
     public function click(e:Object):Void{
-        e.target.deletePopUp();
+		if (model instanceof CanvasModel)
+			app.canvas.model.competenceEditorDialog = null;
+        
+		e.target.deletePopUp();
     }
 	
 	/**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -r57ace88428f8b87e37237985b0f52d6d7bb8028b -r1d4d284be0fb2b3eacf000364553f72c70e46eae
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 57ace88428f8b87e37237985b0f52d6d7bb8028b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 1d4d284be0fb2b3eacf000364553f72c70e46eae)
@@ -79,7 +79,7 @@
 	private static var AUTOSAVE_CONFIG:String = "autosave";
 	private static var AUTOSAVE_TAG:String = "cv.ddm.autosave.user.";
    
-   private var _bin:MovieClip;
+	private var _bin:MovieClip;
 	
 	private var _target_mc:MovieClip;
 	
@@ -826,17 +826,18 @@
 
 		app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue('competence_editor_dlg'), closeButton:true, resize:false, scrollContentPath:'CompetenceEditorDialog'});
 		app.dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded));
+		
+		canvasModel.competenceEditorDialog = app.dialog; // store a reference to the competence editor dialog
 	}	
 	
 	/**
     * Opens the competence definition dialog
     */
-    public function openCompetenceDefinitionWindow():MovieClip {
+    public function openCompetenceDefinitionWindow() {
 		var controller:CanvasController = canvasView.getController();
-		var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue('competence_def_dlg'), closeButton:true, scrollContentPath:'CompetenceDefinitionDialog'});			
-		
-		dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded));
-		return dialog;
+	
+		app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue('competence_def_dlg'), closeButton:true, scrollContentPath:'CompetenceDefinitionDialog'});	
+		app.dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded));
 	}
 	
 	public function openBranchView(ba, visible:Boolean){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
diff -u -r64f42c88ebf08393b1c53bbd00c3cd4fec211c10 -r1d4d284be0fb2b3eacf000364553f72c70e46eae
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 64f42c88ebf08393b1c53bbd00c3cd4fec211c10)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 1d4d284be0fb2b3eacf000364553f72c70e46eae)
@@ -81,6 +81,8 @@
 	private var _openBranchingActivities:Array;
 	private var _openBranchingActivity:Number;
 	
+	private var _competenceEditorDialog:MovieClip;
+	
 	//These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
     public var addEventListener:Function;
@@ -1192,6 +1194,14 @@
 		return _openBranchingActivity;
 	}
 	
+	public function set competenceEditorDialog(dialog:MovieClip) {
+		_competenceEditorDialog = dialog;
+	}
+	
+	public function get competenceEditorDialog():MovieClip {
+		return _competenceEditorDialog;
+	}
+	
 	public function get openBranchingActivities():Array {
 		return _openBranchingActivities;
 	}