1. refactor
2. add clients grid