Added pagination, improved the navigation code
Fixed typos