made the new popup pop
Merge branch 'new_popup'