added second grid with page numbers, fixed pagination bug
merge with upstream;