TASK-40: Sync Client manager and list view properly

Could we have the {}'s here?