OutputWidget refactoring