Refactor layouts to work with plone.app.blocks vocabularies