Fixing client class

fixing group layout issues