add ability to load popup from url parameter
merge conflicts