Refactor the Services page