reorganized z-indexs, which actually fixes #2