Fix to sort page
Merge branch 'menu_rework'