refactored ProductActivity and other stuff