Changed Sort menu to define sorting options. Re #7525