Fix #2 z-index issues with "Classic"