Added search pages and finished search code