Modified views and controllers to display two type of charts