Fix z-index problems and some text