Revert "Revert "removed tabs in Services""

This reverts commit f9bae5ce2d5f6e046e5dbd5ac935f38a34901e8c.