Improve charts