changes to options and contentscript
cleaned up options window and made contentscript more modular