widget changes
Merge pull request #764 from corinnecurcie/stable

widget changes