Minor fixes to widget button widget