Refactor to include sane listing limits
Update listings with batch navigation