Changes to links
Changed names in routing