Refactored the services, moved the topbar builder to own class