NXIDE-273: Refactor Marketplace information form - Update layouts