Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/LamsAuthor.mxml,v
diff -u -r1.7 -r1.8
--- lams_flex/LamsAuthor/src/LamsAuthor.mxml	20 Jan 2010 02:35:33 -0000	1.7
+++ lams_flex/LamsAuthor/src/LamsAuthor.mxml	20 Jan 2010 06:31:28 -0000	1.8
@@ -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>