Widgets more self-contained fixes
Merge pull request #108 from azaroth42/master

Widgets more self-contained fixes