Revert "Allow for multiple services without breaking rounded UI"

This reverts commit 28fe4eaacf5f21969550c1cdee82c571608d0f9f.