Design fixes, using new :radio_buttons type