Show and sort in Mail is one menu

Which messages a folder shows and their order are now chosen from Show and sort, the button beside the search box, instead of two lists under it. While a choice other than all messages, newest first applies, it is named under the folder's name, with Clear to go back.