Updated popup.js for local testing.
Merge popup