remove popups, fix up link