Cleanup, adding module widgets.