Final tweaks to pages