Refactoring WorkAreaWidgets