fixed z indexing issues