Client layout redesign: 2nd step.