Better checkbox and radio button treatment