Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml
===================================================================
diff -u -rf6dafb83f9dc6236b4243b5dce063898846424f7 -r43e5486dabc74699edd8075c6259777848f5e050
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml	(.../Chart.mxml)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml	(.../Chart.mxml)	(revision 43e5486dabc74699edd8075c6259777848f5e050)
@@ -198,8 +198,8 @@
 			
 			</mx:ViewStack>
 			
-			<mx:Form id="selectLearnerForm">
-				<mx:CheckBox id="showAverage" visible="true" enabled="true" selected="false" label="{dictionary.getLabel('show.average.checkbox')}" />
+			<mx:Form id="selectLearnerForm" visible="{chartViews.selectedIndex == CLASS}">
+				<mx:CheckBox id="showAverage" enabled="true" selected="false" label="{dictionary.getLabel('show.average.checkbox')}" />
 				<mx:HBox>
 					<mx:ComboBox id="selectedLearner_cmb" dataProvider="{learnerProgressData}" labelFunction="learnerName" selectedIndex="{learnerProgressData.getItemIndex(selectedLearnerProgress)}" change="selectLearnerEvent(event)"/>
 					<mx:TextInput id="searchLearner_txt" text="{dictionary.getLabel('search.learner.textbox')}" width="200" enabled="true" click="clearSearch(event)" change="applyFilter()" />
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/MainUI.mxml
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -r43e5486dabc74699edd8075c6259777848f5e050
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/MainUI.mxml	(.../MainUI.mxml)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/MainUI.mxml	(.../MainUI.mxml)	(revision 43e5486dabc74699edd8075c6259777848f5e050)
@@ -14,7 +14,7 @@
 
 	<!-- Listeners and Dispatchers________________________________________________ -->
 	
-	<mate:Listener type="{NavigationEvent.CHART}" 			receive="viewStack.selectedIndex = CHART" />
+	<mate:Listener type="{NavigationEvent.CHART}" receive="viewStack.selectedIndex = CHART" />
 
 	<!-- GUI ______________________________________________________________________ -->
 	<mx:HBox width="100%" height="100%" horizontalGap="0">
Index: lams_monitoring/web/TimeChart.swf
===================================================================
diff -u -rf6dafb83f9dc6236b4243b5dce063898846424f7 -r43e5486dabc74699edd8075c6259777848f5e050
Binary files differ