Upgraded layout approach