Created custom new/previous page links to work with new simplified url structure and fixed issues with ALL not being highlighted with pagination