Add widget and solved minor bag