Update some libs, and improve display on different zoom levels
Merge branch 'master' into gh-pages