Add widget improvements
Fixes flash messages