Removed extra popup.js call
Updated icon
Various changes