Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as
===================================================================
diff -u -red050212fcf3c093fb885cc2442721fb26797b1e -rb3be294808667a4c67858b7ac07e0f2bb19f0baf
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	(.../ToolbarController.as)	(revision ed050212fcf3c093fb885cc2442721fb26797b1e)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	(.../ToolbarController.as)	(revision b3be294808667a4c67858b7ac07e0f2bb19f0baf)
@@ -47,7 +47,9 @@
 		}else if(tgt.indexOf("optional") != -1){
 			
 		}else if(tgt.indexOf("gate") != -1){
-			_app.getCanvas().startGateTool();
+			_app.getCanvas().toggleGateTool();
+		}else if(tgt.indexOf("group") != -1){
+			_app.getCanvas().toggleGroupTool();
 		}else if(tgt.indexOf("preview") != -1){
 			
 		}
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as
===================================================================
diff -u -rf30a453db9dca37796f0853a9a1c042c01c0d9e5 -rb3be294808667a4c67858b7ac07e0f2bb19f0baf
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as	(.../ToolbarView.as)	(revision f30a453db9dca37796f0853a9a1c042c01c0d9e5)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as	(.../ToolbarView.as)	(revision b3be294808667a4c67858b7ac07e0f2bb19f0baf)
@@ -64,11 +64,7 @@
 		
         //Add the button handlers, essentially this is handing on clicked event to controller.
         var controller = getController();
-        /*
-		_toolbar_mc.newButton.onRelease = Proxy.create(controller,controller['buttonClicked'],'new');
-        _toolbar_mc.openButton.onRelease = Proxy.create(controller,controller['buttonClicked'],'open');
-        _toolbar_mc.saveButton.onRelease = Proxy.create(controller,controller['buttonClicked'],'save');
-		*/
+
 		_toolbar_mc.new_btn.addEventListener("click",controller);
 		_toolbar_mc.open_btn.addEventListener("click",controller);
 		_toolbar_mc.save_btn.addEventListener("click",controller);
@@ -77,6 +73,7 @@
 		_toolbar_mc.trans_btn.addEventListener("click",controller);
 		_toolbar_mc.optional_btn.addEventListener("click",controller);
 		_toolbar_mc.gate_btn.addEventListener("click",controller);
+		_toolbar_mc.group_btn.addEventListener("click",controller);
 		_toolbar_mc.preview_btn.addEventListener("click",controller);