Twig template inclusion in BO + fixes