Fix the client form layout