fixing the templates