Cleaned up the way services are used. Slightly.
Now highlights the current exercise