popup bug fix
Merge pull request #10 from hugo-devs/master

popup bug fix and cleanup