fix zindexing issues