Improve refresh data and charts