added exception to services, fix ui issues