update data, refactoring design and charts