Fix additional errors with the base template.

There are still some elements that remained
unclosed.