ZIndex hotfix
Finish zIndex hotfix