Popup

Relocated a popup message so that it appears after new content is
provided, and added some minor comments