change context menu to follow new format