added popups and links