Fixed email with new email and updated views