Updating pagination links + bugs