z-index updates, closes #42