Commit 2

Deleted popup.js
Minor issues fixed