Refactor the whole gh-page branch