Implemented changing charts and UI improvements