Fixed diff z-index
Merge branch 'hotfix/diff-zindex'