Refactored market.js to use PriceAndControl