widget changes
Merge pull request #769 from corinnecurcie/stable

widget changes