Refactored services click logic. Hope to find a way to further refactor this using meta-programming down the road.