Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml
===================================================================
diff -u -r0aaad79f0f603dbb8fbcc1bd66f381428715c4d5 -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision 0aaad79f0f603dbb8fbcc1bd66f381428715c4d5)
+++ lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -49,6 +49,9 @@
 			// current selected activity
 			public var selectedActivity:ActivityComponent;
 			
+			[Bindable]
+			public var applicationCenter:Point = new Point();
+			
 			// dictionary
 			[Bindable]
 			public var dictionary:XMLDictionaryRegistry;
@@ -96,4 +99,7 @@
 	
 	<toolbar:ToolBar id="toolBar" width="100%" height="30"></toolbar:ToolBar>
 	
+	<mx:Binding destination="applicationCenter.x" source="this.width/2" />
+	<mx:Binding destination="applicationCenter.y" source="this.height/2" />
+	
 </mx:Application>
Index: lams_flex/LamsAuthor/src/assets/css/author.css
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/assets/css/author.css	(revision 0)
+++ lams_flex/LamsAuthor/src/assets/css/author.css	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -0,0 +1,23 @@
+/* CSS file */
+
+
+
+.window {
+	padding-bottom: 5; padding-top: 5; padding-left: 8; padding-right: 8;
+	background-color: #c2d5fe;
+	borderStyle: solid;
+	borderThicknessLeft: 0; borderThicknessTop: 0;borderThicknessBottom: 0; borderThicknessRight: 0;
+	horizontal-align: center;
+	corner-radius: 5;
+	roundedBottomCorners: true;
+	drop-shadow-enabled: false;
+	header-colors: #c2d5fe, #2359D6;
+	header-height: 20;
+	titleStyleName: "groupNameWindowTitle";
+	
+}	
+
+.windowTitle {
+	textAlign: center;
+	font-weight:bold;	
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/assets/css/propertyInspector.css
===================================================================
diff -u -r49b1554a182016d60094625120b16bc761fdb2fe -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/assets/css/propertyInspector.css	(.../propertyInspector.css)	(revision 49b1554a182016d60094625120b16bc761fdb2fe)
+++ lams_flex/LamsAuthor/src/assets/css/propertyInspector.css	(.../propertyInspector.css)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -18,7 +18,7 @@
    	shadowDirection: right;
 	titleStyleName: "propertyInpsectorTitleUnselected";
 	vertical-gap: 0;
-	background-alpha: 0.2;
+	background-alpha: 0.05;
 }
 
 .propertyInpsectorTitleUnselected {
@@ -29,21 +29,19 @@
 .propertyInspectorSelected {
    	paddingLeft: 0; paddingRight: 0; paddingTop:0; paddingBottom:0;
    	borderStyle: solid;
-   	borderThicknessLeft: 0;
-   	borderThicknessTop: 0;
-   	borderThicknessBottom: 0;
-   	borderThicknessRight: 0;
+   	borderThicknessLeft: 0; borderThicknessTop: 0;borderThicknessBottom: 0; borderThicknessRight: 0;
    	roundedBottomCorners: true;
    	cornerRadius: 0;
    	headerHeight: 17;
-   	headerColors: #c2d5fe, #E7EEFF;
+   	/*headerColors: #c2d5fe, #E7EEFF;*/
+   	headerColors: #c2d5fe, #2359D6;
    	backgroundColor: #c2d5fe;
    	dropShadowEnabled: true;
    	shadowDistance: 0;
    	shadowDirection: right;
 	titleStyleName: "propertyInpsectorTitleSelected";
 	vertical-gap: 0;
-	background-alpha: 0.9;
+	background-alpha: 0.7;
 }
 
 .propertyInpsectorTitleSelected {
@@ -52,5 +50,6 @@
 }
 
 
+
    
    
Index: lams_flex/LamsAuthor/src/assets/languages/dictionary.xml
===================================================================
diff -u -r0aaad79f0f603dbb8fbcc1bd66f381428715c4d5 -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/assets/languages/dictionary.xml	(.../dictionary.xml)	(revision 0aaad79f0f603dbb8fbcc1bd66f381428715c4d5)
+++ lams_flex/LamsAuthor/src/assets/languages/dictionary.xml	(.../dictionary.xml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -155,5 +155,9 @@
 		<entry key="pi_lbl_title">
 			<name>Title</name>
 		</entry>
+		
+		<entry key="opt_activity_title">
+	      <name>Optional Activity</name>
+	    </entry>
 	</language>
 </xml>
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/assets/languages/en_AU.xml
===================================================================
diff -u -r0aaad79f0f603dbb8fbcc1bd66f381428715c4d5 -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/assets/languages/en_AU.xml	(.../en_AU.xml)	(revision 0aaad79f0f603dbb8fbcc1bd66f381428715c4d5)
+++ lams_flex/LamsAuthor/src/assets/languages/en_AU.xml	(.../en_AU.xml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -157,5 +157,34 @@
 			<name>Title</name>
 		</entry>
 		
+		<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>
+		
 	</language>
 </xml>
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/assets/languages/newLanguageKeys.xml
===================================================================
diff -u -rd75a56dbb3bbbceaeba8a0f5367d60ac305239aa -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/assets/languages/newLanguageKeys.xml	(.../newLanguageKeys.xml)	(revision d75a56dbb3bbbceaeba8a0f5367d60ac305239aa)
+++ lams_flex/LamsAuthor/src/assets/languages/newLanguageKeys.xml	(.../newLanguageKeys.xml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -73,5 +73,15 @@
 		<entry key="category_assessment_tooltip">
 			<name>Contains tools that you can use to assess and evaluate learning</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>
 	</language>
 </xml>
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml
===================================================================
diff -u -rbbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml	(.../CanvasArea.mxml)	(revision bbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml	(.../CanvasArea.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -18,8 +18,7 @@
                
 		<components:CanvasBox id="canvasBox" backgroundColor="#FFFFF8"  ></components:CanvasBox>
        
-		<components:PropertyInspector id="propertyInspector"
-   		/>
+		<components:PropertyInspector id="propertyInspector" right="20" top="60"/>
               
     </mx:Canvas>
     
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
===================================================================
diff -u -r0aaad79f0f603dbb8fbcc1bd66f381428715c4d5 -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 0aaad79f0f603dbb8fbcc1bd66f381428715c4d5)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -8,13 +8,11 @@
     width="4000" height="3000"   
     x="0" y="0"
     click="click(event)"
-    mouseDown="mouseDown(event)"
 	>
 	
 	<mx:Script>
 		<![CDATA[
 			import org.lamsfoundation.lams.author.events.DropActivityEvent;
-			import org.lamsfoundation.lams.author.components.toolbar.SystemActivityComponent;
 			import mx.containers.Canvas;
 			import org.lamsfoundation.lams.author.util.Constants;
 			import mx.core.Application;
@@ -42,13 +40,13 @@
                     DragManager.acceptDragDrop(Canvas(event.currentTarget));
                 }
             }
-
+            
             // The dragDrop event handler for the Canvas container
             // sets the Image control's position by 
             // "dropping" it in its new location.
             private function dragDropHandler(event:DragEvent):void {
                 var dropActivityEvent:DropActivityEvent = new DropActivityEvent(DropActivityEvent.DROP_ACTIVITY_EVENT, event);
-                Application.application.dispatchEvent(dropActivityEvent);           
+                Application.application.dispatchEvent(dropActivityEvent);    
             }
 			
 			public function doZoom(isOut:Boolean):void
@@ -82,22 +80,11 @@
 			
 			// Deselect the current activity
 			protected function click(event:MouseEvent):void {
-				if (Application.application.selectedActivity != null) {
+				if (Application.application.selectedActivity != null && !(event.currentTarget is ActivityComponent)) {
 					Application.application.selectedActivity.deSelectActivity();
 				}
 			}
-			
-			protected function mouseDown(event:MouseEvent):void {
-				
-				if (Application.application.selectedActivity != null) {
-					Application.application.selectedActivity.deSelectActivity();
-				}
-			}
-            
              
 		]]>
 	</mx:Script>
-	
-	
-	<!--<mate:Listener type="{TransitionEvent.TRANSITION_EVENT}" receive="startDragging(event)" />-->
 </mx:Canvas>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml
===================================================================
diff -u -r49b1554a182016d60094625120b16bc761fdb2fe -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision 49b1554a182016d60094625120b16bc761fdb2fe)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -1,86 +1,159 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Panel xmlns:mx="http://www.adobe.com/2006/mxml" 
 	layout="absolute"
-	minHeight="60" minWidth="300"
-	right="0" top="60"
-	mouseOver="mouseOver(event)"
-	mouseOut="mouseOut(event)"
+	minWidth="70"
+	rollOver="rollOver(event)"
+	rollOut="rollOut(event)"
 	title="{Application.application.dictionary.getLabel('pi_title')}"
-	backgroundAlpha="0.2"
 	styleName="propertyInspectorUnselected"
 	visible="false"
->
+	xmlns:group="org.lamsfoundation.lams.author.components.activity.group.*">
+	
 	<mx:Style source="assets/css/propertyInspector.css" />
 
 	<mx:Script>
 		<![CDATA[
+			import mx.collections.ArrayCollection;
+			import mx.core.UIComponent;
+			import org.lamsfoundation.lams.author.components.activity.group.RandomGroupActivityComponent;
+			import org.lamsfoundation.lams.author.components.activity.group.GroupActivityComponent;
 			import mx.binding.utils.ChangeWatcher;
 			import mx.binding.utils.BindingUtils;
 			import org.lamsfoundation.lams.author.components.activity.ActivityComponent;
 			import mx.core.Application;
 			import mx.managers.PopUpManager;
 			
+			private var changeWatcherArray:ArrayCollection = new ArrayCollection();
 			
-			private var changeWatcher1:ChangeWatcher;
-			private var changeWatcher2:ChangeWatcher;
-			
 			private var titleDisabledColors:Object;
 			
+			[Bindable]
+			private var applicationCenter:Point = new Point();
+			
 			public function openPropertyInspector(activity:ActivityComponent):void {
 				visible = true;
 				PopUpManager.addPopUp(this, this, false);
 				
 				// Capture the binding so it can be removed when the property inpector is closed (activity de-selected)
-				changeWatcher1 = BindingUtils.bindProperty(activityTitle, "text", activity.title, "text"); 
-				changeWatcher2 = BindingUtils.bindProperty(activity.title, "text", activityTitle, "text"); 
+				changeWatcherArray.addItem(BindingUtils.bindProperty(activityTitle, "text", activity.title, "text"));
+				changeWatcherArray.addItem(BindingUtils.bindProperty(activity.title, "text", activityTitle, "text"));
+				
+				// Display particular ui components for the activity type
+				displayUIComponents(activity);
+				
+				applicationCenter.x = Application.application.width/2;
+				applicationCenter.y = Application.application.height/2;
 			}
 			
 			public function closePropertyInspector():void {
 				visible = false;
 				PopUpManager.removePopUp(this);
 				
 				// Free the bindings to the current selected activity if there are any
-				if (changeWatcher1 != null) {
-					changeWatcher1.unwatch();
+				for each (var changeWatcher:ChangeWatcher in changeWatcherArray) {
+					changeWatcher.unwatch();
 				}
-				if (changeWatcher2 != null) {
-					changeWatcher2.unwatch();
-				}
 			}
 			
-			// Enable the propertyInspector on mousOver
-			private function mouseOver(event:MouseEvent):void {
-				this.styleName = "propertyInspectorSelected";
-				setChildIndex(opacityLayer, 0);
+			// Enable the propertyInspector on rollOver
+			private function rollOver(event:MouseEvent):void {
+					this.styleName = "propertyInspectorSelected";
+					setChildIndex(opacityLayer, 0);
 			}
 			
-			// Disable and white out the propertyInspector on mouseOut
-			private function mouseOut(event:MouseEvent):void {
+			// Disable and white out the propertyInspector on rollOut
+			private function rollOut(event:MouseEvent):void {
 				this.styleName = "propertyInspectorUnselected"
 				setChildIndex(opacityLayer, this.getChildren().length -1);
 				focusManager.setFocus(dummy);
 			}
 			
+			private function displayUIComponents(activity:ActivityComponent):void {
+				this.currentState = "";
+				if (activity is RandomGroupActivityComponent) {
+					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(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"));
+				}
+			}
+			
+			private function groupNumChange(event:Event):void {
+				if (Application.application.selectedActivity is GroupActivityComponent) {
+					var groupActivity:GroupActivityComponent = Application.application.selectedActivity as GroupActivityComponent;
+					if (groupActivity.numGroups > groupActivity.groupNames.length) {
+						groupActivity.groupNames.addItem(Application.application.dictionary.getLabel('group_btn') + " " + groupActivity.numGroups)
+					}
+					
+					if (groupActivity.numGroups < groupActivity.groupNames.length) {
+						groupActivity.groupNames.removeItemAt(groupActivity.groupNames.length - 1);
+					}
+				}
+				
+			}
+			
+			
+			private function openNameGroupsWindow():void {
+				nameGroupsWindow.openWindow();
+			}
+			
 		]]>
 	</mx:Script>
 	
 	
 	
-	<mx:VBox height="100%" width="100%" >
-		<mx:Spacer height="3" />
-		<mx:Form id="propertiesForm" width="100%" height="100%" verticalGap="2" paddingTop="0">
+	<mx:VBox id="vbox" height="100%" width="100%" horizontalAlign="center" verticalGap="2" paddingBottom="3" top="5">
+		<mx:Form id="propertiesForm" 
+			height="100%"  paddingTop="0" paddingBottom="0" 
+			textAlign="left" verticalGap="2" borderStyle="none">
 			
 			<mx:FormItem label="{Application.application.dictionary.getLabel('pi_lbl_title')}" height="16" >
-            	<mx:TextInput id="activityTitle"/>
+            	<mx:TextInput id="activityTitle" width="100" maxChars="256" />
        		</mx:FormItem>
-			<mx:FormItem label="next thing" height="16" >
-            	<mx:TextInput id="activityTitlxxx"/>
-       		</mx:FormItem>
 			<mx:FormItem visible="false" height="0">
 				<mx:TextInput id="dummy" />
        		</mx:FormItem>
+       		
 		</mx:Form>
+
 	</mx:VBox>
 	<mx:Canvas id="opacityLayer" height="100%" width="100%" backgroundColor="white" backgroundAlpha="0.6" />
 	
+	<mx:states>
+		<mx:State name="randomActivity">
+			<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: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:FormItem>
+            </mx:AddChild>
+            <mx:AddChild relativeTo="{vbox}" position="lastChild"  creationPolicy="all">   
+                	<mx:Button label="Name Groups" height="18" click="openNameGroupsWindow()"/>
+            </mx:AddChild>
+            
+            <mx:SetProperty target="{this}"
+            	name="title" value="{Application.application.dictionary.getLabel('pi_random_group_activity')}"/>
+
+		</mx:State>
+	</mx:states>
+	
+	
+	<group:NameGroupsWindow id="nameGroupsWindow"  includeInLayout="false" />
+
 </mx:Panel>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
===================================================================
diff -u -rbbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision bbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -14,6 +14,7 @@
 
 	<mx:Script>
 		<![CDATA[
+			import mx.core.UIComponent;
 			import mx.controls.Alert;
 			import mx.managers.DragManager;
 			import mx.core.DragSource;
@@ -45,7 +46,9 @@
 			public var state:int = Constants.ACTIVITY_STATE_NORMAL;
 			
 			// Function used to load a new activity 
-			public function load():void { 	
+			public function load():void { 
+				title = new Label();
+				this.addChild(title);	
 		    }
 		    
 		    public function disableTitle():void {
@@ -57,24 +60,34 @@
 		    // When you click on an activity, it becomes selected
 		    // And the properties box appears
 		    protected function click(event:MouseEvent):void {
-		    	this.setStyle('borderStyle', 'solid');
-				this.setStyle('borderColor', '#66CCFF');
-				this.state = Constants.ACTIVITY_STATE_SELECTED;
-				
-				if (Application.application.selectedActivity != null) {
-					Application.application.selectedActivity.deSelectActivity();
-				}
-				Application.application.selectedActivity = this;
-				
-				Application.application.canvasArea.propertyInspector.openPropertyInspector(this);
+		    	selectActivity();
 				event.stopPropagation();
 		    }
 		    
+		    public function selectActivity():void {
+		    	
+		    	// check the activity is loaded.
+		    	if (title != null) {
+		    		this.setStyle('borderStyle', 'solid');
+					this.setStyle('borderColor', '#66CCFF');
+					this.state = Constants.ACTIVITY_STATE_SELECTED;
+					
+					if (Application.application.selectedActivity != null) {
+						Application.application.selectedActivity.deSelectActivity();
+					}
+					Application.application.selectedActivity = this;
+					Application.application.canvasArea.propertyInspector.openPropertyInspector(this);
+		    	}
+		    }
+		    
 		    public function deSelectActivity():void {
 		    	this.setStyle('borderStyle', 'none');
 		    	this.state = Constants.ACTIVITY_STATE_NORMAL;
-		    	Application.application.selectedActivity = null;
-		    	Application.application.canvasArea.propertyInspector.closePropertyInspector();
+		    	
+		    	if (Application.application.selectedActivity == this) {
+		    		Application.application.selectedActivity = null;
+		    		Application.application.canvasArea.propertyInspector.closePropertyInspector();
+		    	}
 		    }
 		    
 			// The mouseMove event handler for the Image control
@@ -229,7 +242,10 @@
 		   		}
 			}
 
-			
+			// 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/CombinedActivityComponent.mxml
===================================================================
diff -u -rb18306871e780d0266af4b3135c37780f09d2b72 -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml	(.../CombinedActivityComponent.mxml)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml	(.../CombinedActivityComponent.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -20,6 +20,8 @@
 			
 			override public function load():void {
 				
+				super.load();
+				
 				var vbox:VBox = new VBox();
 				vbox.setConstraintValue("verticalAlign", "middle");
 				vbox.setConstraintValue("verticalGap", 0);
@@ -62,9 +64,9 @@
 				
 				this.addChild(vbox);
 				
-				title = new Label();
+				// Set the title
+				super.load();
    				title.text = learningLibraryEntry.title;
-   				this.addChild(title);
 				
 			}
 			
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml
===================================================================
diff -u -rb18306871e780d0266af4b3135c37780f09d2b72 -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml	(.../OptionalActivityComponent.mxml)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml	(.../OptionalActivityComponent.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -39,7 +39,6 @@
                 	activityComponent.canStartTransitions = false;
                 	activityComponent.canAcceptTransitions = false;
                 	activityComponent.disableTitle();
-                	//parent.removeChild(activityComponent);
                 	optionalArea.addChild(activityComponent);
                 	activities.addItem(activityComponent);
               		activityComponent.updateTransitionPositions();
@@ -48,12 +47,17 @@
                 // Return cursor state to normal
 				Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);                    
             }
+            
+           	override public function load():void {
+            	title = new Label();
+            	title.text = Application.application.dictionary.getLabel("grouping_act_title");
+            	this.disableTitle();
+				this.addChild(title);
+            }
 			
 		]]>
 	</mx:Script>
 	
-	
-
 	<mx:VBox id="vbox"
 		horizontalAlign="center"
 		paddingTop="5" paddingRight="5" paddingBottom="5" paddingLeft="5"
@@ -71,8 +75,4 @@
 		</mx:VBox>
 		
 	</mx:VBox>
-		
-		
-		
-
 </ActivityComponent>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml
===================================================================
diff -u -r2ceaea37dd2a14f76d28626f47274d188a4863f7 -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml	(.../ToolActivityComponent.mxml)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml	(.../ToolActivityComponent.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -29,7 +29,7 @@
 				vbox.setStyle('borderStyle', 'solid');
 				vbox.setStyle('dropShadowEnabled', true);
 				vbox.setStyle('shadowDirection', "right");
-				vbox.setStyle('cornerRadius', '10');
+				vbox.setStyle('cornerRadius', 10);
 				vbox.height = 40;
 				vbox.width = 50;
 				
@@ -55,10 +55,11 @@
    				vbox.addChild(iconImage);
    				this.addChild(vbox);
    				
-   				title = new Label();
+   				// Set the activity title
+   				super.load();
    				title.text = tool.toolName;
-   				this.addChild(title);
    				
+   				
 			}
 			
 			
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ActivityComponent xmlns="org.lamsfoundation.lams.author.components.activity.*" xmlns:mx="http://www.adobe.com/2006/mxml"
+	horizontalScrollPolicy="off" horizontalAlign="center"
+	paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5"
+	>
+	<mx:Script>
+		<![CDATA[
+			import mx.collections.ArrayCollection;
+			import mx.controls.Label;
+			import mx.core.Application;
+			
+			public var numGroups:Number = 2;
+			
+			[Bindable]
+			public var groupNames:ArrayCollection = new ArrayCollection();
+			
+			override public function load():void {
+            	this.title = new Label();
+            	title.text = Application.application.dictionary.getLabel("grouping_act_title");
+				this.addChild(title);
+				
+				groupNames.addItem(Application.application.dictionary.getLabel('group_btn') + " 1");
+				groupNames.addItem(Application.application.dictionary.getLabel('group_btn') + " 2");
+            }
+		]]>
+	</mx:Script>
+	
+	<mx:VBox verticalAlign="middle" horizontalAlign="center"
+		borderStyle="solid"
+		dropShadowEnabled="true"
+		shadowDirection="right"
+		cornerRadius="5"
+		backgroundColor="#C2D5FE"
+		height="40" width="50">
+		<mx:Image source="@Embed(source='assets/icons/group.png')" />
+	</mx:VBox>
+	
+	
+</ActivityComponent>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/LearnerGroupActivityComponent.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/LearnerGroupActivityComponent.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/LearnerGroupActivityComponent.mxml	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<GroupActivityComponent xmlns="org.lamsfoundation.lams.author.components.activity.group.*" xmlns:mx="http://www.adobe.com/2006/mxml">
+	<mx:Script>
+		<![CDATA[
+			public var numLearners:int;
+		]]>
+	</mx:Script>
+</GroupActivityComponent>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/MonitorGroupActivityComponent.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/MonitorGroupActivityComponent.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/MonitorGroupActivityComponent.mxml	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<GroupActivityComponent xmlns="org.lamsfoundation.lams.author.components.activity.group.*" xmlns:mx="http://www.adobe.com/2006/mxml">
+	<mx:Script>
+		<![CDATA[
+			public var numLearners:int;
+		]]>
+	</mx:Script>
+</GroupActivityComponent>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Window xmlns:mx="http://www.adobe.com/2006/mxml"
+	xmlns="org.lamsfoundation.lams.author.components.util.*" 
+	visible="false"
+	minWidth="150"
+	title="{Application.application.dictionary.getLabel('groupnaming_dlg_title_lbl')}"
+	>
+	
+	
+	<mx:Script>
+		<![CDATA[
+			import mx.core.IFlexDisplayObject;
+			import mx.managers.PopUpManager;
+			import mx.binding.utils.BindingUtils;
+			import mx.binding.utils.ChangeWatcher;
+			import mx.core.Application;
+			
+			private var changeWatcher1:ChangeWatcher;
+			private var changeWatcher2:ChangeWatcher;
+			
+			public function openWindow():void {
+				this.visible=true;
+				
+				var x:int = Application.application.applicationCenter.x;
+				
+				if (Application.application.selectedActivity is GroupActivityComponent) {
+					var groupActivity:GroupActivityComponent = Application.application.selectedActivity as GroupActivityComponent;
+					changeWatcher1 = BindingUtils.bindProperty(nameList, "dataProvider", groupActivity, "groupNames");
+					changeWatcher2 = BindingUtils.bindProperty(groupActivity, "groupNames", nameList, "dataProvider");
+				}
+				
+				PopUpManager.addPopUp(this, this, true);
+			}
+			
+			public function closeWindow():void {
+				this.visible=false;
+				changeWatcher1.unwatch();
+				changeWatcher2.unwatch();
+				PopUpManager.removePopUp(this);
+			}
+			
+		]]>
+	</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:Button label="OK" click="closeWindow()" />
+	 
+</Window>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/RandomGroupActivityComponent.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/RandomGroupActivityComponent.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/RandomGroupActivityComponent.mxml	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<GroupActivityComponent xmlns="org.lamsfoundation.lams.author.components.activity.group.*" xmlns:mx="http://www.adobe.com/2006/mxml">
+	<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 {
+				return !isLearnersPerGroup;
+			}
+			
+			public function set isNormalRandom(boolean:Boolean):void {
+				isLearnersPerGroup = !boolean;
+			}
+			
+			
+		]]>
+	</mx:Script>
+	
+</GroupActivityComponent>
Fisheye: Tag fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemActivityComponent.mxml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemToolComponent.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemToolComponent.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemToolComponent.mxml	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:Button xmlns:mx="http://www.adobe.com/2006/mxml">
+	
+	<mx:Script>
+		<![CDATA[
+			
+			public var type:int;
+			
+		]]>
+	</mx:Script>
+</mx:Button>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml
===================================================================
diff -u -rd75a56dbb3bbbceaeba8a0f5367d60ac305239aa -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(.../ToolBar.mxml)	(revision d75a56dbb3bbbceaeba8a0f5367d60ac305239aa)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(.../ToolBar.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -10,6 +10,11 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.components.activity.group.LearnerGroupActivityComponent;
+			import org.lamsfoundation.lams.author.components.activity.group.MonitorGroupActivityComponent;
+			import org.lamsfoundation.lams.author.components.activity.group.RandomGroupActivityComponent;
+			import org.lamsfoundation.lams.author.components.activity.group.GroupActivityComponent;
+			import org.lamsfoundation.lams.author.components.activity.ActivityComponent;
 			import org.lamsfoundation.lams.author.components.CanvasBox;
 			import mx.managers.DragManager;
 			import mx.core.UIComponent;
@@ -38,6 +43,12 @@
 				
 			}
 			
+			public function closeAllMenus():void {
+				optionalMenu.closeDropDown();
+				flowMenu.closeDropDown();
+				groupMenu.closeDropDown();
+			}
+			
 			public function doZoom(isOut:Boolean):void {
 				var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
 				
@@ -49,13 +60,32 @@
 			
 			private function mouseClick(event:MouseEvent):void 
 	        {                
-	        	var dragInitiator:SystemActivityComponent = event.currentTarget as SystemActivityComponent;
+	        	var dragInitiator:SystemToolComponent = event.currentTarget as SystemToolComponent;
 	        	
 	        	var ds:DragSource = new DragSource();
-				var optionalActivity:OptionalActivityComponent = new OptionalActivityComponent();
-
-          		ds.addData(optionalActivity, "img");  
-          		DragManager.doDrag(dragInitiator, ds, event, optionalActivity, 25, 15, 1.00, false);
+	        	
+	        	var activityComponent:ActivityComponent;
+	        	
+	        	closeAllMenus();
+	        	
+	        	switch (dragInitiator.type) {
+	        		case Constants.SYSTEM_ACTIVITY_TYPE_OPTIONAL: 
+		        		activityComponent = new OptionalActivityComponent();
+	          			break;
+	          		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_RANDOM:
+		        		activityComponent = new RandomGroupActivityComponent();	
+	          			break;
+	          		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_MONITOR:
+		        		activityComponent = new MonitorGroupActivityComponent();	
+	          			break;
+	          		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_LEARNER:
+		        		activityComponent = new LearnerGroupActivityComponent();	
+	          			break;
+	        	}
+	        	
+	        	ds.addData(activityComponent, "img");  
+	          	DragManager.doDrag(dragInitiator, ds, event, activityComponent, 25, 15, 1.00, false);
+				
 	        }
 			
 		]]>
@@ -154,7 +184,7 @@
     
     
     <toolbar:ToolBarDropDown id="optionalMenu">
-    	<toolbar:SystemActivityComponent type="{Constants.SYTEM_ACTIVITY_TYPE_OPTIONAL}" height="25" 
+    	<toolbar:SystemToolComponent type="{Constants.SYSTEM_ACTIVITY_TYPE_OPTIONAL}" height="25" 
     		click="mouseClick(event)"
     		icon="@Embed(source='assets/icons/optional.png')" 
     		label="{Application.application.dictionary.getLabel('optional_act_btn')}" 
@@ -193,10 +223,17 @@
     <mx:Binding destination="flowMenu.y" source="flowButton.y + flowButton.height" />
     
     <toolbar:ToolBarDropDown id="groupMenu">
-    	<mx:Button height="25" 
+    	<toolbar:SystemToolComponent type="{Constants.SYSTEM_ACTIVITY_TYPE_GROUP_RANDOM}" height="25" 
+    		click="mouseClick(event)"
     		icon="@Embed(source='assets/icons/group.png')" 
-    		label="{Application.application.dictionary.getLabel('random_group_btn')}"
+    		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('random_group_btn')}"
+    		toolTip="{Application.application.dictionary.getLabel('random_group_btn_tooltip')}"/>-->
     		
     	<mx:Button height="25" 
     		icon="@Embed(source='assets/icons/group.png')" 
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/util/Window.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/util/Window.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/util/Window.mxml	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:Panel xmlns:mx="http://www.adobe.com/2006/mxml" 
+	layout="vertical"
+	styleName="window"
+	>
+	
+	<mx:Style source="assets/css/author.css" />
+	
+	<mx:Script>
+		<![CDATA[
+			import mx.core.Application;
+			
+			public function set point(point:Point):void {
+				this.x = point.x;
+				this.y = point.y;
+			} 
+			
+		]]>
+	</mx:Script>
+	<mx:Binding destination="x" source="Application.application.applicationCenter.x - (this.width /2)" />
+	<mx:Binding destination="y" source="Application.application.applicationCenter.y - (this.height /2)" />
+</mx:Panel>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
===================================================================
diff -u -r6ba53561e76e6db5cc55f55d0635227288c765ae -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision 6ba53561e76e6db5cc55f55d0635227288c765ae)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -12,7 +12,11 @@
 	import org.lamsfoundation.lams.author.components.CanvasBox;
 	import org.lamsfoundation.lams.author.components.LearningLibraryEntryComponent;
 	import org.lamsfoundation.lams.author.components.activity.*;
-	import org.lamsfoundation.lams.author.components.toolbar.SystemActivityComponent;
+	import org.lamsfoundation.lams.author.components.activity.group.GroupActivityComponent;
+	import org.lamsfoundation.lams.author.components.activity.group.LearnerGroupActivityComponent;
+	import org.lamsfoundation.lams.author.components.activity.group.MonitorGroupActivityComponent;
+	import org.lamsfoundation.lams.author.components.activity.group.RandomGroupActivityComponent;
+	import org.lamsfoundation.lams.author.components.toolbar.SystemToolComponent;
 	import org.lamsfoundation.lams.author.components.transition.TransitionComponent;
 	import org.lamsfoundation.lams.author.events.AuthorActivityEvent;
 	import org.lamsfoundation.lams.author.events.TransitionEvent;
@@ -84,6 +88,7 @@
           		activityComponent.y = currentMousePoint.y - activityComponent.mouseOffSetY;
           		activityComponent.setCenter();
           		activityComponent.updateTransitionPositions();
+          		activityComponent.selectActivity();
             } else if (event.dragInitiator is LearningLibraryEntryComponent) {
             	var learningLibraryComponent:LearningLibraryEntryComponent = event.dragInitiator as LearningLibraryEntryComponent;
             	
@@ -95,6 +100,7 @@
               		combinedActivityComponent.y = currentMousePoint.y
                 	canvasBox.addChild(combinedActivityComponent);
                 	combinedActivityComponent.setCenter();
+                	combinedActivityComponent.selectActivity();
             	} else {
             		var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent();
                 	toolActivityComponent.tool = learningLibraryComponent.learningLibraryEntry.toolTemplates[0];
@@ -103,18 +109,48 @@
               		toolActivityComponent.y = currentMousePoint.y;
                 	canvasBox.addChild(toolActivityComponent);
                 	toolActivityComponent.setCenter();
+                	toolActivityComponent.selectActivity();
             	}
-            } else if (event.dragInitiator is SystemActivityComponent) {
-            	var systemActivityComponent:SystemActivityComponent = event.dragInitiator as SystemActivityComponent;
+            } else if (event.dragInitiator is SystemToolComponent) {
+            	var systemToolComponent:SystemToolComponent = event.dragInitiator as SystemToolComponent;
             	
-            	switch (systemActivityComponent.type) {
-            		case Constants.SYTEM_ACTIVITY_TYPE_OPTIONAL:
-            			var optionalActivityComponent:OptionalActivityComponent = new OptionalActivityComponent();
+            	switch (systemToolComponent.type) {
+            		case Constants.SYSTEM_ACTIVITY_TYPE_OPTIONAL:
+            			var optionalActivityComponent:OptionalActivityComponent = new OptionalActivityComponent();       			
 	                	optionalActivityComponent.x = currentMousePoint.x;
 		              	optionalActivityComponent.y = currentMousePoint.y;
 		              	canvasBox.addChild(optionalActivityComponent);
 	                	optionalActivityComponent.setCenter();
+	                	optionalActivityComponent.load();
+	                	optionalActivityComponent.selectActivity();
             			break;
+            		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_RANDOM:
+            			var randomGroup:RandomGroupActivityComponent = new RandomGroupActivityComponent();
+	                	randomGroup.x = currentMousePoint.x;
+		              	randomGroup.y = currentMousePoint.y;
+		              	canvasBox.addChild(randomGroup);
+	                	randomGroup.setCenter();
+	                	randomGroup.load();
+	                	randomGroup.selectActivity();
+            			break;
+            		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_MONITOR:
+            			var monitorGroup:MonitorGroupActivityComponent = new MonitorGroupActivityComponent();
+	                	monitorGroup.x = currentMousePoint.x;
+		              	monitorGroup.y = currentMousePoint.y;
+		              	canvasBox.addChild(monitorGroup);
+	                	monitorGroup.setCenter();
+	                	monitorGroup.load();
+	                	monitorGroup.selectActivity();
+            			break;
+            		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_RANDOM:
+            			var learnerGroup:GroupActivityComponent = new LearnerGroupActivityComponent();
+	                	learnerGroup.x = currentMousePoint.x;
+		              	learnerGroup.y = currentMousePoint.y;
+		              	canvasBox.addChild(learnerGroup);
+	                	learnerGroup.setCenter();
+	                	learnerGroup.load();
+	                	learnerGroup.selectActivity();
+            			break;
             	}
             }
                 
@@ -242,6 +278,8 @@
 				
 			var activityComponent:ActivityComponent = event.activityComponent;
 			
+			activityComponent.deSelectActivity();
+			
 			// Remove transition in, if needed
 			if (activityComponent.transitionIn != null) {
 				canvasBox.removeChild(activityComponent.transitionIn);
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
===================================================================
diff -u -rbbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision bbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
@@ -10,7 +10,6 @@
 	    public static const TOOL_CATEGORY_SPLIT:int = 5;
 	    public static const TOOL_CATEGORY_REFLECTIVE:int = 6;
 	    
-	    
 	    public static const CURSOR_STATE_NORMAL:int = 1;
 	    public static const CURSOR_STATE_TRANSITION:int = 2;
 	    public static const CURSOR_STATE_DATAFLOW:int = 3;
@@ -24,17 +23,15 @@
 	    public static const ACTIVITY_STATE_MOUSE_OVER:int = 3;
 	    public static const ACTIVITY_STATE_SELECTED:int = 4;
 	    
-	    
-	    public static const SYTEM_ACTIVITY_TYPE_OPTIONAL:int = 1;
-	    public static const SYTEM_ACTIVITY_TYPE_OPTIONAL_SEQUENCE:int = 2;
-	    public static const SYTEM_ACTIVITY_TYPE_SUPPORT:int = 3;
-	    public static const SYTEM_ACTIVITY_TYPE_GATE:int = 4;
-	    public static const SYTEM_ACTIVITY_TYPE_BRANCH:int = 5;
-	    public static const SYTEM_ACTIVITY_TYPE_CONVERGE:int = 6;
-	    public static const SYTEM_ACTIVITY_TYPE_GROUP_RANDOM:int = 7;
-	    public static const SYTEM_ACTIVITY_TYPE_GROUP_MONITOR:int = 8;
-	    public static const SYTEM_ACTIVITY_TYPE_GROUP_LEARNER:int = 9;
-	    
-	    
+	    public static const SYSTEM_ACTIVITY_TYPE_OPTIONAL:int = 1;
+	    public static const SYSTEM_ACTIVITY_TYPE_OPTIONAL_SEQUENCE:int = 2;
+	    public static const SYSTEM_ACTIVITY_TYPE_SUPPORT:int = 3;
+	    public static const SYSTEM_ACTIVITY_TYPE_GATE:int = 4;
+	    public static const SYSTEM_ACTIVITY_TYPE_BRANCH:int = 5;
+	    public static const SYSTEM_ACTIVITY_TYPE_CONVERGE:int = 6;
+	    public static const SYSTEM_ACTIVITY_TYPE_GROUP_RANDOM:int = 7;
+	    public static const SYSTEM_ACTIVITY_TYPE_GROUP_MONITOR:int = 8;
+	    public static const SYSTEM_ACTIVITY_TYPE_GROUP_LEARNER:int = 9;
+	     
 	}
 }
\ No newline at end of file