Fixed a bug with the pager and changed around some of the routing