Add popup and comments