Various improvements to notification emails