Adding the page search (still a couple bugs to fix)