Cleaned up unused vars, changed names of page from "all" to search