Migrated z-indexing to framework