fix some z-indexing