Rejigged layout