rearrange, clean up, add array/if for multiple checkboxes