Fix additional errors with the base template.
Also fix errors with tutoring template.
Merge hotfix-rewrite-base-template (#7) into stable

Fix additional errors with the base template.

There are still some elements that remained
unclosed.