Moved from Django Template Language to Jinja2 and added a new level of templates