#98 z-index refactoring