menu reshuffle fixes #722