Extra chart refactoring and animation