Correct the email Services and fix some look & feel details in the templates