Move checkbox into fieldset