Slight improvements to the contextMenu