css style
js fix
Merge remote-tracking branch 'origin/gh-pages'
JS update