ContextMenu OK, a lot of improvement