Fix radiobuttons, remove un'used view