Added pagination and sorting, with web navigation