Added Email support, UI enhancements.