Starting to add support to Z-index changes