Procceed with migration to widgets architecture