[Services Enhancements]

  - Refactor ServicesController
  - Refactor services views
  - Full spec coverage