Further fixes to widget