Refactoring
Chart fixes