Fixed z-order comparison func
Fixed items removing