Updated to incorporate z-index fix