Convert to jekyll && various improvements