Added correct links to base template