Fix routes for real
Fix other routing issues with links.