Let's use RADIO_BUTTON and CHECK_BUTTON roles

Thank you Caolán and Niklas for your support!

Change-Id: Ied978b36cc309b2668889d878a309d1a1400633a