TASK-40: Sync Client manager and list view properly

this part is sad though