Added pagination and better index output