Simplify nesting
Rename MarketplaceLite to UserMarketplace
Make user marketplace lookup cleaner
Fix adding/removing marketplaces