upgrade jekyll & refactor