Refactor service UX