Refactor Services Selection to Services Overview