Don't need `spans` around checkboxes/radios
Android button fix munges buttons, so removing