Fix z-indexes
Merge remote-tracking branch 'upstream/master'
Fix dialog issue
Merge pull request #225 from jerv13/master

Fix dialog issue