TASK-40: Sync Client manager and list view properly

fix it! fix it! fix it! fix it! https://www.youtube.com/watch?v=QCniMXdbO6c