a few layout upgrades