Fixed an issue with the next/previous page
Modified some stuff