Added services API and fixed UI bugs

Change-Id: I83c42546131b7ce0bbc4cb2fdc584f46c8b26b7f