Menu fixes, Unit Sorting