add page links and improve routing