Clean up email layouts and wording