Fix marketplace ui and create app