More work on search page, I think it's done for now.