Refactoring of the widgets.