Cosmetic changes to search page
Resolved merge conflicts