Rejigging the layout