Index: lams_flash/src/central/flex/CloudWizard/src/assets/styles/main.css
===================================================================
diff -u -rb791537342fb2b0446a7010efcc2db8ef94e826a -r36d58516270e64c1a292ca45b1f7ded31d6600f7
--- lams_flash/src/central/flex/CloudWizard/src/assets/styles/main.css	(.../main.css)	(revision b791537342fb2b0446a7010efcc2db8ef94e826a)
+++ lams_flash/src/central/flex/CloudWizard/src/assets/styles/main.css	(.../main.css)	(revision 36d58516270e64c1a292ca45b1f7ded31d6600f7)
@@ -11,7 +11,7 @@
 
 
 Panel {
-	borderColor: #6abcec;
+	borderColor: #45a6ed;
 	borderThicknessLeft: 1;
 	borderThicknessRight: 1;
 	borderThicknessBottom: 1;
@@ -23,7 +23,7 @@
 	paddingBottom: 0;
 
 	highlightAlphas: 0.67, 0;
-	headerColors: #000000, #0087e5;
+	headerColors: #45a6ed, #0087e5;
 
 	titleStyleName: "myPanelStyle";
 }
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml
===================================================================
diff -u -rb791537342fb2b0446a7010efcc2db8ef94e826a -r36d58516270e64c1a292ca45b1f7ded31d6600f7
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml	(.../Wizard.mxml)	(revision b791537342fb2b0446a7010efcc2db8ef94e826a)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml	(.../Wizard.mxml)	(revision 36d58516270e64c1a292ca45b1f7ded31d6600f7)
@@ -30,9 +30,6 @@
 			[Bindable]
 			public var orgName:String;
 			
-			[Bindable]
-			public var currentFault:Fault;
-			
 			private function init():void {
 				orgName = Application.application.parameters.orgName;
 			}
Index: lams_flash/src/central/flex/TimeChart/src/assets/styles/main.css
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -r36d58516270e64c1a292ca45b1f7ded31d6600f7
--- lams_flash/src/central/flex/TimeChart/src/assets/styles/main.css	(.../main.css)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/assets/styles/main.css	(.../main.css)	(revision 36d58516270e64c1a292ca45b1f7ded31d6600f7)
@@ -11,7 +11,7 @@
 
 
 Panel {
-	borderColor: #6abcec;
+	borderColor: #45a6ed;
 	borderThicknessLeft: 1;
 	borderThicknessRight: 1;
 	borderThicknessBottom: 1;
@@ -23,7 +23,7 @@
 	paddingBottom: 0;
 
 	highlightAlphas: 0.67, 0;
-	headerColors: #000000, #0087e5;
+	headerColors: #45a6ed, #0087e5;
 
 	titleStyleName: "myPanelStyle";
 }
@@ -57,3 +57,14 @@
 	 font-weight: none;
 	 text-align: left;
 }
+
+/*
+ToggleButtonBar {
+   selectedButtonTextStyleName: "selectedButtonStyle";
+}
+
+
+.selectedButtonStyle {
+   color: #45a6ed
+}
+*/
\ No newline at end of file
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml
===================================================================
diff -u -r43e5486dabc74699edd8075c6259777848f5e050 -r36d58516270e64c1a292ca45b1f7ded31d6600f7
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml	(.../Chart.mxml)	(revision 43e5486dabc74699edd8075c6259777848f5e050)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml	(.../Chart.mxml)	(revision 36d58516270e64c1a292ca45b1f7ded31d6600f7)
@@ -57,9 +57,6 @@
 				selectLearnerForm.visible = false;
 				
 				initButtons();
-				
-				Button(chart_button_bar.getChildAt(ACTIVITY_SPLIT__BUTTON)).enabled = false;
-				Button(chart_button_bar.getChildAt(COMPLETION__BUTTON)).enabled = true;
 			}
 	
 			public function loadClass():void {
@@ -68,10 +65,6 @@
 				showAverage.selected = true;
 				
 				initButtons();
-				
-				Button(chart_button_bar.getChildAt(ACTIVITY_SPLIT__BUTTON)).enabled = true;
-				Button(chart_button_bar.getChildAt(COMPLETION__BUTTON)).enabled = false;
-				
 			}
 			
 			private function initButtons():void {
@@ -108,14 +101,14 @@
 		<mx:Label id="chart_lbl"/>
 				
 		<!-- Button row -->
-		<mx:ButtonBar id="chart_button_bar" horizontalGap="2" itemClick="chartControlHandler(event)">
+		<mx:ToggleButtonBar id="chart_button_bar" horizontalGap="2" itemClick="chartControlHandler(event)">
 			<mx:dataProvider >
 				<mx:Array>
 					<mx:String> </mx:String>
 					<mx:String> </mx:String>
 				</mx:Array>
 			</mx:dataProvider>
-		</mx:ButtonBar>
+		</mx:ToggleButtonBar>
 		
 		<mx:VBox horizontalAlign="center" width="100%" height="100%">
 			<!-- View stack for controlling the different chart views -->    
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_eventHandlers.as
===================================================================
diff -u -rf6dafb83f9dc6236b4243b5dce063898846424f7 -r36d58516270e64c1a292ca45b1f7ded31d6600f7
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_eventHandlers.as	(.../Chart_eventHandlers.as)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_eventHandlers.as	(.../Chart_eventHandlers.as)	(revision 36d58516270e64c1a292ca45b1f7ded31d6600f7)
@@ -2,15 +2,7 @@
 import flash.events.Event;
 		
 	private function chartControlHandler(event:ItemClickEvent):void {
-		if(event.index == 0) {
-			Button(event.currentTarget.getChildAt(1)).enabled = true;
-			chartViews.selectedIndex = LEARNER;
-		} else {
-			chartViews.selectedIndex = CLASS;
-			Button(event.currentTarget.getChildAt(0)).enabled = true;
-		}
-		
-		Button(event.currentTarget.getChildAt(event.index)).enabled = false;
+		chartViews.selectedIndex = (event.index == 0) ? LEARNER : CLASS;
 	}
 	
 	private function dataLearnerPlot(cat:mx.charts.CategoryAxis, item:Object):Object {