Further simplification of the view by moving logic to the widgets.