Refactoring and simplifying WorkspaceTopComponent...