CON-1073 | Fix z-index