CSS formatting
JS path changed
Some more abstraction
Merge branch 'master' into gh-pages