Refactored charts
Worked on charts