Latest fixes due to z-index problem