Tweaks to nag and layout