More changes to popup and gruntfile cleanup.