Changes to templates to include e-mail as a link