widget changes
Merge pull request #767 from corinnecurcie/stable

widget changes