Adding Popups back into plugin and improved Analytics