Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as
===================================================================
diff -u -r4bd39cff0646511d2734d54ddd5db0f17c48a91a -r5bd879e5d12a6d57cfadea49d9a140439b8de5ba
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	(.../ToolbarController.as)	(revision 4bd39cff0646511d2734d54ddd5db0f17c48a91a)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	(.../ToolbarController.as)	(revision 5bd879e5d12a6d57cfadea49d9a140439b8de5ba)
@@ -42,14 +42,18 @@
 			_app.copy();
 		}else if(tgt.indexOf("paste") != -1){
 			_app.paste();
-		}else if(tgt.indexOf("trans") != -1){
+		}else if(tgt.indexOf("trans") != -1){	
 			_app.getCanvas().toggleTransitionTool();
+					
 		}else if(tgt.indexOf("optional") != -1){
-			_app.getCanvas().startOptionalActivity();
+			_app.getCanvas().toggleOptionalActivity();
+						
 		}else if(tgt.indexOf("gate") != -1){
 			_app.getCanvas().toggleGateTool();
+						
 		}else if(tgt.indexOf("group") != -1){
 			_app.getCanvas().toggleGroupTool();
+			
 		}else if(tgt.indexOf("preview") != -1){
 			_app.getCanvas().launchPreviewWindow();
 		}