Refactor search page
Merge branch 'master' of github.com:socketubs/socketubs.org