widget changes
Merge pull request #771 from corinnecurcie/stable

widget changes