Fixed Sorting indexes + vision edits