Added Filters and Sort
Lots of Merge Conflicts Fixed