No more inline popups, all generated on the fly instead