Widgets more self-contained fixes

Improvements for #107.