Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml
===================================================================
diff -u -r35d182812770922955a51ce25d364fb2b0d8d033 -r2ceaea37dd2a14f76d28626f47274d188a4863f7
--- lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision 35d182812770922955a51ce25d364fb2b0d8d033)
+++ lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -3,6 +3,7 @@
 	layout="absolute"
 	verticalAlign="left"
 	xmlns:components="org.lamsfoundation.lams.author.components.*"
+	xmlns:toolbar="org.lamsfoundation.lams.author.components.toolbar.*"
 	xmlns:maps="org.lamsfoundation.lams.author.maps.*" 
 	xmlns:flexlib="http://code.google.com/p/flexlib/"
 	preinitialize="preInit()"
@@ -79,19 +80,8 @@
 	<maps:MainEventMap id="mainMap" />
 	<maps:ModelMap id="modelMap" />
 
-	<!--<components:ControlPanel id="compControlPanel"
-		left="0" right="0"
-		height="50"
-	/>-->
+	<components:CanvasArea height="100%" width="100%" id="canvasArea" top="30"></components:CanvasArea>
 	
+	<toolbar:ToolBar id="toolBar" width="100%" height="30"></toolbar:ToolBar>
 	
-	
-	
-		
-	<components:CanvasArea height="100%" width="100%" id="canvasArea" top="30"
-		 >
-	</components:CanvasArea>
-	
-	<components:ToolBar id="toolBar" width="100%" height="30"></components:ToolBar>
-	
 </mx:Application>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
===================================================================
diff -u -r35d182812770922955a51ce25d364fb2b0d8d033 -r2ceaea37dd2a14f76d28626f47274d188a4863f7
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 35d182812770922955a51ce25d364fb2b0d8d033)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -4,14 +4,14 @@
     dragEnter="dragEnterHandler(event);" 
     dragDrop="dragDropHandler(event);"
     xmlns:mate="http://mate.asfusion.com/"
-    click="doZoom(event)"
     borderStyle="solid"
     width="4000" height="3000"   
     x="0" y="0"
 	>
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.components.toolbar.SystemActivityComponent;
 			import mx.containers.Canvas;
 			import org.lamsfoundation.lams.author.util.Constants;
 			import mx.core.Application;
@@ -45,15 +45,14 @@
             // "dropping" it in its new location.
             private function dragDropHandler(event:DragEvent):void {
                 
-                
                 if (event.dragInitiator is ActivityComponent) {
                 	var activityComponent:ActivityComponent;
                 	activityComponent = event.dragInitiator as ActivityComponent;
-                	activityComponent.x = UIComponent(event.currentTarget).mouseX - 10;
-              		activityComponent.y = UIComponent(event.currentTarget).mouseY - 10;
+                	activityComponent.x = UIComponent(event.currentTarget).mouseX;
+              		activityComponent.y = UIComponent(event.currentTarget).mouseY;
               		activityComponent.setCenter();
               		activityComponent.updateTransitionPositions();
-                } else {
+                } else if (event.dragInitiator is LearningLibraryEntryComponent) {
                 	var learningLibraryComponent:LearningLibraryEntryComponent = event.dragInitiator as LearningLibraryEntryComponent;
                 	
                 	if (learningLibraryComponent.learningLibraryEntry.isCombined) {
@@ -73,6 +72,18 @@
 	                	this.addChild(toolActivityComponent);
 	                	toolActivityComponent.setCenter();
                 	}
+                } else if (event.dragInitiator is SystemActivityComponent) {
+                	var systemActivityComponent:SystemActivityComponent = event.dragInitiator as SystemActivityComponent;
+                	
+                	switch (systemActivityComponent.type) {
+                		case Constants.SYTEM_ACTIVITY_TYPE_OPTIONAL:
+                			var optionalActivityComponent:OptionalActivityComponent = new OptionalActivityComponent();
+		                	optionalActivityComponent.x = UIComponent(event.currentTarget).mouseX;
+			              	optionalActivityComponent.y = UIComponent(event.currentTarget).mouseY;
+			              	this.addChild(optionalActivityComponent);
+		                	optionalActivityComponent.setCenter();
+                			break;
+                	}
                 }
                 
                 // Return cursor state to normal
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml
===================================================================
diff -u -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633 -r2ceaea37dd2a14f76d28626f47274d188a4863f7
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml	(.../LearningLibraryEntryComponent.mxml)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml	(.../LearningLibraryEntryComponent.mxml)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -3,6 +3,7 @@
 	width="100%" height="25" 
 	verticalAlign="middle" 
 	horizontalGap="0"
+	mouseMove="mouseMoveHandler(event)"
 	>
 	
 	<mx:Script>
@@ -32,8 +33,6 @@
 				title.text = learningLibraryEntry.title;
 				this.addChild(title);
 				
-				// Adding event listener for drag
-				addEventListener(MouseEvent.MOUSE_MOVE, mouseMoveHandler);
 			}
 			
 			
Fisheye: Tag 2ceaea37dd2a14f76d28626f47274d188a4863f7 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2ceaea37dd2a14f76d28626f47274d188a4863f7 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBarDropDown.mxml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
===================================================================
diff -u -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633 -r2ceaea37dd2a14f76d28626f47274d188a4863f7
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -31,27 +31,39 @@
 			private var transitionIn:TransitionComponent
 			private var transitionOut:TransitionComponent;
 			
+			// Activity states
+			public var isDragable:Boolean = true;
+			public var isTransitionable:Boolean = true;
 			
+			
 			private var state:int = Constants.ACTIVITY_STATE_NORMAL;
 			
 			// Function used to load a new activity 
 			public function load():void { 	
 		    }
+		    
+		    public function disableTitle():void {
+		    	toolTip = title.text;
+				title.visible = false;
+				title.height = 0;
+		    }
+		    
 			
-			
 			// The mouseMove event handler for the Image control
 		    // initiates the drag-and-drop operation.
 		    protected function mouseMove(event:MouseEvent):void 
 		    {                
 		        switch (Application.application.cursorState) {
 		        	case Constants.CURSOR_STATE_NORMAL:
+		        		
 		        		var activityComponent:ActivityComponent = event.currentTarget as ActivityComponent;
-				        var ds:DragSource = new DragSource();
-				        ds.addData(activityComponent, "img");               
-				        DragManager.doDrag(activityComponent, ds, event);
-				        setCenter();
 				        
-				        
+				        if (activityComponent.isDragable) {
+				        	var ds:DragSource = new DragSource();
+				        	ds.addData(activityComponent, "img");               
+				        	DragManager.doDrag(activityComponent, ds, event);
+				        	setCenter();
+				        }
 				        break;
 		        }
 		    }
@@ -60,13 +72,16 @@
 		    	
 		    	switch (Application.application.cursorState) {
 		    		case Constants.CURSOR_STATE_TRANSITION:
-		    		var transitionEvent:TransitionEvent = new TransitionEvent(TransitionEvent.TRANSITION_EVENT);
-		    		transitionEvent.sourceAcivityComponent = this;
-		    		transitionEvent.localX = event.localX;
-		    		transitionEvent.localY = event.localY;
-		    		//Application.application.dispatchEvent(transitionEvent);
-		    		startDragging(transitionEvent)
-		    		break;	
+			    		if (this.isTransitionable) {
+			    			var transitionEvent:TransitionEvent = new TransitionEvent(TransitionEvent.TRANSITION_EVENT);
+				    		transitionEvent.sourceAcivityComponent = this;
+				    		transitionEvent.localX = event.localX;
+				    		transitionEvent.localY = event.localY;
+				    		//Application.application.dispatchEvent(transitionEvent);
+			    			startDragging(transitionEvent);
+			    		}
+			    		
+		    			break;	
 		    	}
 		    	
 		    }
@@ -133,7 +148,7 @@
 		    		if (parent.getChildAt(i) is ActivityComponent) {
 		    			
 		    			var activityComponent:ActivityComponent = parent.getChildAt(i) as ActivityComponent;
-		    			if (activityComponent.state == Constants.ACTIVITY_STATE_MOUSE_OVER) {
+		    			if (activityComponent.state == Constants.ACTIVITY_STATE_MOUSE_OVER && activityComponent.isTransitionable) {
 		    				activityComponent.transitionIn = transitionOut;	
 		    				validTransition = true;		
 		    			}
@@ -162,7 +177,7 @@
 		    
 		    private function mouseOver(event:MouseEvent):void {
 				
-				if (Application.application.uiState == Constants.UI_STATE_DRAWING && this.state != Constants.ACTIVITY_STATE_DRAWING) {
+				if (Application.application.uiState == Constants.UI_STATE_DRAWING && this.state != Constants.ACTIVITY_STATE_DRAWING && isTransitionable) {
 					this.setStyle('borderStyle', 'solid');
 					this.setStyle('borderColor', '#66CCFF');
 					this.state = Constants.ACTIVITY_STATE_MOUSE_OVER;
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -r2ceaea37dd2a14f76d28626f47274d188a4863f7
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml	(.../CombinedActivityComponent.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml	(.../CombinedActivityComponent.mxml)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -42,19 +42,19 @@
 					toolActivityComponent1 = new ToolActivityComponent();
 					toolActivityComponent1.tool = learningLibraryEntry.toolTemplates[1];
 					toolActivityComponent1.load();
-					toolActivityComponent1.toolTip = toolActivityComponent1.title.text;
-					toolActivityComponent1.title.visible = false;
-					toolActivityComponent1.title.height = 0;
+					toolActivityComponent1.isDragable = false;
+					toolActivityComponent1.isTransitionable = false;
+					toolActivityComponent1.disableTitle()
 					vbox.addChild(toolActivityComponent1);
 				}
 				
 				if (tool1 != null) {
 					toolActivityComponent2 = new ToolActivityComponent();
 					toolActivityComponent2.tool = learningLibraryEntry.toolTemplates[2];
 					toolActivityComponent2.load();
-					toolActivityComponent2.toolTip = toolActivityComponent2.title.text;
-					toolActivityComponent2.title.visible = false;
-					toolActivityComponent2.title.height = 0;
+					toolActivityComponent2.isDragable = false;
+					toolActivityComponent2.isTransitionable = false;
+					toolActivityComponent2.disableTitle()
 					vbox.addChild(toolActivityComponent2);
 				}
 				
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ActivityComponent 
+	xmlns="org.lamsfoundation.lams.author.components.activity.*" 
+	xmlns:mx="http://www.adobe.com/2006/mxml"
+	paddingTop="5" paddingRight="5" paddingBottom="5" paddingLeft="5"
+	>
+	
+	<mx:Script>
+		<![CDATA[
+			import org.lamsfoundation.lams.author.util.Constants;
+			import mx.core.Application;
+			import mx.managers.DragManager;
+			import mx.events.DragEvent;
+			import mx.collections.ArrayCollection;
+			
+			public var activities:ArrayCollection = new ArrayCollection();
+			
+			public var minActivities:int;
+			public var maxActivities:int;
+			public var desription:String;
+			
+			// The dragEnter event handler for the Canvas container
+            // enables dropping.
+            private function dragEnterHandler(event:DragEvent):void {
+                if (event.dragSource.hasFormat("img"))
+                {
+                    DragManager.acceptDragDrop(VBox(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 {
+                
+                if (event.dragInitiator is ActivityComponent) {
+                	var activityComponent:ActivityComponent;
+                	activityComponent = event.dragInitiator as ActivityComponent;
+                	activityComponent.isTransitionable = false;
+                	activityComponent.disableTitle();
+                	//parent.removeChild(activityComponent);
+                	optionalArea.addChild(activityComponent);
+                	activities.addItem(activityComponent);
+              		activityComponent.updateTransitionPositions();
+                } 
+                
+                // Return cursor state to normal
+				Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);                    
+            }
+			
+		]]>
+	</mx:Script>
+	
+	
+
+	<mx:VBox id="vbox"
+		horizontalAlign="center"
+		paddingTop="5" paddingRight="5" paddingBottom="5" paddingLeft="5"
+		backgroundColor="#C2D5FE" verticalGap="2"
+    	borderStyle="solid" cornerRadius="10" dropShadowEnabled="true" shadowDirection="right"
+		minWidth="90" minHeight="100"
+		dragEnter="dragEnterHandler(event);" 
+    	dragDrop="dragDropHandler(event);" 
+		>
+		<mx:Label text="Optional" fontWeight="bold" />
+		
+		<mx:VBox id="optionalArea" verticalAlign="middle" horizontalAlign="center" backgroundColor="#FFFFF8"
+			verticalGap="0" height="100%" width="100%" borderStyle="solid" cornerRadius="10">
+			
+		</mx:VBox>
+		
+	</mx:VBox>
+		
+		
+		
+
+</ActivityComponent>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -r2ceaea37dd2a14f76d28626f47274d188a4863f7
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml	(.../ToolActivityComponent.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml	(.../ToolActivityComponent.mxml)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -20,9 +20,8 @@
 			
 			public var iconImage:Image;
 			public var tool:Tool;
-
 			
-			 override public function load():void {
+			override public function load():void {
 				
 				var vbox:VBox = new VBox();
 				vbox.setConstraintValue("verticalAlign", "middle");
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemActivityComponent.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemActivityComponent.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemActivityComponent.mxml	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -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
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:Canvas xmlns:mx="http://www.adobe.com/2006/mxml"
+	styleName="toolBar"
+	xmlns:components="org.lamsfoundation.lams.author.components.*"
+	xmlns:toolbar="org.lamsfoundation.lams.author.components.toolbar.*"
+	horizontalScrollPolicy="off"
+	>
+	
+	<mx:Style source="assets/css/toolBar.css" />
+	
+	<mx:Script>
+		<![CDATA[
+			import org.lamsfoundation.lams.author.components.CanvasBox;
+			import mx.managers.DragManager;
+			import mx.core.UIComponent;
+			import mx.core.DragSource;
+			import org.lamsfoundation.lams.author.components.activity.OptionalActivityComponent;
+			import mx.managers.PopUpManager;
+			import org.lamsfoundation.lams.author.util.Constants;
+			import mx.core.Application;
+			
+
+			public function toggleDropDownMenu(menu:ToolBarDropDown):void {
+				
+				if (menu == optionalMenu) {
+					flowMenu.closeDropDown();
+					groupMenu.closeDropDown();
+					optionalMenu.toggleDropDown();
+				} else if (menu == flowMenu) {
+					optionalMenu.closeDropDown();
+					groupMenu.closeDropDown();
+					flowMenu.toggleDropDown();
+				} else if (menu == groupMenu) {
+					optionalMenu.closeDropDown();
+					flowMenu.closeDropDown();
+					groupMenu.toggleDropDown();
+				}
+				
+			}
+			
+			public function doZoom(isOut:Boolean):void {
+				var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+				
+				canvasBox.doZoom(isOut);
+				
+				zoomInButton.enabled = canvasBox.currentZoom < canvasBox.MAX_ZOOM; 
+				zoomOutButton.enabled = canvasBox.currentZoom > canvasBox.MIN_ZOOM;
+			}
+			
+			private function mouseClick(event:MouseEvent):void 
+	        {                
+	        	var dragInitiator:SystemActivityComponent = event.currentTarget as SystemActivityComponent;
+	        	
+	        	var ds:DragSource = new DragSource();
+				var optionalActivity:OptionalActivityComponent = new OptionalActivityComponent();
+	        	
+	        	
+	        	//dragInitiator.x = UIComponent(event.currentTarget).mouseX;
+          		//dragInitiator.y = UIComponent(event.currentTarget).mouseY;
+          		//Application.application.addChild(dragInitiator);
+          		ds.addData(optionalActivity, "img");  
+          		DragManager.doDrag(dragInitiator, ds, event, optionalActivity, 25, 15, 1.00, false);
+	        }
+			
+		]]>
+	</mx:Script>
+	
+	<mx:HBox horizontalGap="5" verticalAlign="middle" horizontalScrollPolicy="off" >
+
+		<mx:MenuBar id="myMenuBar" labelField="@label" iconField="@icon" height="30" >
+	        <mx:XMLList>
+	            <menuitem label="File">
+	                <menuitem label="SubMenuItem A-1" enabled="false"/>
+	                <menuitem label="SubMenuItem A-2"/>
+	            </menuitem>
+	            <menuitem label="Edit"/>
+	            <menuitem label="Tools"/>
+	            <menuitem label="Show"/>
+	            <menuitem label="Help">
+	                <menuitem label="SubMenuItem D-1" 
+	                    type="radio" groupName="one"/>
+	                <menuitem label="SubMenuItem D-2" 
+	                    type="radio" groupName="one"
+	                    selected="true"/>
+	                <menuitem label="SubMenuItem D-3" 
+	                    type="radio" groupName="one"/>
+	            </menuitem>
+	        </mx:XMLList>
+	    </mx:MenuBar>
+	    <mx:Spacer width="5"></mx:Spacer>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/new.png')" toolTip="New Learning Design"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/open.png')" toolTip="Open Learning Design"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/save.png')" toolTip="Save"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/copy.png')" toolTip="Copy Activity"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/paste.png')" toolTip="Paste Activity"></mx:Button>
+	    <mx:Button id="zoomInButton" height="25" width="27" icon="@Embed(source='assets/icons/zoom_in.png')" toolTip="Zoom In" click="doZoom(false)" enabled="false"></mx:Button>
+	    <mx:Button id="zoomOutButton" height="25" width="27" icon="@Embed(source='assets/icons/zoom_out.png')" toolTip="Zoom Out" click="doZoom(true)"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/cursor.png')" toolTip="Normal Cursor" click="Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL)"></mx:Button>
+	    <mx:Spacer width="5"></mx:Spacer>
+	    <mx:Button height="25" icon="@Embed(source='assets/icons/transition.png')" label="Transition" click="Application.application.changeCursorState(Constants.CURSOR_STATE_TRANSITION)"></mx:Button>
+	    <mx:Button id="optionalButton" height="25" icon="@Embed(source='assets/icons/optional.png')" label="Optional" click="toggleDropDownMenu(optionalMenu)"></mx:Button>
+	    <mx:Button id="flowButton" height="25" icon="@Embed(source='assets/icons/flow.png')" label="Flow" click="toggleDropDownMenu(flowMenu)"></mx:Button>
+	    <mx:Button id="groupButton" height="25" icon="@Embed(source='assets/icons/group.png')" label="Group" click="toggleDropDownMenu(groupMenu)"></mx:Button>
+	    <mx:Button height="25" icon="@Embed(source='assets/icons/preview.png')" label="Preview"></mx:Button>
+	</mx:HBox>  
+	
+	  
+	    
+    <!--<mx:VBox id="flowMenu" 
+    	styleName="toolBar" visible="false" 
+    	verticalGap="5"  
+    	paddingTop="5" paddingBottom="5"  paddingLeft="5" paddingRight="5"
+    	>
+    	<mx:Button height="25" icon="@Embed(source='assets/icons/group.png')" label="Group"></mx:Button>
+    	<mx:Button height="25" icon="@Embed(source='assets/icons/preview.png')" label="Preview"></mx:Button>
+    </mx:VBox>-->
+    
+    
+    <toolbar:ToolBarDropDown id="optionalMenu">
+    	<toolbar:SystemActivityComponent type="{Constants.SYTEM_ACTIVITY_TYPE_OPTIONAL}" height="25" icon="@Embed(source='assets/icons/optional.png')" label="Activity" click="mouseClick(event)"></toolbar:SystemActivityComponent>
+    	<mx:Button height="25" icon="@Embed(source='assets/icons/optional.png')" label="Sequence"></mx:Button>
+    	<mx:Button height="25" icon="@Embed(source='assets/icons/optional.png')" label="Support"></mx:Button>
+    </toolbar:ToolBarDropDown>
+    <mx:Binding destination="optionalMenu.x" source="optionalButton.x - 5" />
+    <mx:Binding destination="optionalMenu.y" source="optionalButton.y + optionalButton.height" />
+    
+    <toolbar:ToolBarDropDown id="flowMenu">
+    	<mx:Button height="25" icon="@Embed(source='assets/icons/gate.png')" label="Gate"></mx:Button>
+    	<mx:Button height="25" icon="@Embed(source='assets/icons/branch.png')" label="Branch"></mx:Button>
+    	<mx:Button height="25" icon="@Embed(source='assets/icons/converge.png')" label="Converge"></mx:Button>
+    </toolbar:ToolBarDropDown>
+    <mx:Binding destination="flowMenu.x" source="flowButton.x - 5" />
+    <mx:Binding destination="flowMenu.y" source="flowButton.y + flowButton.height" />
+    
+    <toolbar:ToolBarDropDown id="groupMenu">
+    	<mx:Button height="25" icon="@Embed(source='assets/icons/group.png')" label="Random"></mx:Button>
+    	<mx:Button height="25" icon="@Embed(source='assets/icons/group.png')" label="Choose in Monitor"></mx:Button>
+    	<mx:Button height="25" icon="@Embed(source='assets/icons/group.png')" label="Learner's Choice"></mx:Button>
+    </toolbar:ToolBarDropDown>
+    <mx:Binding destination="groupMenu.x" source="groupButton.x - 5" />
+    <mx:Binding destination="groupMenu.y" source="groupButton.y + groupButton.height" />
+    
+    
+    
+    
+    
+    
+    
+    
+</mx:Canvas>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBarDropDown.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBarDropDown.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBarDropDown.mxml	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml"
+	styleName="toolBar" 
+	visible="false" 
+    verticalGap="5"  
+    paddingTop="5" paddingBottom="5"  paddingLeft="5" paddingRight="5"
+	>
+	<mx:Script>
+		<![CDATA[
+			import mx.managers.PopUpManager;
+			public function toggleDropDown():void {
+				visible = !visible
+				if (visible) {
+					PopUpManager.addPopUp(this, this, false);
+				} else {
+					PopUpManager.removePopUp(this);
+				}
+			}
+			
+			public function closeDropDown():void {
+				
+				if (visible) {
+					visible = false;
+					PopUpManager.removePopUp(this);
+				}
+			}
+			
+		]]>
+	</mx:Script>
+</mx:VBox>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as
===================================================================
diff -u -r0ecb7cb6cb1caf3300646c6211d23f9026d28c75 -r2ceaea37dd2a14f76d28626f47274d188a4863f7
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as	(.../TransitionComponent.as)	(revision 0ecb7cb6cb1caf3300646c6211d23f9026d28c75)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as	(.../TransitionComponent.as)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -24,8 +24,8 @@
 			var lineAlpha:Number = 1;
 			
 			// Find the middle point to draw the arrow
-			var middle:Point = Point.interpolate(origin, destination, 0.4);
-			var middle1:Point = Point.interpolate(origin, destination, 0.41);
+			var middle:Point = Point.interpolate(origin, destination, 0.5);
+			var middle1:Point = Point.interpolate(origin, destination, 0.51);
 			
 			// Draw an arrow to half-way
 			graphics.beginFill(lineColor,lineAlpha);
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
===================================================================
diff -u -r35d182812770922955a51ce25d364fb2b0d8d033 -r2ceaea37dd2a14f76d28626f47274d188a4863f7
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision 35d182812770922955a51ce25d364fb2b0d8d033)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
@@ -25,5 +25,18 @@
 	    public static const ACTIVITY_STATE_NORMAL:int = 1;
 	    public static const ACTIVITY_STATE_DRAWING:int = 2;
 	    public static const ACTIVITY_STATE_MOUSE_OVER:int = 3;
+	    
+	    
+	    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;
+	    
+	    
 	}
 }
\ No newline at end of file