Ongoing widget refactoring.