widget changes
Merge pull request #766 from corinnecurcie/stable

widget changes