Adds more HTML markup for the first page. Enhance twig modularity.
Some typo fixing, and using Twig comments instead of HTML comments.