put all buttons into a twig block
Merge branch 'develop'