Improve add_widget_to_mashup and change_marketplace