Update nav links

Add generic links, update the router accordingly