Better layout, with width-tracking