Adding email templates and ui fixes

Adding email templates and ui fixes