Add support for pop-up pages and close buttons
Rename options.js to options-setup.js

This is to avoid conflicting with options.js files that may already
exist in extensions.