Update, improve pagination, add pagination functionality to categories