Updated templates some more.
Updated activation email template.