Some commented Twig hints
Twig templates structure improved