Add pagination support
Simplify selectors
Merge branch 'feature/nav' into develop