Minor mods exploring context menu