improve clients page too