Added exporting and popups