Safari and Firefox fixes
Merge branch 'master' into gh-pages
Add compiled CSS