Major layout changes.