widget changes
widget fixes
Merge pull request #765 from corinnecurcie/stable

widget changes