Refactor search results page