fixes
Move things to try and get sort to work in the menus