Activate email extends email master layout
Activation email now extends the email layout.

Includes other cosmetic changes in emails
More cosmetic and tiny layout changes to email