Added Email and SMS forms in UI
Merge branch 'dev'