added some structure to the templates