widget stuff
Merge pull request #763 from corinnecurcie/stable

widget stuff