Update to html 5 and e-mail to be html