Fix radio button to have a label and also to not use rogue function