Fix and expand widget examples

TBR - the changes are strictly in the examples not used in the main app. I'm not landing yet - more changes are coming. If anyone has free time, PTAL.