Added paging. Removed categories.