Various layout upgrades