Starting workong on responsive chart
Fixed merge conflicts