Fix content script not being injected due to lack of cross-origin permissions
Tidy up background.js a little