Replace navigation of the service matrix and rename it to service grid

fixes #6180