removed separate charting file
fixed chart drawing
Merge branch 'metrics'