Pushing live with some final tweaks to pagination and other