Continuing widget slot refactoring