Redesign Emails project related updates

Changes introduced during the emails redesign project.