Pricing and layout cleanup