Tweaks to content and layout