cleaned up popup.html and popup.js