Resolve #246 - better menu order.