Added layout upgrades towards two-column layout