update layout of menu initial sort page
Merge branch 'master' into 2.5