Fixes and updates. Add pagination button.