Improved option.js