Minor Email template Changes