Refactoring of ServiceList/ServiceDetails.