a little z-index fix
Merge remote-tracking branch 'origin/fix/issue#36'