Reordered right-click menu