Improved user experience and Email integration

Improved user experience and Email integration and removal of
transaction scope usage.