Changes to buttons and button groups