Some impovements
- widget
- fixes