Changes to core framework and widgets manager