Email Template Feedback Request 2

A few small wording and layout changes.