Changes on design and charts