Changed to use widget-template, other cleanups
Added comments about things to fix and improve found while testing
Changed to use widget-template, other cleanups