popup context menu improvements