First commit
Update paging and small other changes