Index: lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -r0ecb7cb6cb1caf3300646c6211d23f9026d28c75
--- lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css	(.../learningLibrary.css)	(revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css	(.../learningLibrary.css)	(revision 0ecb7cb6cb1caf3300646c6211d23f9026d28c75)
@@ -1,66 +1,75 @@
-/* CSS file */
-
-.linkButtonWindowShade {
-  	headerClass:ClassReference('mx.controls.LinkButton');
-  	header-style-name: linkButtonStyle;
- 	drop-shadow-enabled:true;
-  	corner-radius:10;
-  	border-style:solid;
-  	font-weight:bold;
-   	use-roll-over: false;
-}
-
-.linkButtonStyle {
-	corner-radius:10;	
-	fill-alphas:1,1;
-	padding-left:10;
-	
-}
-
-.informative {
-  	headerClass:ClassReference('mx.controls.LinkButton');
-  	header-style-name: linkButtonStyle;
- 	drop-shadow-enabled:true;
-  	corner-radius:10;
-  	border-style:solid;
-  	font-weight:bold;
-   	use-roll-over: false;
-   	roll-over-color:#FFEEC8;
-   	selectionColor:#FFEEC8;
-
-}
-
-.reflective {
-  	headerClass:ClassReference('mx.controls.LinkButton');
-  	header-style-name: linkButtonStyle;
- 	drop-shadow-enabled:true;
-  	corner-radius:10;
-  	border-style:solid;
-  	font-weight:bold;
-   	use-roll-over: false;
-   	roll-over-color:#DDFCB1;
-   	selectionColor:#DDFCB1;
-}
-
-.collaborative {
-  	headerClass:ClassReference('mx.controls.LinkButton');
-  	header-style-name: linkButtonStyle;
- 	drop-shadow-enabled:true;
-  	corner-radius:10;
-  	border-style:solid;
-  	font-weight:bold;
-   	use-roll-over: false;
-   	roll-over-color:#FFFDBE;
-   	selectionColor:#FFFDBE;
-}
-
-.assessment {
-  	headerClass:ClassReference('mx.controls.LinkButton');
-  	header-style-name: linkButtonStyle;
- 	drop-shadow-enabled:true;
-  	corner-radius:10;
-  	border-style:solid;
-  	font-weight:bold;
-   	roll-over-color:#E9E2F5;
-   	selectionColor:#E9E2F5;    	
+/* CSS file */
+
+.linkButtonWindowShade {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+   	use-roll-over: false;
+}
+
+.linkButtonStyle {
+	corner-radius:10;	
+	fill-alphas:1,1;
+	padding-left:10;
+	
+}
+
+.all {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+}
+
+.informative {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+   	use-roll-over: false;
+   	roll-over-color:#FFEEC8;
+   	selectionColor:#FFEEC8;
+
+}
+
+.reflective {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+   	use-roll-over: false;
+   	roll-over-color:#DDFCB1;
+   	selectionColor:#DDFCB1;
+}
+
+.collaborative {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+   	use-roll-over: false;
+   	roll-over-color:#FFFDBE;
+   	selectionColor:#FFFDBE;
+}
+
+.assessment {
+  	headerClass:ClassReference('mx.controls.LinkButton');
+  	header-style-name: linkButtonStyle;
+ 	drop-shadow-enabled:true;
+  	corner-radius:10;
+  	border-style:solid;
+  	font-weight:bold;
+   	roll-over-color:#E9E2F5;
+   	selectionColor:#E9E2F5;    	
 }
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -r0ecb7cb6cb1caf3300646c6211d23f9026d28c75
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 0ecb7cb6cb1caf3300646c6211d23f9026d28c75)
@@ -39,6 +39,7 @@
                 	activityComponent.x = UIComponent(event.currentTarget).mouseX - 10;
               		activityComponent.y = UIComponent(event.currentTarget).mouseY - 10;
               		activityComponent.setCenter();
+              		activityComponent.updateTransitionPositions();
                 } else {
                 	var learningLibraryComponent:LearningLibraryEntryComponent = event.dragInitiator as LearningLibraryEntryComponent;
                 	
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -r0ecb7cb6cb1caf3300646c6211d23f9026d28c75
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision 0ecb7cb6cb1caf3300646c6211d23f9026d28c75)
@@ -4,7 +4,6 @@
 	mouseDown="mouseDown(event)"
 	mouseOver="mouseOver(event)" 
 	mouseOut="mouseOut(event)"
-	
 	>
 
 	<!--
@@ -51,21 +50,8 @@
 				        ds.addData(activityComponent, "img");               
 				        DragManager.doDrag(activityComponent, ds, event);
 				        setCenter();
-				   		
-				   		if (transitionOut != null)
-				   		{
-				   			transitionOut.startX = centerX;
-				   			transitionOut.startY = centerY;
-				   			transitionOut.invalidateDisplayList();
-				   		} 
-				   		
-				   		
-				   		if (transitionIn != null) {
-				   			transitionIn.endX = centerX;
-				   			transitionIn.endY = centerY;
-				   			transitionIn.invalidateDisplayList();
-				   		}
-				   		
+				        
+				        
 				        break;
 		        }
 		    }
@@ -122,6 +108,8 @@
 			    systemManager.removeEventListener(MouseEvent.MOUSE_MOVE, systemManagerMouseMoveHandler, true);			
 			    systemManager.removeEventListener(MouseEvent.MOUSE_UP, systemManagerMouseUpHandler, true);
 			    systemManager.stage.removeEventListener(Event.MOUSE_LEAVE, stageMouseLeaveHandler);
+			    
+				updateTransitionPositions();
 			}
 			
 			private function systemManagerMouseMoveHandler(event:MouseEvent):void
@@ -153,6 +141,7 @@
 		    	}
 		    	
 		    	if (!validTransition) {
+		    		transitionOut.graphics.clear();
 		    		parent.removeChild(transitionOut);
 		    		transitionOut = null;
 		    	}
@@ -178,6 +167,20 @@
 				this.setStyle('borderStyle', 'none');
 			}
 			
+			public function updateTransitionPositions():void {
+				if (transitionOut != null)
+		   		{
+		   			transitionOut.startX = centerX;
+		   			transitionOut.startY = centerY;
+		   			transitionOut.invalidateDisplayList();
+		   		} 
+		   		if (transitionIn != null) {
+		   			transitionIn.endX = centerX;
+		   			transitionIn.endY = centerY;
+		   			transitionIn.invalidateDisplayList();
+		   		}
+			}
+
 			
 		]]>
 	</mx:Script>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -r0ecb7cb6cb1caf3300646c6211d23f9026d28c75
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as	(.../TransitionComponent.as)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as	(.../TransitionComponent.as)	(revision 0ecb7cb6cb1caf3300646c6211d23f9026d28c75)
@@ -14,6 +14,8 @@
 		
 		override protected function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void {
 			
+			graphics.clear();
+			
 			var origin:Point = new Point(startX,startY);
 			var destination:Point = new Point(endX,endY);
 			
@@ -26,16 +28,19 @@
 			var middle1:Point = Point.interpolate(origin, destination, 0.41);
 			
 			// Draw an arrow to half-way
-			graphics.clear();
 			graphics.beginFill(lineColor,lineAlpha);
-			GraphicsUtil.drawArrow(graphics,origin,middle, {shaftThickness:lineThickness,headWidth:15,headLength:15, shaftPosition:0,edgeControlPosition:0.5});
+			GraphicsUtil.drawArrow(graphics,origin,middle, {shaftThickness:lineThickness,headWidth:10,headLength:10, shaftPosition:0,edgeControlPosition:0.5});
 			
 			// Draw the rest of the line
 			graphics.lineStyle(2, 0x999999, 1);
 			graphics.moveTo(middle1.x,middle1.y);
 			graphics.lineTo(endX,endY);
-			parent.setChildIndex(this, 0);
-
+			
+			// Setting the z index to lower than the activities
+			if (parent != null) {
+				parent.setChildIndex(this, 0);
+			}
+			
 		}
 
 	}