Broke out some components into new widgets.