Tidy up email design