Fix non-clickable page nav
Use url helper for links