Z-index bug fixed