Added initial modalwindow support and email service