Changed popup.js and popup.html.