Major layout advancements