Updated templates due to some Jinja error that I don't understand.