popup.html is junky
fixed merge