Refactor ContextMenu items