Moved radio and check text into <label> tags