Add email and rearrange order