check in the notion of subwidgets, plus some upgrades