Added more popup stuff