Updated I18n and Email templates