Migration to widgets architecture