Wraps popup content in divs with the class popup;  and fixes a missing link.