Changing templates to fix links