Various fixes for twig layout extends directives (now extends
base.html.twig)