Revert "Allow for multiple services without breaking UI"

This reverts commit 1f8b247f99ad36e9dd842d24ec8973bc42bd6f55.