refactoring + multi chart drawer