Services integration with UI

Services integration with UI
Services refactoring