Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rdd13f0a310a584421560c939496e932b1cbd3f71 -r1eb1b9ef78e7ceff78c14d2a6a76bb144de983de
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rdd13f0a310a584421560c939496e932b1cbd3f71 -r1eb1b9ef78e7ceff78c14d2a6a76bb144de983de
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as
===================================================================
diff -u -r327655a8d92f9ed44f5662c92704ade48ec4c1ed -r1eb1b9ef78e7ceff78c14d2a6a76bb144de983de
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as	(.../CompetenceContainer.as)	(revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as	(.../CompetenceContainer.as)	(revision 1eb1b9ef78e7ceff78c14d2a6a76bb144de983de)
@@ -32,6 +32,8 @@
 import org.lamsfoundation.lams.authoring.*
 import org.lamsfoundation.lams.authoring.br.*
 import org.lamsfoundation.lams.authoring.cmpt.*;
+import org.lamsfoundation.lams.authoring.cv.CanvasModel;
+import org.lamsfoundation.lams.monitoring.mv.MonitorModel;
  
 import mx.controls.*
 import mx.utils.*
@@ -46,6 +48,7 @@
 
     //References to components + clips 
     private var _container:MovieClip;  //The container window that holds the dialog
+	private var _container_base_mc:MovieClip;
 	
 	private var _competenceTitle:String;
 	private var _description:String;
@@ -66,8 +69,15 @@
     private var fm:FocusManager;            //Reference to focus manager
     private var themeManager:ThemeManager;  //Theme manager
 	
+	private var _model:Observable; //passed in in init
+	
     //Dimensions for resizing
-    private var xOkOffset:Number;
+	private var containerWidthOffset:Number;
+	private	var containerWidth:Number;
+	private	var xTextFieldOffset:Number;
+	private	var xTextAreaOffset:Number;
+    
+	private var xOkOffset:Number;
     private var yOkOffset:Number;
     private var xCancelOffset:Number;
     private var yCancelOffset:Number;
@@ -96,7 +106,7 @@
     private function init():Void{
         //Delete the enterframe dispatcher
         delete this.onEnterFrame;
-        
+		
         //set the reference to the StyleManager
         themeManager = ThemeManager.getInstance();
 		
@@ -124,8 +134,9 @@
         delete_competence_btn.addEventListener('click',Delegate.create(this, deleteHandler));
 		
         //work out offsets from bottom RHS of panel
-        xOkOffset = _bgpanel._width;// - close_btn._x;
-        yOkOffset = _bgpanel._height;// - close_btn._y;
+        xOkOffset = _bgpanel._width;
+        yOkOffset = _bgpanel._height;
+		containerWidthOffset = 77.1; // width of dialog minus width of container
         
         //Register as listener with StyleManager and set Styles
         themeManager.addEventListener('themeChanged',this);
@@ -265,14 +276,31 @@
     public function click(e:Object):Void{
         e.target.deletePopUp();
     }
-    
+	
     /**
     * Main resize method, called by scrollpane container/parent
     */
     public function setSize(w:Number,h:Number):Void{
-		//Size the panel
-        _bgpanel.setSize(w,h);
 		
+		var containerWidth:Number = w - containerWidthOffset;
+		
+		var xTextFieldOffset:Number = 240;
+		var xTextAreaOffset:Number = 180;
+
+		if (_model != null && _model != undefined) {
+			if (_model instanceof MonitorModel) {
+				xTextFieldOffset = 150;
+				xTextAreaOffset = 96.9;
+			}
+		}
+		
+		_container_base_mc.setSize(containerWidth,_container_base_mc._height);
+		
+		competence_title_txt.setSize(w-xTextFieldOffset, competence_title_txt._height);		
+		competence_description_txt.setSize(w-xTextAreaOffset, 44);
+		
+		edit_competence_btn.move((competence_description_txt._x+competence_description_txt._width+12), edit_competence_btn._y);
+		delete_competence_btn.move((competence_description_txt._x+competence_description_txt._width+12), delete_competence_btn._y);
     }
     
     //Gets+Sets
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as
===================================================================
diff -u -r327655a8d92f9ed44f5662c92704ade48ec4c1ed -r1eb1b9ef78e7ceff78c14d2a6a76bb144de983de
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as	(.../CompetenceEditorDialog.as)	(revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as	(.../CompetenceEditorDialog.as)	(revision 1eb1b9ef78e7ceff78c14d2a6a76bb144de983de)
@@ -31,6 +31,7 @@
 import org.lamsfoundation.lams.authoring.*
 import org.lamsfoundation.lams.authoring.br.*
 
+import org.lamsfoundation.lams.authoring.cmpt.CompetenceContainer;
 import org.lamsfoundation.lams.authoring.cmpt.CompetenceDefinitionDialog;
 import org.lamsfoundation.lams.authoring.cv.CanvasModel;
 import org.lamsfoundation.lams.monitoring.mv.MonitorModel;
@@ -63,6 +64,8 @@
 	private var competenceContainerLayer:MovieClip;
 	private var definitionDialog:MovieClip;
 	
+	private var containerArray:Array;
+	
 	private var competence_editor_scp:ScrollPane;
 		
 	private var app; // application instance
@@ -158,7 +161,7 @@
 			// other model types not currently supported
 		}
 
-		draw();
+		draw(model);
 		this._visible = true;
 	}
 	
@@ -187,23 +190,33 @@
 		return competenceKeys;
 	}
 	
-	public function draw() {
+	public function draw(m:Observable) {
 		
 		var competenceKeys:Array = getCompetenceKeysToDraw();
 		competenceKeys.sort();
 		
 		yContainerOffset = 0;
+		containerArray = new Array();
 		
 		for (var i=0; i<competenceKeys.length; i++) {
 			
 			var titleKey:String = competenceKeys[i];		
 			var descriptionValue:String = (model instanceof MonitorModel) ? app.monitor.ddm.competences.get(competenceKeys[i]) : app.getDesignDataModel().competences.get(competenceKeys[i]);
 			var competenceTitle:String = new String("competenceContainer_"+titleKey);
-			var mc:MovieClip = competenceContainerLayer.attachMovie("competenceContainer", competenceTitle, competenceContainerLayer.getNextHighestDepth(), {_x:0, _y:yContainerOffset, _competenceTitle:titleKey, _description:descriptionValue});
-
+			var mc:MovieClip = competenceContainerLayer.attachMovie("competenceContainer", competenceTitle, competenceContainerLayer.getNextHighestDepth(), {_x:0, _y:yContainerOffset, _competenceTitle:titleKey, _description:descriptionValue, _model:m});
+			
+			containerArray.push(mc);
 			yContainerOffset = yContainerOffset + 120;
 		}
 		
+		MovieClipUtils.doLater(Delegate.create(this, resizeContainers));
+	}
+	
+	public function resizeContainers() {
+		for (var i=0; i<containerArray.length; ++i) {
+			CompetenceContainer(containerArray[i]).setSize(this._width, this._height);
+		}
+		
 		competence_editor_scp.invalidate();
 	}
 	
@@ -292,6 +305,10 @@
 
 		competence_editor_scp.setSize(w-45, h-82);
 		
+		for (var i=0; i<containerArray.length; ++i) {
+			CompetenceContainer(containerArray[i]).setSize(w,h);
+		}
+		
         //Buttons
 		add_competence_btn.move(add_competence_btn._x,h-yOkOffset);
         close_btn.move(w-xOkOffset,h-yOkOffset);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingDialog.as
===================================================================
diff -u -r327655a8d92f9ed44f5662c92704ade48ec4c1ed -r1eb1b9ef78e7ceff78c14d2a6a76bb144de983de
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingDialog.as	(.../CompetenceMappingDialog.as)	(revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingDialog.as	(.../CompetenceMappingDialog.as)	(revision 1eb1b9ef78e7ceff78c14d2a6a76bb144de983de)
@@ -272,6 +272,10 @@
 
 		competence_mapping_scp.setSize(w, h-80);
 		
+		for (var i=0; i<competenceItemMCs.length; ++i) {
+			CompetenceMappingItem(competenceItemMCs[i]).setSize(this._width, this._height);
+		}
+		
         //Buttons
         close_btn.move(w-xOkOffset,h-yOkOffset);
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingItem.as
===================================================================
diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r1eb1b9ef78e7ceff78c14d2a6a76bb144de983de
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingItem.as	(.../CompetenceMappingItem.as)	(revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingItem.as	(.../CompetenceMappingItem.as)	(revision 1eb1b9ef78e7ceff78c14d2a6a76bb144de983de)
@@ -63,10 +63,7 @@
     private var themeManager:ThemeManager;  //Theme manager
 	
     //Dimensions for resizing
-    private var xOkOffset:Number;
-    private var yOkOffset:Number;
-    private var xCancelOffset:Number;
-    private var yCancelOffset:Number;
+    private var xTextFieldOffset:Number;
 
     //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
@@ -110,6 +107,9 @@
         themeManager.addEventListener('themeChanged',this);
         setStyles();
 		
+		//dimensions for resizing
+		xTextFieldOffset = 100;
+		
         //fire event to say we have loaded
 		_container.contentLoaded();
 	}
@@ -168,9 +168,13 @@
     * Main resize method, called by scrollpane container/parent
     */
     public function setSize(w:Number,h:Number):Void{
+		
 		//Size the panel
         _bgpanel.setSize(w,h);
 		
+		competence_title_txt.setSize(w - xTextFieldOffset, competence_title_txt._height);
+		_map_competence_checkbox.move(40.1 + competence_title_txt._width + 14.3, _map_competence_checkbox._y);
+
     }
     
     //Gets+Sets
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewCompetencesDialog.as
===================================================================
diff -u -r327655a8d92f9ed44f5662c92704ade48ec4c1ed -r1eb1b9ef78e7ceff78c14d2a6a76bb144de983de
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewCompetencesDialog.as	(.../ViewCompetencesDialog.as)	(revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewCompetencesDialog.as	(.../ViewCompetencesDialog.as)	(revision 1eb1b9ef78e7ceff78c14d2a6a76bb144de983de)
@@ -63,6 +63,8 @@
 	//Dimensions for resizing
     private var xCloseOffset:Number;
     private var yCloseOffset:Number;
+	private var xScrollPaneOffset:Number;
+	private var yScrollPaneOffset:Number;
 	
 	private var _lessonTabView:LessonTabView;
 	private var _monitorModel:MonitorModel;
@@ -125,6 +127,8 @@
         //work out offsets from bottom RHS of panel
         xCloseOffset = panel._width - close_btn._x;
         yCloseOffset = panel._height - close_btn._y;
+		xScrollPaneOffset = 15.1;
+		yScrollPaneOffset = 73.1;
 		
 		loadCompetences();
 		
@@ -268,9 +272,12 @@
     * Main resize method, called by scrollpane container/parent
     */
     public function setSize(w:Number,h:Number):Void{
-        //Size the panel
-        panel.setSize(w,h);
 
+		//Size the panel
+		panel.setSize(w,h);
+
+		competences_scp.setSize(w-xScrollPaneOffset, h-yScrollPaneOffset);
+		
         //Buttons
         close_btn.move(w-xCloseOffset,h-yCloseOffset);
 		
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rde0317a3aff0b822e77d716fb94c76c8ce306386 -r1eb1b9ef78e7ceff78c14d2a6a76bb144de983de
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rde0317a3aff0b822e77d716fb94c76c8ce306386 -r1eb1b9ef78e7ceff78c14d2a6a76bb144de983de
Binary files differ