widget changes
Merge pull request #762 from corinnecurcie/stable

widget changes