Minor tweaks to content and layout