Rework to move table layout to client.