Existing widgets building their own title bar with help of CloseButton should progressively be updated to use this, for clarity, consistency, and less code duplication.
