Minor tweaks on all pages