Further restructured widgets to be entirely self contained.