reorganized z-indexes, which actually fixes #2