ContextMenu Patch

Making some adjustemnts to context menu patch