Consistent layout for upgrades.