Add categories and pagination