Further simplification of widgets.