Layout fixes for test client