Added some pagination and sorting