Reworked widget model interactions