Refining some links to fit with the routing