widget changes
Merge pull request #770 from corinnecurcie/stable

widget changes