Modify add/remove service/layer functions. Change service bar management. Some refactoring.