Made links to pages use the "uri" component of the page structure, rather than the "name" comonent.