Adjust Single Service display
Simplify code in templates