Update button names
Allow selection of multiple options