Minor improvements
Service hover