changed around some templating files