Move options to options.php and add Marketplace Options