Email template changes and other UI fixes.