Should fix form control labels not attached to their checkboxes [#1204]