Cleanup
Add status and sorting
Cleanup
Sorting and status