Develop

Integrate bar chart Refactor bar and pie chart code