New style (and logic) for confirmation email
Remove unused emails

These are different views of the confirmation email, which now
incorporates these changes.