Make some progress on z-indexing issue but need to work better