Small HTML fix and simplification of the services display.
This will create a new commit in order to revert the existing changes.
