Better radio button handling