Upgrade layout