[fix] chart overlap and code duplications