UI fix involving z-index and another with object/string detection