Refactor base twig template

- Consistent 2-space indentation
- Add linebreaks around key areas to help them stand out