Unambiguous/uncontrovercial cleanups in widgets
Merge pull request #2068 from ussuri/widget-cleanups-and-improvements

Unambiguous/uncontrovercial cleanups in widgets