OPAL-1910: Fixing warning excessive parameters list
Reverting z-index