Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml
===================================================================
diff -u -r91eb5e78fc8721e338f460cf8ad1f22fe3eee48d -re06bcbbc04edaf18a4d603bdc90f85260894dcc3
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml	(.../Advanced.mxml)	(revision 91eb5e78fc8721e338f460cf8ad1f22fe3eee48d)
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml	(.../Advanced.mxml)	(revision e06bcbbc04edaf18a4d603bdc90f85260894dcc3)
@@ -35,7 +35,10 @@
    			
    			[Bindable]
    			public var lesson:Lesson;
-   			
+
+			[Bindable]
+			public var conditions:Conditions;
+  			
    			[Bindable]
    			public var dictionary:XMLDictionaryRegistry;
    			
@@ -160,16 +163,16 @@
 					updateSelectedDate();
 				}
 				
-				//enable/disable TimeLimit subgroup
-				/* 
-				enableTimeLimits.enabled = !startInMonitor.selected;
+				//enable/disable PrecedingLesson and TimeLimit subgroup
+				conditions.enableTimeLimits.enabled = !startInMonitor.selected;
 				if(startInMonitor.selected) {
-					enableTimeLimits.selected = false;
+					conditions.enableTimeLimits.selected = false;
+					conditions.enableIndividualTimeLimit.selected = false;
 				}
-				if(enableIndividualTimeLimit.selected) {
-					enableIndividualTimeLimit.selected = false;
+				conditions.enablePrecedingLesson.enabled = !startInMonitor.selected;
+				if(startInMonitor.selected) {
+					conditions.enablePrecedingLesson.selected = false;
 				}
-				*/
 				
 				var event:WizardEvent = new WizardEvent(WizardEvent.CHANGE_START_BUTTON_LABEL);
 				
Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml
===================================================================
diff -u -r91eb5e78fc8721e338f460cf8ad1f22fe3eee48d -re06bcbbc04edaf18a4d603bdc90f85260894dcc3
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml	(.../Conditions.mxml)	(revision 91eb5e78fc8721e338f460cf8ad1f22fe3eee48d)
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml	(.../Conditions.mxml)	(revision e06bcbbc04edaf18a4d603bdc90f85260894dcc3)
@@ -71,7 +71,8 @@
 	<mx:Form id="conditionsForm"  width="100%" height="100%">
 		<mx:VBox width="100%" height="100%" paddingLeft="10" paddingRight="10" paddingTop="10" paddingBottom="10">
 			<!-- Preceding lesson -->
-			<mx:FormHeading id="scheduling_fH" label="{dictionary.getLabel('conditions.tab.form.preceding.label')}" />
+			<mx:FormHeading id="precedingLesson_fH" label="{dictionary.getLabel('conditions.tab.form.preceding.label')}" />
+			<mx:Text width="100%" textAlign="left" selectable="false" text="{dictionary.getLabel('conditions.tab.form.preceding.info.label')}" truncateToFit="true" paddingLeft="6"/>
 			<mx:CheckBox id="enablePrecedingLesson" name="enableConditionalLesson" selected="false" label="{dictionary.getLabel('advanced.tab.form.enable.label')}" labelPlacement="right" />
 			<mx:VBox width="100%">
 				<mx:FormItem id="precedingLessonPicker_fItm" focusEnabled="true">
@@ -80,7 +81,8 @@
 			</mx:VBox>
 			
 			<!-- Time limits -->
-			<mx:FormHeading id="timeLimits_fH" label="{dictionary.getLabel('advanced.tab.form.time.limits.label')}"  paddingTop="7"/>
+			<mx:FormHeading id="timeLimits_fH" label="{dictionary.getLabel('advanced.tab.form.time.limits.label')}"  paddingTop="8"/>
+			<mx:Text width="100%" textAlign="left" selectable="false" text="{dictionary.getLabel('advanced.tab.form.time.limits.info.label')}" truncateToFit="true" paddingLeft="6"/>
 			<mx:CheckBox id="enableTimeLimits" name="enableTimeLimits" selected="false" label="{dictionary.getLabel('advanced.tab.form.enable.label')}" labelPlacement="right" />
 			<mx:VBox width="100%">
 				<mx:FormItem id="enableTimeLimits_fItm" label="{dictionary.getLabel('advanced.tab.form.enter.number.days.label')}" enabled="{enableTimeLimits.selected}" focusEnabled="true">
Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml
===================================================================
diff -u -r91eb5e78fc8721e338f460cf8ad1f22fe3eee48d -re06bcbbc04edaf18a4d603bdc90f85260894dcc3
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml	(.../Wizard.mxml)	(revision 91eb5e78fc8721e338f460cf8ad1f22fe3eee48d)
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml	(.../Wizard.mxml)	(revision e06bcbbc04edaf18a4d603bdc90f85260894dcc3)
@@ -86,7 +86,7 @@
 		<mx:TabNavigator id="tabViews" width="100%" height="100%" change="tabChange(event)" creationPolicy="all">
 			<views:Lesson id="lessonView" label="{dictionary.getLabel('lesson.tab.label')}" learners="{learnersView}" advanced="{advancedView}" conditions="{conditionsView}"/>
 			<views:Learners id="learnersView" label="{dictionary.getLabel('class.tab.label')}" lesson="{lessonView}" learnersGroupName="{dictionary.getLabelAndInsert('learners.group.name', [dictionary.getLabel('orgName')])}" staffGroupName="{dictionary.getLabelAndInsert('staff.group.name', [dictionary.getLabel('orgName')])}"/>
-			<views:Advanced id="advancedView" label="{dictionary.getLabel('advanced.tab.label')}" learners="{learnersView}" lesson="{lessonView}" />
+			<views:Advanced id="advancedView" label="{dictionary.getLabel('advanced.tab.label')}" learners="{learnersView}" lesson="{lessonView}" conditions="{conditionsView}"/>
 			<views:Conditions id="conditionsView" label="{dictionary.getLabel('conditions.tab.label')}" />
 		</mx:TabNavigator>
 		<mx:HBox horizontalAlign="right" width="100%" paddingRight="10">
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -r6a1464e83458721fec7237d3dccfdf5e6214cc69 -re06bcbbc04edaf18a4d603bdc90f85260894dcc3
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 6a1464e83458721fec7237d3dccfdf5e6214cc69)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision e06bcbbc04edaf18a4d603bdc90f85260894dcc3)
@@ -733,6 +733,8 @@
    			languageCollection.add(new String("advanced.tab.form.validation.schedule.date.error"));
    			languageCollection.add(new String("conditions.tab.label"));
    			languageCollection.add(new String("conditions.tab.form.preceding.label"));
+   			languageCollection.add(new String("conditions.tab.form.preceding.info.label"));
+   			languageCollection.add(new String("advanced.tab.form.time.limits.info.label")); 
    			
     	} else if(module.equals("timechart")) {
 
Index: lams_monitoring/web/CloudWizard.swf
===================================================================
diff -u -r6a1464e83458721fec7237d3dccfdf5e6214cc69 -re06bcbbc04edaf18a4d603bdc90f85260894dcc3
Binary files differ