MarketPlace and Modal completed