Z-indexing fixes
Merge branch 'gh-pages'