Merge hotfix-rewrite-base-template (#7) into stable

Fix additional errors with the base template.

There are still some elements that remained
unclosed.
Fix indentation and description.
Merge hotfix-modify-about-template (#8) into master

Fix indentation and description.

This is for the sake of style and so the about
page does not repeat itself.