Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rce218d842869d1155caac214e8c8e4cfadde0642 -rcea845b43eaed95e5e8109a216be04c462f190a4
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rce218d842869d1155caac214e8c8e4cfadde0642 -rcea845b43eaed95e5e8109a216be04c462f190a4
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -rce218d842869d1155caac214e8c8e4cfadde0642 -rcea845b43eaed95e5e8109a216be04c462f190a4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision ce218d842869d1155caac214e8c8e4cfadde0642)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision cea845b43eaed95e5e8109a216be04c462f190a4)
@@ -213,6 +213,7 @@
 	public function setSelected(isSelected){
 		Debugger.log(_activity.title+" isSelected:"+isSelected,4,'setSelected','CanvasActivity');
 		var MARGIN = 5;
+		
 		if(isSelected) {
 			//draw a selected border
 			var tgt_mc;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -rce218d842869d1155caac214e8c8e4cfadde0642 -rcea845b43eaed95e5e8109a216be04c462f190a4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision ce218d842869d1155caac214e8c8e4cfadde0642)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision cea845b43eaed95e5e8109a216be04c462f190a4)
@@ -164,10 +164,9 @@
 					if (sequenceActivity.parentUIID == optionalOnCanvas[i].activity.activityUIID) {
 						if(_tempSelectedItem.activity.parentUIID == sequenceActivity.activityUIID) {
 							ca.depthHistory = ca.getDepth();
-							ca.swapDepths(_tempSelectedItem);
+							ca.swapDepths(DepthManager.kTop);
 							
 							_tempSelectedItem.swapDepths(_tempSelectedItem.depthHistory);
-							_tempSelectedItem.depthHistory = null;
 						} else {
 							ca.depthHistory = ca.getDepth();
 							ca.swapDepths(DepthManager.kTop);
@@ -180,7 +179,6 @@
 					
 					if(selectedParentActivity.parentUIID == optionalOnCanvas[i].activity.activityUIID) {
 						_tempSelectedItem.swapDepths(_tempSelectedItem.depthHistory);
-						_tempSelectedItem.depthHistory = null;
 					}
 				}