Add pagination and table sorting