Layouting work and More Tests in client