Continue refactoring for ContextMenuControl