Update vars call on template
Create layout and update templates
Merge branch 'feature/templating' into develop