improved emailing ui
Merge branch 'feature/email-ui' into tutor