Fix button toggle + add radio group