Better layout on client