neatened up layout