Merge pull request #178 from jianyi-gronk/feature/ui/improveServicePage

Improve service pages