Add ButtonGroup; modify actionListener