Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringActivity.js,v
diff -u -r1.55 -r1.56
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	15 Jul 2015 11:16:42 -0000	1.55
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	17 Aug 2015 08:23:41 -0000	1.56
@@ -1382,7 +1382,7 @@
 	 */
 	removeSelectEffect : function(object) {
 		// remove the effect from the given object or the selected one, whatever it is
-		if (!object || !object.items.selectEffect) {
+		if (!object) {
 			object = layout.selectedObject;
 		}
 		
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringGeneral.js,v
diff -u -r1.69 -r1.70
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	8 Jul 2015 14:34:28 -0000	1.69
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	17 Aug 2015 08:23:41 -0000	1.70
@@ -619,7 +619,6 @@
 			 */
 			'buttonsSave' : sharedButtons.concat([
 				             {
-				            	'class'  : 'defaultFocus',
 				            	'text'   : LABELS.SAVE_BUTTON,
                                                 'id'     : 'saveLdStoreButton',
 				            	'click'  : function() {	
@@ -789,7 +788,6 @@
 					leftButtonContainer = $('<div />').attr('id','leftDialogButtonContainer');
 				$('input', nameContainer).val($(this).dialog('option', 'learningDesignTitle'));
 				$(this).siblings('.ui-dialog-buttonpane').append(leftButtonContainer).append(nameContainer);
-				$('#ldStoreDialogNameField', nameContainer).focus();
 
 				$('.leftDialogButton')
 				   .attr('disabled', 'disabled')
Index: lams_central/web/includes/javascript/authoring/authoringProperty.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringProperty.js,v
diff -u -r1.31 -r1.32
--- lams_central/web/includes/javascript/authoring/authoringProperty.js	15 Jul 2015 11:16:42 -0000	1.31
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js	17 Aug 2015 08:23:41 -0000	1.32
@@ -115,6 +115,7 @@
 
 				// if title changed, redraw branching and converge points
 				if (redrawNeeded) {
+					ActivityLib.removeSelectEffect(layout.selectedObject);
 					branchingActivity.start.draw();
 					branchingActivity.end.draw();
 					ActivityLib.addSelectEffect(layout.selectedObject, true);
@@ -230,6 +231,7 @@
 				}
 				
 				if (redrawNeeded) {
+					ActivityLib.removeSelectEffect(activity);
 					activity.draw();
 					ActivityLib.addSelectEffect(activity, true);
 				}
@@ -341,6 +343,7 @@
 				activity.viewLearners = $('.propertiesContentFieldViewLearners', content).is(':checked');
 				
 				if (redrawNeeded) {
+					ActivityLib.removeSelectEffect(activity);
 					activity.draw();
 					ActivityLib.addSelectEffect(activity, true);
 				}
@@ -416,6 +419,7 @@
 				}
 				
 				if (redrawNeeded) {
+					ActivityLib.removeSelectEffect(label);
 					label.draw();
 					ActivityLib.addSelectEffect(label, true);
 					GeneralLib.setModified(true);
@@ -453,6 +457,7 @@
 				if (newTitle != activity.title) {
 					if (GeneralLib.nameValidator.test(newTitle)) {
             			activity.title = newTitle;
+    					ActivityLib.removeSelectEffect(activity);
 						activity.draw();
 						ActivityLib.addSelectEffect(activity, true);
 						GeneralLib.setModified(true);
@@ -536,6 +541,7 @@
 				}
 				
 				if (redrawNeeded) {
+					ActivityLib.removeSelectEffect(activity);
 					activity.draw();
 					ActivityLib.addSelectEffect(activity, true);
 					GeneralLib.setModified(true);
@@ -594,6 +600,7 @@
 				redrawNeeded |= newColor != color;
 				
 				if (redrawNeeded) {
+					ActivityLib.removeSelectEffect(region);
 					region.draw(null, null, null, null, newColor);
 					ActivityLib.addSelectEffect(region, true);
 					GeneralLib.setModified(true);
@@ -659,6 +666,7 @@
 				}
 				
 				if (redrawNeeded) {
+					ActivityLib.removeSelectEffect(activity);
 					activity.draw();
 					ActivityLib.addSelectEffect(activity, true);
 					GeneralLib.setModified(true);
@@ -724,6 +732,7 @@
 				}
 				
 				if (redrawNeeded) {
+					ActivityLib.removeSelectEffect(activity);
 					transition.draw();
 					ActivityLib.addSelectEffect(activity, true);
 					GeneralLib.setModified(true);