border + z-index corrections