Fix pop-ups

#77 caused reversion in pop-ups
Merge pull request #78 from tomchadwin/master

Fix pop-ups