Index: lams_flex/LamsAuthor/src/assets/languages/dictionary.xml
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14
--- lams_flex/LamsAuthor/src/assets/languages/dictionary.xml	(.../dictionary.xml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/assets/languages/dictionary.xml	(.../dictionary.xml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
@@ -149,6 +149,7 @@
 			<name>You are not allowed to have a circular sequence</name>
 		</entry>
 		
+		
 		<entry key="pi_title">
 			<name>Properties</name>
 		</entry>
@@ -159,5 +160,40 @@
 		<entry key="opt_activity_title">
 	      <name>Optional Activity</name>
 	    </entry>
+	    <entry key="grouping_act_title">
+	      <name>Grouping</name>
+	    </entry>
+	    <entry key="pi_num_groups">
+	      <name>Number of groups</name>
+	    </entry>
+	    <entry key="pi_num_learners">
+	      <name>Number of learners</name>
+	    </entry>
+	    
+	    <entry key="pi_random_group_activity">
+	      <name>Grouping - Random</name>
+	    </entry>
+	    <entry key="pi_monitor_group_activity">
+	      <name>Grouping - Choose in monitor</name>
+	    </entry>
+	    <entry key="pi_learner_group_activity">
+	      <name>Grouping - Learner's Choice</name>
+	    </entry>
+	    <entry key="groupnaming_dialog_instructions_lbl">
+	      <name>Click on a name to change its value.</name>
+	    </entry>
+	    <entry key="groupnaming_dlg_title_lbl">
+	      <name>Group Naming</name>
+	    </entry>
+	    <entry key="pi_group_naming_btn_lbl">
+	      <name>Name Groups</name>
+	    </entry>
+	    <entry key="view_students_before_selection">
+	      <name>View learners before selection?</name>
+	    </entry>
+	    <entry key="pi_equal_group_sizes">
+	      <name>Equal group sizes</name>
+	    </entry>
+		
 	</language>
 </xml>
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/assets/languages/en_AU.xml
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14
--- lams_flex/LamsAuthor/src/assets/languages/en_AU.xml	(.../en_AU.xml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/assets/languages/en_AU.xml	(.../en_AU.xml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
@@ -185,6 +185,15 @@
 	    <entry key="groupnaming_dlg_title_lbl">
 	      <name>Group Naming</name>
 	    </entry>
+	    <entry key="pi_group_naming_btn_lbl">
+	      <name>Name Groups</name>
+	    </entry>
+	    <entry key="view_students_before_selection">
+	      <name>View learners before selection?</name>
+	    </entry>
+	    <entry key="pi_equal_group_sizes">
+	      <name>Equal group sizes</name>
+	    </entry>
 		
 	</language>
 </xml>
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
@@ -13,6 +13,8 @@
 
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.components.activity.group.LearnerGroupActivityComponent;
+			import org.lamsfoundation.lams.author.components.activity.group.MonitorGroupActivityComponent;
 			import mx.collections.ArrayCollection;
 			import mx.core.UIComponent;
 			import org.lamsfoundation.lams.author.components.activity.group.RandomGroupActivityComponent;
@@ -23,6 +25,10 @@
 			import mx.core.Application;
 			import mx.managers.PopUpManager;
 			
+			private static const STATE_GROUP_RANDOM:String = "randomGroupActivity";
+			private static const STATE_GROUP_MONITOR:String = "monitorGroupActivity";
+			private static const STATE_GROUP_LEARNER:String = "learnerGroupActivity";
+			
 			private var changeWatcherArray:ArrayCollection = new ArrayCollection();
 			
 			private var titleDisabledColors:Object;
@@ -71,18 +77,42 @@
 			private function displayUIComponents(activity:ActivityComponent):void {
 				this.currentState = "";
 				if (activity is RandomGroupActivityComponent) {
+					this.currentState = STATE_GROUP_RANDOM;
 					var randomGroupActivity:RandomGroupActivityComponent = activity as RandomGroupActivityComponent;
-					this.currentState = "randomActivity";
-					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroups, "selected", randomGroupActivity, "isNormalRandom"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroupActivity, "isNormalRandom", randomGroups, "selected"));
+					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroups, "selected", randomGroupActivity, "isGroupNumber"));
+					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroupActivity, "isGroupNumber", randomGroups, "selected"));
 					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroupsNum, "value", randomGroupActivity, "numGroups"));
 					changeWatcherArray.addItem(BindingUtils.bindProperty(activity, "numGroups", randomGroupsNum, "value"));
 					
 					changeWatcherArray.addItem(BindingUtils.bindProperty(randomLearners, "selected", randomGroupActivity, "isLearnersPerGroup"));
 					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroupActivity, "isLearnersPerGroup", randomLearners, "selected"));
 					changeWatcherArray.addItem(BindingUtils.bindProperty(randomLearnersNum, "value", randomGroupActivity, "numLearners"));
 					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroupActivity, "numLearners", randomLearnersNum, "value"));
+				} else if (activity is MonitorGroupActivityComponent) {
+					this.currentState = STATE_GROUP_MONITOR;
+					var monitorGroupActivity:MonitorGroupActivityComponent = activity as MonitorGroupActivityComponent;
+					changeWatcherArray.addItem(BindingUtils.bindProperty(monitorGroupsNum, "value", monitorGroupActivity, "numLearners"));
+					changeWatcherArray.addItem(BindingUtils.bindProperty(monitorGroupActivity, "numLearners", monitorGroupsNum, "value"));
+				} else if (activity is LearnerGroupActivityComponent) {
+					this.currentState = STATE_GROUP_LEARNER;
+					var learnerGroupActivity:LearnerGroupActivityComponent = activity as LearnerGroupActivityComponent;
+					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroups, "selected", learnerGroupActivity, "isGroupNumber"));
+					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupActivity, "isGroupNumber", learnerGroups, "selected"));
+					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupsNum, "value", learnerGroupActivity, "numGroups"));
+					changeWatcherArray.addItem(BindingUtils.bindProperty(activity, "numGroups", learnerGroupsNum, "value"));
+					
+					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerLearners, "selected", learnerGroupActivity, "isLearnersPerGroup"));
+					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupActivity, "isLearnersPerGroup", learnerLearners, "selected"));
+					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerLearnersNum, "value", learnerGroupActivity, "numLearners"));
+					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupActivity, "numLearners", learnerLearnersNum, "value")); 
+					
+					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerViewBefore, "selected", learnerGroupActivity, "isViewLearnersBeforeSelction"));
+					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupActivity, "isViewLearnersBeforeSelction", learnerViewBefore, "selected"));
+					
+					changeWatcherArray.addItem(BindingUtils.bindProperty(equalGroupSizes, "selected", learnerGroupActivity, "isEqualGroupSizes"));
+					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupActivity, "isEqualGroupSizes", equalGroupSizes, "selected"));
 				}
+				
 			}
 			
 			private function groupNumChange(event:Event):void {
@@ -127,30 +157,90 @@
 	<mx:Canvas id="opacityLayer" height="100%" width="100%" backgroundColor="white" backgroundAlpha="0.6" />
 	
 	<mx:states>
-		<mx:State name="randomActivity">
+		<mx:State name="{STATE_GROUP_RANDOM}">
 			<mx:AddChild relativeTo="{propertiesForm}" position="lastChild"  creationPolicy="all">
 				<mx:HRule width="100%" />
 			</mx:AddChild>
 			<mx:AddChild relativeTo="{propertiesForm}" position="lastChild"  creationPolicy="all">   
                 <mx:FormItem label="{Application.application.dictionary.getLabel('pi_num_groups')}" height="22" direction="horizontal">
                 	<mx:RadioButton id="randomGroups" mouseOver="{null}" />
-					<mx:NumericStepper id="randomGroupsNum" change="groupNumChange(event)" enabled="{randomGroups.selected}" minimum="2"  maximum="10" height="22" width="40" fontSize="10" textAlign="center"/>
+					<mx:NumericStepper id="randomGroupsNum" change="groupNumChange(event)" enabled="{randomGroups.selected}" minimum="2" height="22" width="40" fontSize="10" textAlign="center"/>
 				</mx:FormItem>
             </mx:AddChild>
 			<mx:AddChild relativeTo="{propertiesForm}" position="lastChild"  creationPolicy="all">   
                 <mx:FormItem label="{Application.application.dictionary.getLabel('pi_num_learners')}" height="22" direction="horizontal">
                 	<mx:RadioButton id="randomLearners"/>
-					<mx:NumericStepper id="randomLearnersNum" enabled="{randomLearners.selected}" minimum="2"  maximum="10" height="22" width="40" fontSize="10" textAlign="center"/>
+					<mx:NumericStepper id="randomLearnersNum" enabled="{randomLearners.selected}" minimum="1" height="22" width="40" fontSize="10" textAlign="center"/>
 				</mx:FormItem>
             </mx:AddChild>
             <mx:AddChild relativeTo="{vbox}" position="lastChild"  creationPolicy="all">   
-                	<mx:Button label="Name Groups" height="18" click="openNameGroupsWindow()"/>
+                	<mx:Button label="{Application.application.dictionary.getLabel('pi_group_naming_btn_lbl')}" 
+                		height="18" click="openNameGroupsWindow()" enabled="{randomGroups.selected}" visible="{randomGroups.selected}"/>
             </mx:AddChild>
             
             <mx:SetProperty target="{this}"
             	name="title" value="{Application.application.dictionary.getLabel('pi_random_group_activity')}"/>
 
 		</mx:State>
+		<mx:State name="{STATE_GROUP_MONITOR}">
+			<mx:AddChild relativeTo="{propertiesForm}" position="lastChild"  creationPolicy="all">
+				<mx:HRule width="100%" />
+			</mx:AddChild>
+			<mx:AddChild relativeTo="{propertiesForm}" position="lastChild"  creationPolicy="all">   
+                <mx:FormItem label="{Application.application.dictionary.getLabel('pi_num_groups')}" height="22" direction="horizontal">
+					<mx:NumericStepper id="monitorGroupsNum" change="groupNumChange(event)"  minimum="2" height="22" width="40" fontSize="10" textAlign="center"/>
+				</mx:FormItem>
+            </mx:AddChild>
+			
+            <mx:AddChild relativeTo="{vbox}" position="lastChild"  creationPolicy="all">   
+                	<mx:Button label="{Application.application.dictionary.getLabel('pi_group_naming_btn_lbl')}" 
+                		height="18" click="openNameGroupsWindow()"/>
+            </mx:AddChild>
+            
+            <mx:SetProperty target="{this}"
+            	name="title" value="{Application.application.dictionary.getLabel('pi_monitor_group_activity')}"/>
+
+		</mx:State>
+		<mx:State name="{STATE_GROUP_LEARNER}">
+			<mx:AddChild relativeTo="{propertiesForm}" position="lastChild"  creationPolicy="all">
+				<mx:HRule width="100%" />
+			</mx:AddChild>
+			<mx:AddChild relativeTo="{propertiesForm}" position="lastChild"  creationPolicy="all">   
+                <mx:FormItem label="{Application.application.dictionary.getLabel('pi_num_groups')}" height="22" direction="horizontal">
+                	<mx:RadioButton id="learnerGroups" mouseOver="{null}" />
+					<mx:NumericStepper id="learnerGroupsNum" change="groupNumChange(event)" enabled="{learnerGroups.selected}" minimum="2" height="22" width="40" fontSize="10" textAlign="center"/>
+				</mx:FormItem>
+            </mx:AddChild>
+			<mx:AddChild relativeTo="{propertiesForm}" position="lastChild"  creationPolicy="all">   
+                <mx:FormItem label="{Application.application.dictionary.getLabel('pi_num_learners')}" height="22" direction="horizontal">
+                	<mx:RadioButton id="learnerLearners"/>
+					<mx:NumericStepper id="learnerLearnersNum" enabled="{learnerLearners.selected}" minimum="1" height="22" width="40" fontSize="10" textAlign="center"/>
+				</mx:FormItem>
+            </mx:AddChild>
+            <mx:AddChild relativeTo="{propertiesForm}" position="lastChild"  creationPolicy="all">   
+                <mx:FormItem label="{Application.application.dictionary.getLabel('view_students_before_selection')}" height="22" direction="horizontal">	
+                	<mx:CheckBox id="learnerViewBefore"/>
+                </mx:FormItem>
+            </mx:AddChild>
+            <mx:AddChild relativeTo="{propertiesForm}" position="lastChild"  creationPolicy="all">   
+                <mx:FormItem label="{Application.application.dictionary.getLabel('pi_equal_group_sizes')}" height="22" direction="horizontal"
+                	enabled="{learnerGroups.selected}" visible="{learnerGroups.selected}"
+                	includeInLayout="{learnerGroups.selected}"
+                	>	
+                	<mx:CheckBox id="equalGroupSizes" />
+                </mx:FormItem>
+            </mx:AddChild>
+            <mx:AddChild relativeTo="{vbox}" position="lastChild"  creationPolicy="all">   
+                	<mx:Button label="{Application.application.dictionary.getLabel('pi_group_naming_btn_lbl')}" 
+                		height="18" click="openNameGroupsWindow()" enabled="{learnerGroups.selected}" visible="{learnerGroups.selected}"
+                		includeInLayout="{learnerGroups.selected}"
+                		/>
+            </mx:AddChild>
+            
+            <mx:SetProperty target="{this}"
+            	name="title" value="{Application.application.dictionary.getLabel('pi_learner_group_activity')}"/>
+
+		</mx:State>
 	</mx:states>
 	
 	
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
@@ -242,10 +242,6 @@
 		   		}
 			}
 
-			// A method to be overidden by child activity components
-			public function getPropetyInspectorView():UIComponent {
-				return null;
-			}
 		]]>
 	</mx:Script>
 	
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/LearnerGroupActivityComponent.mxml
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/LearnerGroupActivityComponent.mxml	(.../LearnerGroupActivityComponent.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/LearnerGroupActivityComponent.mxml	(.../LearnerGroupActivityComponent.mxml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
@@ -2,7 +2,20 @@
 <GroupActivityComponent xmlns="org.lamsfoundation.lams.author.components.activity.group.*" xmlns:mx="http://www.adobe.com/2006/mxml">
 	<mx:Script>
 		<![CDATA[
-			public var numLearners:int;
+			
+			public var numLearners:int = 1;
+			public var isLearnersPerGroup:Boolean = false;
+			public var isViewLearnersBeforeSelction:Boolean = false;
+			public var isEqualGroupSizes:Boolean = false;
+			
+			
+			public function get isGroupNumber():Boolean {
+				return !isLearnersPerGroup;
+			}
+			
+			public function set isGroupNumber(boolean:Boolean):void {
+				isLearnersPerGroup = !boolean;
+			}
 		]]>
 	</mx:Script>
 </GroupActivityComponent>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml	(.../NameGroupsWindow.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml	(.../NameGroupsWindow.mxml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
@@ -9,6 +9,11 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import mx.events.ListEventReason;
+			import mx.controls.TextInput;
+			import mx.events.ListEvent;
+			import mx.controls.Alert;
+			import mx.utils.StringUtil;
 			import mx.core.IFlexDisplayObject;
 			import mx.managers.PopUpManager;
 			import mx.binding.utils.BindingUtils;
@@ -39,10 +44,18 @@
 				PopUpManager.removePopUp(this);
 			}
 			
+			private function itemEditEnd(event:ListEvent):void {
+				var editor:TextInput = TextInput(event.currentTarget.itemEditorInstance);
+				if ((StringUtil.trim(editor.text)).length== 0){
+					event.preventDefault();
+					event.stopPropagation();
+				}
+			}
+			
 		]]>
 	</mx:Script>
 	<mx:Text text="{Application.application.dictionary.getLabel('groupnaming_dialog_instructions_lbl')}" />
-	<mx:List id="nameList" editable="true" width="100%" maxHeight="140"></mx:List>
+	<mx:List id="nameList" editable="true" itemEditEnd="itemEditEnd(event)" width="100%" maxHeight="140" ></mx:List>
 	<mx:Button label="OK" click="closeWindow()" />
 	 
 </Window>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/RandomGroupActivityComponent.mxml
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/RandomGroupActivityComponent.mxml	(.../RandomGroupActivityComponent.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/RandomGroupActivityComponent.mxml	(.../RandomGroupActivityComponent.mxml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
@@ -3,21 +3,15 @@
 	<mx:Script>
 		<![CDATA[
 			import mx.core.UIComponent;
-			import mx.containers.FormItem;
-			import mx.containers.Form;
+			
 			public var numLearners:int = 1;
 			public var isLearnersPerGroup:Boolean = false;
-			
-			override public function getPropetyInspectorView():UIComponent {
-				//return form;
-				return null;
-			}
-			
-			public function get isNormalRandom():Boolean {
+
+			public function get isGroupNumber():Boolean {
 				return !isLearnersPerGroup;
 			}
 			
-			public function set isNormalRandom(boolean:Boolean):void {
+			public function set isGroupNumber(boolean:Boolean):void {
 				isLearnersPerGroup = !boolean;
 			}
 			
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(.../ToolBar.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(.../ToolBar.mxml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
@@ -228,21 +228,17 @@
     		icon="@Embed(source='assets/icons/group.png')" 
     		label="{Application.application.dictionary.getLabel('random_group_btn')}" 
     		toolTip="{Application.application.dictionary.getLabel('random_group_btn_tooltip')}"/>
-    	
-    	
-    	<!--<mx:Button height="25" 
+
+    	<toolbar:SystemToolComponent type="{Constants.SYSTEM_ACTIVITY_TYPE_GROUP_MONITOR}" height="25" 
+    		click="mouseClick(event)"
     		icon="@Embed(source='assets/icons/group.png')" 
-    		label="{Application.application.dictionary.getLabel('random_group_btn')}"
-    		toolTip="{Application.application.dictionary.getLabel('random_group_btn_tooltip')}"/>-->
-    		
-    	<mx:Button height="25" 
-    		icon="@Embed(source='assets/icons/group.png')" 
-    		label="{Application.application.dictionary.getLabel('monitor_group_btn')}"
+    		label="{Application.application.dictionary.getLabel('monitor_group_btn')}" 
     		toolTip="{Application.application.dictionary.getLabel('monitor_group_btn_tooltip')}"/>
     		
-    	<mx:Button height="25" 
+    	<toolbar:SystemToolComponent type="{Constants.SYSTEM_ACTIVITY_TYPE_GROUP_LEARNER}" height="25" 
+    		click="mouseClick(event)"
     		icon="@Embed(source='assets/icons/group.png')" 
-    		label="{Application.application.dictionary.getLabel('learner_group_btn')}"
+    		label="{Application.application.dictionary.getLabel('learner_group_btn')}" 
     		toolTip="{Application.application.dictionary.getLabel('learner_group_btn_tooltip')}"/>
     </toolbar:ToolBarDropDown>
     <mx:Binding destination="groupMenu.x" source="groupButton.x - 5" />
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
@@ -142,7 +142,7 @@
 	                	monitorGroup.load();
 	                	monitorGroup.selectActivity();
             			break;
-            		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_RANDOM:
+            		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_LEARNER:
             			var learnerGroup:GroupActivityComponent = new LearnerGroupActivityComponent();
 	                	learnerGroup.x = currentMousePoint.x;
 		              	learnerGroup.y = currentMousePoint.y;