Added support for Marketplace + some style adaption