Improve graphs design