Fix cursor, z-layer -> z-index
Merge branch 'master' into gh-pages