layout
Merge branch 'presentation' of https://github.com/TNG/config-builder into presentation