Better menu order and legend titles