Merge TJ's pagenav stuff