improve styling of email templates
Merge remote-tracking branch 'origin/master'