Merge

- homepage fluxed

- search page draft