Fix bug and make chart option changes