fixed z-order issues