Style changes (z-index)
merge resolved