Some more minor fixes for email demo and website.
Merge branch 'dev'