More improvements on Clients section