Merge pull request #13 from rowanseymour/master

Some fixes to popup dialogs and notification messages