Widget updates

see diff