Final tweaks to pagination