Added options, and moved content scripts