more reorg of context menu