refactoring
initial ContextMenu work