added more styling to emails
fixing merge conflicts