Added E-mail tracking and a confermation modal