Reworked some Pagination and Route code to work nicely