Refactored out Widgets.