Feature/modify charts