Small fixes to css and constants in JS code.
Merge branch 'master' into gh-pages