Moved checkbox field and changed field labels