Refactor search result page