Omptimized calls for webservices, added everything to the UI