- better sorting and paging
- bug fixing