fixes
Move things to try and get sort to work in the menus
Merge commit '51c7ff433285b2066c54878b1f3a54835b6cc59c'

* commit '51c7ff433285b2066c54878b1f3a54835b6cc59c':
  Move things to try and get sort to work in the menus
  fixes