Added Ajax controls and Enhanced charting