Tweaks to p2+ layouts